gentoo resync : 16.02.1018

7 files changed, 16 insertions, 74 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 57896abc3b7b..1c3c8f4235a9 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index 51de7cba30da..9f8fb77aafd5 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -1,4 +1,4 @@
 DIST quiterss-0.18.12.tar.gz 3597214 BLAKE2B ff06de6f6618fa6bb1b2b1274e5c214f1cae2dbb4e7d6c406b885f1b59b5b5d22ca919d32a672f8843360100e87d80c7a7add7ebccc41b53f67b0719fe2f7c99 SHA512 e047d88d3be2d24e264869c9fe5a9327d66b7f6907bb74b5fc7e53b2cbb69c232f130826c8ad79ac95dd3dc5137d1d1779a23c20ddb35c56fccfbaff4fb4f3e4
 EBUILD quiterss-0.18.12.ebuild 1191 BLAKE2B 63871a785da5bcef11981f873a776d3fa65a70342032add83ae55cc6af6fafaf17561c3138ea17eda2456dd144b608f0cf144f42f5da88350823207746347e54 SHA512 15a2e7f4588003a29bffac9c0f1c7b0efab065b2291467328c3fe97fd12b9c0b852c1b453dcbe05c0644d10ed8c0b4da6059e3448b26b65d1f6d8033cc6ea046
-EBUILD quiterss-9999.ebuild 1196 BLAKE2B e5732c415f59c37ac4c96ce3a80afcda50dd04f41b3ab327e9143a4074c976a370be549010909e9ff9f9ada312fc89467542ea272f583d1579a1dec235ec695c SHA512 8454304677d8feeb61741f3501c3d0baf991d0bb9387eb62e27561eaa5dd20456874355903c1203e2025751caf7179091154cbfe4ee769d3c6dfd28ce32bae68
+EBUILD quiterss-9999.ebuild 1075 BLAKE2B 23df4c222916fb4cbb95f25de43485089b719fa67d5f5958de143808f7ac70ce3e5a3f2c2d4e3fba827b81c63766c54bfaab036e2806caed74c3eb370a8a68b1 SHA512 7aaca38c898d75ee4777a2d5688078ee356b1008d5ea8a792a9ddc41c17b6fb815f93777c26e22e3426cbd13d689e93f7d2630efa5b6e6fad86edca57615db67
 MISC metadata.xml 329 BLAKE2B caa7a5bfcbbf62b32546c2a8cb0d3e55b1b1d0371b81505156a566df605e277d9560d900a4d2f945b4d9da99b7898edec3c08264b5628f4d74c9c949f805e455 SHA512 d77d10152c5497c4bb21511bd20b8a122159e048d11d070fffbd2ef5742be3bd0019eafb79a5e828b923b095b8628ff1d65371800ea49dbe6ec6355d1b9a0150
diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
index 2f26f2b7e331..790e3416fe61 100644
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils qmake-utils xdg-utils
+inherit qmake-utils xdg
 
 DESCRIPTION="A Qt-based RSS/Atom feed reader"
 HOMEPAGE="https://quiterss.org"
@@ -20,7 +20,10 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	>=dev-db/sqlite-3.11.1:3
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -33,15 +36,16 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
-DOCS=( AUTHORS CHANGELOG README.md )
+src_prepare() {
+	default
+	sed -e "s/exists(.git)/0/" -i QuiteRSS.pro || die
+}
 
 src_configure() {
 	local myqmakeargs=(
-		PREFIX="${EPREFIX%/}/usr"
+		PREFIX="${EPREFIX}/usr"
 		SYSTEMQTSA=1
 	)
 	eqmake5 "${myqmakeargs[@]}"
@@ -51,13 +55,3 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-news/rawdog/Manifest b/net-news/rawdog/Manifest
index fe67a44ce04b..56b107b230b3 100644
--- a/net-news/rawdog/Manifest
+++ b/net-news/rawdog/Manifest
@@ -1,7 +1,3 @@
-DIST rawdog-2.19.tar.gz 66231 BLAKE2B 10107098cc645e5f8e701f5131499458e01eab5bc0c2e5f9cd8d4fc390774e6810985369cd12215d49aaa57713d3d34a21270f64ae412deb63a9c627e894dc55 SHA512 4e2ebf51feb98a0ce994218e6f057268846ed3194626877b5bd0b71971b5e79f1482af8dece29dc6be0a2e04728333b4814a73469b60c0970a323177511a5ae6
-DIST rawdog-2.20.tar.gz 66933 BLAKE2B 77ac8babe97736c6ed9e7da22de0d8ca494fcbaaddfc5085e995b631399607d34bcfbeeb44c095c2f87f86ee6702fd3b24b538b90c5194b196c9a1477ea7f35a SHA512 83a023f4256cd49242769deef7eaee7ad40f6e61fe97885dd2b311f3e3c9c8a87338a06b1e08a634496bb939d6574795027405decf361f38727efd73dd2ba96b
 DIST rawdog-2.22.tar.gz 68777 BLAKE2B 192292fdf92df45fee9f468258af4de3b22935e10dd1236b4a3fadc21a09918973c32c76e002b158e19f6aba51881b2c570d158a7ea36e16edcddf16e745915e SHA512 27d4140713b0bc5fd6acf70e0377653266422e74201bb895b622a1abe03607704bf16e83a8135f9b0594b8f9566b84fc969c6f197f26d2e463dc5821fd5816d4
-EBUILD rawdog-2.19.ebuild 615 BLAKE2B 40d69f80d91b91e39d7efd2baf540da3d7b8b5e38d4b58d57676e7788d53d04d48e47eaae732f0ffc8f975cd7de4cd04394a1249a7e16dea54c415f0ba1d1d72 SHA512 5f563f4529dfb466fe8149a966bad7d4f04e365dde6577cb2017c922b005adb2eb3563d878b9f2087bae2125833b17c79749e8879a6cedac7c750237f409274b
-EBUILD rawdog-2.20.ebuild 622 BLAKE2B bd694fab6e354616032ebf00a8e77e042dde7449eaae63ffa700bd0b21329e16011f35fffd4b8a67420f57beb6a6b3958764a3e4133006f11d28f8f5ead674a2 SHA512 ed42cd40403cba7435ff4f074e3e6dcda2ee2e3f519c83274fca29bfb153c1f58a69504d31601747fda499b1bf2b55e2d01abedbeb8e1cbdd2d2c6c04799a5d3
-EBUILD rawdog-2.22-r1.ebuild 605 BLAKE2B b660574bb2a266b5c08b459d0502a30b26cfa6b0bb0862f5b30436c59bc753c1e896526f91733bd23774f330f31ae65eee190affd09e4c5bf796e98ca5965471 SHA512 cd98067fbee451fac3ea8e228da449cf08e8fc47b4bf1fcf0bcd2b993ec07e807ec00a10facbca5987cfefa4513252ef8549d257d5afe08078c289dca3acad38
+EBUILD rawdog-2.22-r1.ebuild 604 BLAKE2B 1bd25222bd765fbd3ba499eda312835cfa224093032809cb64d57c7f05728e05f6008dfd306530e3a3fae50aa6fc5896ac5e4b30004053c9b6dd57a442fb91f0 SHA512 f971b2a5d555f616e29deb22e1556028ab12ffb7d069344c4654171ae2e17a3a8cf9feb32f5010685c6937e43f56e4b6c98997c2f3fff5613981b49f8952261d
 MISC metadata.xml 591 BLAKE2B 5775551f1616b07ddae93a3f6d59dd67706b4bb9a0143ceeff0f4cd07ace9030374251a4ecb738698758458d0dd78953f754b25572bf2477a0e334decd0df0b8 SHA512 6307022fb71d771c07ed113a95091591c3952740a91f2fe32f5b480719134dade9324324528ca5225bec5efc41287e3cedd3f978b69c3e066e46745305f7ccf1
diff --git a/net-news/rawdog/rawdog-2.19.ebuild b/net-news/rawdog/rawdog-2.19.ebuild
deleted file mode 100644
index 31d9a0decc64..000000000000
--- a/net-news/rawdog/rawdog-2.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Rawdog - RSS Aggregator Without Delusions Of Grandeur"
-HOMEPAGE="http://offog.org/code/rawdog.html https://pypi.org/project/rawdog/"
-SRC_URI="http://offog.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~s390 sparc x86"
-IUSE=""
-
-DEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	# pypy fails half way through; meh
-	./test-rawdog || die "Test run aborted"
-}
diff --git a/net-news/rawdog/rawdog-2.20.ebuild b/net-news/rawdog/rawdog-2.20.ebuild
deleted file mode 100644
index af3948a646f3..000000000000
--- a/net-news/rawdog/rawdog-2.20.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Rawdog - RSS Aggregator Without Delusions Of Grandeur"
-HOMEPAGE="http://offog.org/code/rawdog.html https://pypi.org/project/rawdog/"
-SRC_URI="http://offog.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	# pypy fails half way through; meh
-	./test-rawdog || die "Test run aborted"
-}
diff --git a/net-news/rawdog/rawdog-2.22-r1.ebuild b/net-news/rawdog/rawdog-2.22-r1.ebuild
index a36ab884c14d..e006e120796f 100644
--- a/net-news/rawdog/rawdog-2.22-r1.ebuild
+++ b/net-news/rawdog/rawdog-2.22-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://offog.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ~s390 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~s390 sparc x86"
 
 DEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"