From 2cea6a65fd08d8c4bb5b8dfaa00a4e20fb895873 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sat, 12 Jan 2019 22:56:55 +0100 Subject: [PATCH] net-misc/whyblocked: Rewrote ebuilds Package-Manager: Portage-2.3.51, Repoman-2.3.11 Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07 --- net-misc/whyblocked/Manifest | 14 +++--- net-misc/whyblocked/metadata.xml | 3 ++ net-misc/whyblocked/whyblocked-0.13.1.ebuild | 50 ++++++++++++------- ...99-r6.ebuild => whyblocked-9999-r7.ebuild} | 35 +++++++++++-- 4 files changed, 74 insertions(+), 28 deletions(-) rename net-misc/whyblocked/{whyblocked-9999-r6.ebuild => whyblocked-9999-r7.ebuild} (53%) diff --git a/net-misc/whyblocked/Manifest b/net-misc/whyblocked/Manifest index a5bba7f..40691ff 100644 --- a/net-misc/whyblocked/Manifest +++ b/net-misc/whyblocked/Manifest @@ -3,13 +3,13 @@ Hash: SHA256 DIST whyblocked-0.13.1.tar.gz 33704 BLAKE2B 956f662028ea8dbe79d95f0bcdb654c4b4a6d455e7a00eb2d436a4970da5ed09b2e529415a193ff3d2cb46122a1954b1b9850e0cb7570534937956b8c897ac3a SHA512 3042aca1f303f8c9200ed55959925698716704ad5627326519e85f9dd80fce62ea2b7660489fae60cfa04ef3d985be2470901d18d8a7822dc229380a0fee8000 DIST xdgcfg-0.2.3.tar.gz 5601 BLAKE2B ad761229e6d049b14b89febdfe09b2fa16c04ad84d848bd0bf27939cd9c8cd46694a5c48b8b28e38f062cc41a067c1c79ad1eed38bbfbc99682b96bec30998d3 SHA512 bdb48ca1ba7319e307e1ee5b172e6a6d6dd05ac13c61d08a04f006f4eb5f0d8b0ed52916a410c52e817c95d3597897a8675a2bdab0fabe82db01593052772c7e -EBUILD whyblocked-0.13.1.ebuild 1107 BLAKE2B b7e6b2682287873e4e42e3a9e29835e01079068a0d1c8dfcb567b86ee689a6e6c38abf7a3ceccb6ae5a9076933c00f931e14bb34d4e642a4e6e0460be33d8bfc SHA512 8a6e5f88c3733711d18c572a3ac3c94cad94e99c4124fc73089dd21a2f286a5f3dda09ea542c09e6d9969531812209d00b413b18538de248a800fc7a724c7ac8 -EBUILD whyblocked-9999-r6.ebuild 856 BLAKE2B 534a14d334b91a1ffe0884e709675c97444b328ec5ca631f4fed0403cffdeba4f100c917f08278bb96c9fd1fb84f87a5f5e901a272ba62e2b46904ef7aa9d02f SHA512 db1408efb6154c6c55ec13994b68b1566992ba3a986c8bc84b3663330a972886632e4024053cb2b7a41ceb8824d3f67d972ba80c0d7a5bb003a5d55242542da9 -MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d +EBUILD whyblocked-0.13.1.ebuild 1359 BLAKE2B 8288bb429b3214541eda8dc55ff0b0516634ccee1eef99b43e656e0b11b022f620850c054363de8039ee135c4c6b73ab3136f54c834e26895350a05dc615c46a SHA512 02699a0e42b2c08ee8b8cb1a49124b45d5cb877db6f7b6d984dd79df6177e948f95489883de856fd1e0aecb8553fb663ab4f1758aef7b9dcf2d395cff2657935 +EBUILD whyblocked-9999-r7.ebuild 1359 BLAKE2B 8288bb429b3214541eda8dc55ff0b0516634ccee1eef99b43e656e0b11b022f620850c054363de8039ee135c4c6b73ab3136f54c834e26895350a05dc615c46a SHA512 02699a0e42b2c08ee8b8cb1a49124b45d5cb877db6f7b6d984dd79df6177e948f95489883de856fd1e0aecb8553fb663ab4f1758aef7b9dcf2d395cff2657935 +MISC metadata.xml 347 BLAKE2B 6190843908b2b4527fb592170c1acc578272919e76aba93e0be3a43e8fd085d5f130afb94c1f7bc47f1cbe0e0d74cd7789cb098043a71f49bea8d6ce5fbbe168 SHA512 3db6490cb11dd114a12331817a4d95bd08b82c7cd77ca90c122309be06a760172fad3c6276c3d178f3138dc7cdeec5ebc377c02bea6b0253caec1346bcb050f1 -----BEGIN PGP SIGNATURE----- -iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXDpORAAKCRDPw5SX8bJu -BxbZAP4tKKAjN8udxhCgIIL/g5K/gKxtuH6ZrKz9u4vmKBwfBgD/WpvxS7ACok1c -w7MGXmHanWU5Dxi36eikhewDrtOxutQ= -=h93m +iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXDpipwAKCRDPw5SX8bJu +Bw0xAPsGyowahlCLVmi/tvSH0ACO6hLOMLYz5BzINSVz2j2rzgD/WXC179oxP8V9 +S2u5P2Hv+lD9/rpZHqKjqZUGl1+UkJQ= +=uWhT -----END PGP SIGNATURE----- diff --git a/net-misc/whyblocked/metadata.xml b/net-misc/whyblocked/metadata.xml index d68ff96..f97db2a 100644 --- a/net-misc/whyblocked/metadata.xml +++ b/net-misc/whyblocked/metadata.xml @@ -5,4 +5,7 @@ gentoo@tastytea.de tastytea + + https://schlomp.space/tastytea/whyblocked/issues + diff --git a/net-misc/whyblocked/whyblocked-0.13.1.ebuild b/net-misc/whyblocked/whyblocked-0.13.1.ebuild index c482218..03687f0 100644 --- a/net-misc/whyblocked/whyblocked-0.13.1.ebuild +++ b/net-misc/whyblocked/whyblocked-0.13.1.ebuild @@ -2,42 +2,58 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit cmake-utils gnome2-utils +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 +fi + XDGCFG_PV="0.2.3" DESCRIPTION="whyblocked reminds you why you blocked someone." HOMEPAGE="https://schlomp.space/tastytea/whyblocked" -SRC_URI=" - https://schlomp.space/tastytea/whyblocked/archive/${PV}.tar.gz -> ${P}.tar.gz - https://schlomp.space/tastytea/xdgcfg/archive/${XDGCFG_PV}.tar.gz -> xdgcfg-${XDGCFG_PV}.tar.gz -" +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://schlomp.space/tastytea/whyblocked.git" +else + SRC_URI=" + https://schlomp.space/tastytea/whyblocked/archive/${PV}.tar.gz -> ${P}.tar.gz + https://schlomp.space/tastytea/xdgcfg/archive/${XDGCFG_PV}.tar.gz -> xdgcfg-${XDGCFG_PV}.tar.gz" +fi + LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" -IUSE="qt5 nls" -RDEPEND=" - >=dev-db/vsqlite++-0.3.13-r1 +if [[ "${PV}" == "9999" ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64" +fi +IUSE="nls" + +RDEPEND=">=dev-db/vsqlite++-0.3.13-r1 >=dev-libs/libxdg-basedir-1.2.0-r1 >=dev-qt/qtcore-5.9.6 - qt5? ( >=dev-qt/qtwidgets-5.9.6-r1 ) + >=dev-qt/qtwidgets-5.9.6-r1 " -DEPEND=" - >=dev-util/cmake-3.9.6 +DEPEND=">=dev-util/cmake-3.9.6 nls? ( >=dev-qt/linguist-tools-5.9.6 ) ${RDEPEND} " +if [[ "${PV}" != "9999" ]]; then + S="${WORKDIR}/${PN}" +fi + src_unpack() { - default_src_unpack - mv ${PN} ${P} - mv xdgcfg ${P} + if [[ "${PV}" == "9999" ]]; then + git-r3_src_unpack + else + default_src_unpack + mv xdgcfg ${PN} + fi } src_configure() { local mycmakeargs=() - if ! use qt5; then - mycmakeargs+=(-DWITHOUT_GUI=YES) - fi if ! use nls; then mycmakeargs+=(-DWITHOUT_TRANSLATIONS=YES) fi diff --git a/net-misc/whyblocked/whyblocked-9999-r6.ebuild b/net-misc/whyblocked/whyblocked-9999-r7.ebuild similarity index 53% rename from net-misc/whyblocked/whyblocked-9999-r6.ebuild rename to net-misc/whyblocked/whyblocked-9999-r7.ebuild index bdbad6e..03687f0 100644 --- a/net-misc/whyblocked/whyblocked-9999-r6.ebuild +++ b/net-misc/whyblocked/whyblocked-9999-r7.ebuild @@ -2,15 +2,33 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit git-r3 cmake-utils gnome2-utils +inherit cmake-utils gnome2-utils + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 +fi + +XDGCFG_PV="0.2.3" DESCRIPTION="whyblocked reminds you why you blocked someone." HOMEPAGE="https://schlomp.space/tastytea/whyblocked" -EGIT_REPO_URI="https://schlomp.space/tastytea/whyblocked.git" +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://schlomp.space/tastytea/whyblocked.git" +else + SRC_URI=" + https://schlomp.space/tastytea/whyblocked/archive/${PV}.tar.gz -> ${P}.tar.gz + https://schlomp.space/tastytea/xdgcfg/archive/${XDGCFG_PV}.tar.gz -> xdgcfg-${XDGCFG_PV}.tar.gz" +fi + LICENSE="GPL-3" SLOT="0" -KEYWORDS="" +if [[ "${PV}" == "9999" ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64" +fi IUSE="nls" + RDEPEND=">=dev-db/vsqlite++-0.3.13-r1 >=dev-libs/libxdg-basedir-1.2.0-r1 >=dev-qt/qtcore-5.9.6 @@ -21,8 +39,17 @@ DEPEND=">=dev-util/cmake-3.9.6 ${RDEPEND} " +if [[ "${PV}" != "9999" ]]; then + S="${WORKDIR}/${PN}" +fi + src_unpack() { - git-r3_src_unpack + if [[ "${PV}" == "9999" ]]; then + git-r3_src_unpack + else + default_src_unpack + mv xdgcfg ${PN} + fi } src_configure() {