From 791b0cfef3d954deeb9502e107df7977efa44dcb Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Sun, 13 Feb 2022 06:36:56 -0500 Subject: [PATCH] sys-fs/tmsu: package update as per new go eclass Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Horea Christian --- sys-fs/tmsu/ChangeLog | 3 + sys-fs/tmsu/Manifest | 14 +++- sys-fs/tmsu/files/tmsu-0.7.5-new_go.patch | 79 +++++++++++++++++++++++ sys-fs/tmsu/tmsu-0.7.5.ebuild | 73 +++++++++------------ 4 files changed, 125 insertions(+), 44 deletions(-) create mode 100644 sys-fs/tmsu/ChangeLog create mode 100644 sys-fs/tmsu/files/tmsu-0.7.5-new_go.patch diff --git a/sys-fs/tmsu/ChangeLog b/sys-fs/tmsu/ChangeLog new file mode 100644 index 0000000..43717c9 --- /dev/null +++ b/sys-fs/tmsu/ChangeLog @@ -0,0 +1,3 @@ + 13 Feb 2022; +files/tmsu-0.7.5-new_go.patch, + tmsu-0.7.5.ebuild: + sys-fs/tmsu: package update as per new go eclass diff --git a/sys-fs/tmsu/Manifest b/sys-fs/tmsu/Manifest index 0f39625..d4fce0d 100644 --- a/sys-fs/tmsu/Manifest +++ b/sys-fs/tmsu/Manifest @@ -1,2 +1,14 @@ -DIST github.com-mattn-go-sqlite3-v1.12.0.tar.gz 2282527 SHA256 f74a75ba86ecb52e1deef5102cdf3702e6c6bb524f399b7dfcd7d6d99e35fb30 SHA512 7e8656ecf70b2ffc40f6351b661f5eb75caa63c3e9784a805821bf0ca1f087203f1afe80f58af0e5520ff04baff728c93d670fd7ecb6662bb0fed1dd798ada96 WHIRLPOOL f0791e23d54fa87dd9f8852bddf3cfc078579844c37b3b68b577d1b8efd27c09c49fb054b8f20a319170074f6f5728879809e65f1126c4942b18c0d998d11846 +DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod 94 SHA256 8d8c763ba2e89e266f82e95b3db9462b8ad01c27b30dda77cf7ebce735e6554e SHA512 a4ec6bdb7df5b5706be0a19144023042cce1fe54d1fe23d2556fcf1c23fadc112f5c4f16d6b497ab0ddf595fb21550543e65ace43a147747d894c220da346ce2 WHIRLPOOL 971a7116c1c8b8b3978209ac5a3af2f09e16c8430dc62c3a879f5df7a59ef92ac336dbf47bacbc75ad36b150a58f0fc3320a7d6b7a723639f34640daf1665f3f +DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.zip 219180 SHA256 4b94d038e80959f816a18b34cdcbb5244e87b73956b220aac213483999b54c84 SHA512 b5a5bea977945d4305b3506e5a6f96d1acce91280e103f1c88f3b2c072437d5bbf84b8ef8760ae073106156342356a763ef0db9339b6e2c72002a73f8187ebf6 WHIRLPOOL 3c19eef320ff7b074c78504bdf548b5fe23163ce878988eabc1e4d5ab22e0ea61b9ea342183ea717a2227833edac20732b6ce84936974e8f8bf1bfc341717191 +DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.7.mod 44 SHA256 a1d03c369bdbbde0dbd46cf0b8f027fb65e4545c6ba788ee142e83799845fbdc SHA512 e7572c4b152f83a58c81e374c109eb5b80514c63d9f02f7adc2bc23e8bc81dfaefe6f1ed079b65ecbebbe118a3423c2124f0b619378b8b237ff0a6cc687e1952 WHIRLPOOL b5a2ed4ffe02112942825a2418f8d10e87cb68bbe29d767aede6ccae3db68d8894fbd6e93144eb1332f326cb40611aeb1e55bcf05b60ba7ca40367d8aad5212d +DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.7.zip 2459621 SHA256 a9f2747143111f83717b83c17e345732862b04cc74d6f4bac7a3a3ac522502e2 SHA512 690fadbe60dd9e9127edf497e69d581571f21741abbca4be587da47da33bfa486ffc7ef98b798b42828ef59669e611c7aa8db2ca5d78b4d44462a735953a40c6 WHIRLPOOL ead3eb285f1a17fe4733fc4c56bcb5197c6f82754e8e54b4842e2791b67f1c4fee87bd4b33d0143481d17e8c2d089689020823eaea9a014b41da6db5f5e05971 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod 247 SHA256 8142c6c8389ec5c6f3bdbaf8191f87f7be425c77ca355251ed066c9a8fea370f SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc WHIRLPOOL 2476f58c5efe10d2e3e42be68db5548ff5a3bc332d16680bf70276712e2f6735809c527b00fe2ca85884e036e0ca8036042ba1589846d5d715fea13f1d46b498 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip 1874670 SHA256 137b6ca9e30d6316cdb3272e6922d47f33d0e1599dddf03f44d3e39ed4cdbdf0 SHA512 6494794aff8498860f5af522d4a4921278c6aed6e7ce6bef3c8cfeabfb78810e932b66d47746a2bd416c538d5a277ccb82cab45a479b37fd0484dbe44cc78825 WHIRLPOOL c3f6afd3c1fc5029a4d344f924757fbacca5df5fa6ce11f08ff7e46267ff449fdb4420416c94d3c219d13ec5c0853f4be583efa7198ce34b8f9d216109cfed1a +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 SHA256 fef5896d103a0bce5055fdb5e96e830944334792437865347718edceb633348a SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146 WHIRLPOOL 2329c945e6c7a8f6ca36fb71748c551041cce96e2754e9a31d0e5243b1b33d69aae8e94d41a3d4b84ccc319cb2f2ad9371255ca87c924bc0a0b45a99b0fae16e +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 SHA256 8969115e4a39108848324e79a1bd8a8445230e6e3aaccbe9f8057fb50fffc8c1 SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c WHIRLPOOL 1d3fdefd5bef9bea42dc7f6cc34ab54e812fcd9abf53712e02768e63a7bcb5b77377513d08c7debaebd8e870736432d9c0f2519e7ff05152a85d4906f3398773 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 SHA256 181979e8bd57d2d9e064182da86c9a6111aa69755e888f08431ece4742aec343 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab WHIRLPOOL f00273ae444bc639eb1e712cf67694c868f291bd16dcbc75ec45603700a7145de7482b331dc02beddfb3dc1724a64a18a52a4802e7d4915aead6e0115d830d01 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.zip 1529034 SHA256 2681eb52677683be3760258aafe13c91c1c83888442e9c6545334ae97a02b386 SHA512 113ecd43b0aecd6050a3a7319bbb43d351e62d71f01f9b98af7ab15b179fff616ebbb81920447f3b1192a9230c230c95bb20e9172981d4c8b926804ee92af508 WHIRLPOOL f76d9ac947c466fdbb97fb7d77c87193c127d27dde3320739e4472344926d2d78203eb88edb81de1f8c30f9823957ca571429893ad50cd4d5c1f2ff9ca201028 +DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 SHA256 4cbab14f7706771b271d995a1b3cc131fe5a246aadc7ee6d1ba6f0bd894781fa SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 WHIRLPOOL b4d6240086c5effc9aefa69d56437b89cbf488af1c97f815370becc74460f37c4a3e3c6d427b7cc1711f480620081af7ee42aca531886d83d19a81df2fe03c96 +DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 SHA256 fbb7a88ed140515e790eca7a10ffd319c9786b11c6a6c7e59f80f7fb37bb4542 SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b WHIRLPOOL 2a16882d9a7df8b372dc8889817c68567b68b0de3c96e763e140574e380d9fcf8a885dd42d52468003a40ff04f320824944fb4942bcec174af57d46667f6c6d1 +DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 SHA256 a0e02f0678fe62dc3c4b4bc77fa912c9b70de10fa9f7cf2f7aad0337392b52af SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 WHIRLPOOL b8da09ef7d5088206963658cc522ee2fca66b07514923b8e0002ffa7e653f1d95205fb1ee87b2f4ec6d400c0f741a310072eb240cc0bbd0654b8f500063fd6f3 DIST tmsu-0.7.5.tar.gz 98766 SHA256 0ac7f09336aaedf73623c4f486c05137c024a726c16dd32525463aee9d70b46a SHA512 6f89eb156d2be86650ab84847ca0ddea985cdddf35db5f5843632b6a54f88681584b6864e4a14bc36cf1949713e098067e6f8dda0242f27b6061720165f71be1 WHIRLPOOL 6981f11f5313f3c222b0adaeb8bb75e7d439f328a92c5c6771a68f169df0ee774daf713d4f646456647ce74782c2e97a73e02c03a9b6f146f1455ded4cbf875c diff --git a/sys-fs/tmsu/files/tmsu-0.7.5-new_go.patch b/sys-fs/tmsu/files/tmsu-0.7.5-new_go.patch new file mode 100644 index 0000000..867b07b --- /dev/null +++ b/sys-fs/tmsu/files/tmsu-0.7.5-new_go.patch @@ -0,0 +1,79 @@ +From 57cf4678e8c7d06d771fbe5da1bdfe3485017d9d Mon Sep 17 00:00:00 2001 +From: "Sean E. Russell" +Date: Tue, 8 Jun 2021 10:19:57 -0500 +Subject: [PATCH] Updated for Go (1.16) modules + +--- + Makefile | 6 +++--- + src/github.com/oniony/TMSU/go.mod | 9 +++++++++ + src/github.com/oniony/TMSU/go.sum | 13 +++++++++++++ + 4 files changed, 32 insertions(+), 12 deletions(-) + create mode 100644 src/github.com/oniony/TMSU/go.mod + create mode 100644 src/github.com/oniony/TMSU/go.sum + +diff --git a/Makefile b/Makefile +index 3c4ded9..6ff9705 100644 +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,7 @@ clean: + @echo + @echo "CLEANING" + @echo +- go clean github.com/oniony/TMSU ++ cd src/github.com/oniony/TMSU && go clean . + rm -Rf bin + rm -Rf $(DIST_DIR) + rm -f $(DIST_FILE) +@@ -31,7 +31,7 @@ compile: + @echo "COMPILING" + @echo + @mkdir -p bin +- go build -o bin/tmsu github.com/oniony/TMSU ++ cd src/github.com/oniony/TMSU && go build -o ../../../../bin/tmsu github.com/oniony/TMSU + + test: unit-test integration-test + +@@ -39,7 +39,7 @@ unit-test: compile + @echo + @echo "RUNNING UNIT TESTS" + @echo +- go test github.com/oniony/TMSU/... ++ cd src/github.com/oniony/TMSU && go test github.com/oniony/TMSU/... + + integration-test: compile + @echo +diff --git a/src/github.com/oniony/TMSU/go.mod b/src/github.com/oniony/TMSU/go.mod +new file mode 100644 +index 0000000..deb79e4 +--- /dev/null ++++ b/src/github.com/oniony/TMSU/go.mod +@@ -0,0 +1,9 @@ ++module github.com/oniony/TMSU ++ ++go 1.16 ++ ++require ( ++ github.com/hanwen/go-fuse v1.0.0 ++ github.com/mattn/go-sqlite3 v1.14.7 ++ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a ++) +diff --git a/src/github.com/oniony/TMSU/go.sum b/src/github.com/oniony/TMSU/go.sum +new file mode 100644 +index 0000000..a60c2bc +--- /dev/null ++++ b/src/github.com/oniony/TMSU/go.sum +@@ -0,0 +1,13 @@ ++github.com/hanwen/go-fuse v1.0.0 h1:GxS9Zrn6c35/BnfiVsZVWmsG803xwE7eVRDvcf/BEVc= ++github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok= ++github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA= ++github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= ++golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc= ++golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= ++golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= ++golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= ++golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= ++golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + diff --git a/sys-fs/tmsu/tmsu-0.7.5.ebuild b/sys-fs/tmsu/tmsu-0.7.5.ebuild index d74384c..a9c07a8 100644 --- a/sys-fs/tmsu/tmsu-0.7.5.ebuild +++ b/sys-fs/tmsu/tmsu-0.7.5.ebuild @@ -1,54 +1,41 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +inherit go-module -EGO_PN="github.com/oniony/TMSU/" -EGO_VENDOR=( "github.com/mattn/go-sqlite3 v1.12.0" ) +MY_PN="TMSU" +HOMEPAGE="https://github.com/oniony/TMSU" +DESCRIPTION="File tagger and virtual tag-based filesystem" -inherit golang-build golang-vcs-snapshot +EGO_SUM=( + "github.com/hanwen/go-fuse v1.0.0" + "github.com/hanwen/go-fuse v1.0.0/go.mod" + "github.com/mattn/go-sqlite3 v1.14.7" + "github.com/mattn/go-sqlite3 v1.14.7/go.mod" + "golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a" + "golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod" + "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" + "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" + "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68" + "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" + "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" + "golang.org/x/text v0.3.3/go.mod" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" +) -DESCRIPTION="Files tagger and virtual tag-based filesystem" -HOMEPAGE="https://github.com/oniony/TMSU/wiki" -SRC_URI=" - https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI} +go-module_set_globals + +SRC_URI="https://github.com/oniony/TMSU/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI} " -LICENSE="AGPL-3 AGPL-3+ BSD-4 GPL-3+ MIT" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND="sys-fs/fuse:0" -DEPEND=" - dev-lang/go - dev-libs/go-fuse - test? ( ${RDEPEND} ) -" +PATCHES=( + "${FILESDIR}/tmsu-0.7.5-new_go.patch" +) -src_prepare() { - default - mkdir "${WORKDIR}/${P}/src/${EGO_PN}vendor/src" - mv "${WORKDIR}/${P}/src/${EGO_PN}vendor/github.com" "${WORKDIR}/${P}/src/${EGO_PN}vendor/src/" -} - -src_compile() { - pushd "${WORKDIR}/${P}/src/${EGO_PN}" - GOPATH="${WORKDIR}/${P}/src/${EGO_PN}vendor/" emake - popd || die -} - -src_install() { - dobin "${WORKDIR}/${P}/src/${EGO_PN}bin/tmsu" - dobin "${WORKDIR}/${P}/src/${EGO_PN}misc/bin/"* - doman "${WORKDIR}/${P}/src/${EGO_PN}misc/man/tmsu."* - insinto /usr/share/zsh/site-functions - doins "${WORKDIR}/${P}/src/${EGO_PN}misc/zsh/_tmsu" -} - -src_test() { - cd "${WORKDIR}/${P}/src/github.com/oniony/TMSU/tests" || die - ./runall || die -} +S="${WORKDIR}/${MY_PN}-${PV}"