gentoo resync : 23.06.2018

9 files changed, 37 insertions, 141 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 75c38338213f..8b08c919dafb 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index 470a91858e2e..84fa5f797ba5 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,4 +1,3 @@
 DIST adwaita-qt-1.0.tar.gz 565625 BLAKE2B 73dba06dd785131d8bb949b5dcb195994d415e295b196228fd6145687431a3fd4984489c81322cfd1437fa8de3a97e41b30b49bba35baa30b379e02770b52928 SHA512 35993a9f99f9d41812d448d679a9e7a8cb15e8ed9b23a2ea9a33c61c1bfc98a226f8bea2fce3ff0dab29420ff10c4e4a4a800c9b989475cc66c4042257fe154c
 EBUILD adwaita-qt-1.0-r1.ebuild 865 BLAKE2B ec9d90afdd9b2cb4b5beb2a3aacfdc4e0d856f2e4e6a28f0afb1640ce1ed8c72e2bd76f32e844c310a8867d3ae71f3bfbf7d663d089dc75b3d1cbff7df440f29 SHA512 ba675436f5269a5f553b2aefbef72825799f48073731ced243a856c84569624db72eaa0f2e1bb9751099652fd1f6e71fd7f88c8adc365b63bba31d7ac6bb4182
-EBUILD adwaita-qt-1.0.ebuild 1110 BLAKE2B dce229a37aec7ad01ea16be35b7bb90b090769d552582862105593e293889617b9b248c277b0b71aec72053c4c59b39f2be95805680bf10d143d4d24deadac13 SHA512 4b40f9327ddc18ab4158524c13701e3f69306519c9bcf6f901fbcc370d8bcf764e2c663f1ba215227076ccc6a796c1e025155324dccbc80431cd1bb20a123a28
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.0.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.0.ebuild
deleted file mode 100644
index a01e83da0c58..000000000000
--- a/x11-themes/adwaita-qt/adwaita-qt-1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
-HOMEPAGE="https://github.com/MartinBriza/adwaita-qt"
-SRC_URI="https://github.com/MartinBriza/${PN}/archive/${PV}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="gnome qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	gnome? ( x11-themes/QGnomePlatform )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtdbus:4
-	)
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtdbus:5
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	if use qt4; then
-		BUILD_DIR="${WORKDIR}/${PN}_qt4"
-		local mycmakeargs=( -DUSE_QT4=ON )
-		cmake-utils_src_configure
-	fi
-	if use qt5; then
-		BUILD_DIR="${WORKDIR}/${PN}_qt5"
-		local mycmakeargs=( -DUSE_QT4=OFF )
-		cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	local _d
-	for _d in "${WORKDIR}"/${PN}_qt*; do
-		cmake-utils_src_compile -C "${_d}"
-	done
-}
-
-src_install() {
-	local _d
-	for _d in "${WORKDIR}"/${PN}_qt*; do
-		cmake-utils_src_install -C "${_d}"
-	done
-}
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 3b4981d91da5..3af9179f1a54 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,6 +1,6 @@
 AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1
 DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e
 EBUILD qtcurve-1.9.0_rc1-r1.ebuild 2065 BLAKE2B 4b45d665aeba947e5b51477e6f720fe0f756c9e16e0659cb0504fd03df123a2b81829e3a24ab699d60b12a1dcf96a688002df8eae6a06409ffcccf53e104a9d8 SHA512 84a6fa3e5d59a3fc10e632aa27a864c256fcd569ced6fb49f77802b2a8d30675da3768503f30426d5c284c221ee6f59f7507ac8a0fb1717d2d48137f4332e6a3
-EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1975 BLAKE2B 71c0b2127e635348908d278066f65f579ed93e92868a35d17b1958998591214fa6b2915e3a10ffff76e0bf95987bf44c295652267096a7dbe23e35bd73752884 SHA512 f0221313705fb41e14fee88f3a43241ac2554ef93945b2105edd08e34f4591298bdd1e0f34d2b119f9cbe90e92b2a506c293b7bee94c6c720785acb3b9c8d4f2
+EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1974 BLAKE2B 001e67d1a862f5040e7088ff3671738b5ddd0669ba7dcf56e8a7d8fae97990304542e37861930bd8aebde72e18250c1b35b8e7151cfa356618fed52c5ae88117 SHA512 cff3c3ee7ca5fdd3d13aa9c953bc1bede44ac1b16cc616538b542b0ba9380dda124b12e3989e3dbbe84bb81a445da6f328702fabcf13d7dd793f4de457291124
 EBUILD qtcurve-9999.ebuild 1971 BLAKE2B df4f9f6c79453d76dbe65bdeb2657d1d80763a35073898fa32b03b118ebba732561be8711ae43215b748dea9069defa12691d0bb3b59c8e8ee6b446c5c6000be SHA512 4ad09d774e114645fd74ef7d4f8841af3cc6229e7d49ebef4cc88638b89def50743e79e44568c95ccdbad79939f11c3684ebcade4323d5aaca1d0836050b89b1
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
index d6326f91f55d..600372fcffb2 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
@@ -15,7 +15,7 @@ IUSE="+X gtk nls plasma +qt5 test"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest
index ac76ecce204d..f982e1cfb580 100644
--- a/x11-themes/wm-icons/Manifest
+++ b/x11-themes/wm-icons/Manifest
@@ -1,6 +1,4 @@
-AUX wm-icons-0.4.0-build.patch 747 BLAKE2B d74f553bd1f7c4de8c2dbb9e128f5da13dd39d72d440c6a6815f7d70abc319eaf134850e370f02c5471caec39708edb8759441a516da3766ac78c67438498734 SHA512 3f48412b4af34a1ae3ed781182c28f269c85cc582e93292c17bc681d67cc2801ed58264d3b05d66341ac0df6ec1262869b00aa6880fb8f4c66c16f0f6b5ea790
+AUX wm-icons-0.4.0-build.patch 673 BLAKE2B a34fd33584928874f4c0a24a34842b640dc1ab4ad030a77d9d596bab1c5eea4cf182c2c06074fe2994cbb7ed09641b43ed5683f51d4976174f608f0fb3cc50d9 SHA512 c55c6b94cfbe4d7502db4c9bb5727fe9858865f7205c06959b483c9a3714d41d22508710322bd17b8aae3259f7b5eb9b01840bb540add3de5d8543b8c72d0b79
 DIST wm-icons-0.4.0.tar.bz2 3433177 BLAKE2B d5d04aaa8da0f0bc8c4887de77febd5a7546981c2f7da0b0869bb2ce9e080488c57ddc4ed89374bb24c0b708c3ac77a6890da4a3624cd98db7e4031336098d98 SHA512 9b21dbb1ac697520792c1e8bfc6b06d4d9933828759571b7af978a670223841fcfe9adcf7f945de3f3a4a39e0d991045d6086be9b293bd89b67cf937262d53a5
-DIST wm-icons-0.4.0_pre1-cvs-01092003.tar.bz2 2046784 BLAKE2B 2895aa2d14c2154cb3dd31f41c398593f9564e27a8f9d3960e5e11b24ed2d1138ca3c1e187eaf5c9b982451270eb18762504aac4dc7918a0ff6bdee082d238ae SHA512 c2a8f6d6c460ae326381a3bc7ca23fc21986c757ece09a304da8eec5beff826421e1e3089cb1d0016ad7ddf3c650d27d140924b254e4ebb27cc8b8aad794b4f9
-EBUILD wm-icons-0.4.0.ebuild 1174 BLAKE2B 7ebfccedf45548c2256fc9adf47a6952d6da8243a006ae117cc62689cd910a409c6394f219e72729ebf74f3f0630aac31f8c4138c9dcaba166a4c7cae1b8999a SHA512 7d8e15e704d14e7fb58aed27a80d4244bacfc7d1f9f39772e4bf418389f7afbb2b4c6f5e089ce2a0d11c8b9c88fffe64791ab4281004e39829581a53e4fe07c6
-EBUILD wm-icons-0.4.0_pre1-r1.ebuild 1229 BLAKE2B 0b4fa9e1fa43f29932df48c531621cf1ef43f9813e8d1d875f6442e4ddc578a8762d13dfa778e4b9c273fcaa606f2814e868516a7470a8f126f6a261832957db SHA512 60e3b43c131a774f273df28d52b1ac67df1b13b5ee16216ec52d7805bd6d44ac5bbf12e0b30e0978752b46ffce5d92851bc0cef94442b6e0b3650c66b591aaa6
+EBUILD wm-icons-0.4.0.ebuild 1225 BLAKE2B 02a6d767f8c995995be84ed72e1c179a8e93ee363a44a322f536773531091c7aca15b4355a680c50cec422816b48dcbf9d79fc4613462a596df68b620bc3b612 SHA512 7431ce294f297cc4e61149037df461c6d5e3ecdee540b610c4d00972f6c3f86edb4c287324e364f41cc90a7ab414afdbf21e1b4b452f1c9a1f6e9f9ed7752c6e
 MISC metadata.xml 413 BLAKE2B 8658f6251830bc9b10bb617d272d7b77b5ec50e8af755e0b1b906a931634c723535a46f870aab969762a05a6f5b66f4603e22c43db5c41e02076bf160e9a7b9e SHA512 3ac253166be95b1fc9bdc58cf47efeb6095e8ce37ebb76dc8e9a3db57c9385f4777eb0233a0214b044812639ec9406c1f0c80b3ae20c26f411c8494434b5f5b4
diff --git a/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch b/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
index bd92342e1edc..9cc4225ea7b0 100644
--- a/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
+++ b/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
@@ -1,24 +1,22 @@
---- a/configure.in
-+++ b/configure.in
-@@ -129,7 +129,7 @@ AC_OUTPUT(
- 	etc/debian-menu-system/Makefile
- 	devel/Makefile
- 	devel/bin/Makefile
--	bin/Makefile
-+	
- 	bin/wm-icons-config
- 	doc/Makefile
- 	doc/wm-icons.lsm
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -13,8 +13,8 @@ SUBDIRS = bin doc icons etc devel rpm
- # => icondir) is different for the build and install phases, as it
+@@ -14,7 +14,7 @@
  # is for a distribution package building.
+ # Set the default icon set aliases (symlinks).
  install-data-local:
--	# set the default icon set aliases (symlinks)
 -	$(bindir)/wm-icons-config --user-dir="$(icondir)" --defaults --quiet
-+# set the default icon set aliases (symlinks)
-+	true --user-dir="$(icondir)" --defaults --quiet
++	true
+ 
+ wm-configs _pack-symlinks _unpack-symlinks:
+	cd devel/bin && $(MAKE) $(AM_MAKEFLAGS) $@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -417,7 +417,7 @@
+ # is for a distribution package building.
+ # Set the default icon set aliases (symlinks).
+ install-data-local:
+-	$(bindir)/wm-icons-config --user-dir="$(icondir)" --defaults --quiet
++	true
  
  wm-configs _pack-symlinks _unpack-symlinks:
  	cd devel/bin && $(MAKE) $(AM_MAKEFLAGS) $@
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
index d6932e13238d..274b254b905b 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+inherit readme.gentoo-r1
 
 DESCRIPTION="A Large Assortment of Beautiful Themed Icons, Created with FVWM in mind"
 HOMEPAGE="http://wm-icons.sourceforge.net/"
@@ -12,11 +13,24 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/awk dev-lang/perl"
-DEPEND="${RDEPEND} sys-devel/autoconf sys-devel/automake sys-apps/sed"
+RDEPEND="
+	virtual/awk
+	dev-lang/perl
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+DOC_CONTENTS="
+	Users can use the wm-icons-config utility to create aliases in their
+	home directory, FVWM users can then set this in their ImagePath.
+	Sample configurations for fvwm1, fvwm2, fvwm95 and scwm are available in
+	/usr/share/wm-icons
+"
 
 src_configure() {
-	econf --enable-all-sets \
+	econf \
+		--enable-all-sets \
 		--enable-icondir="${EPREFIX}"/usr/share/icons/wm-icons
 }
 
@@ -28,13 +42,9 @@ src_install() {
 	"${ED%/}/usr/bin/wm-icons-config" --force --user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
 
 	einstalldocs
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	einfo "Users can use the wm-icons-config utility to create aliases in their"
-	einfo "home directory, FVWM users can then set this in their ImagePath"
-	einfo
-	einfo "Sample configurations for fvwm1, fvwm2, fvwm95 and scwm are available in"
-	einfo "/usr/share/wm-icons"
-	einfo
+	readme.gentoo_print_elog
 }
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
deleted file mode 100644
index 733a3a198bd7..000000000000
--- a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A Large Assortment of Beautiful Themed Icons, Created with FVWM in mind"
-HOMEPAGE="http://wm-icons.sourceforge.net/"
-SRC_URI="mirror://gentoo/wm-icons-${PV}-cvs-01092003.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="virtual/awk dev-lang/perl"
-
-S=${WORKDIR}/wm-icons
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.0-build.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-icondir="${EPREFIX}"/usr/share/icons/wm-icons
-}
-
-src_install() {
-	# strange makefile...
-	emake icondir="${ED%/}/usr/share/icons/wm-icons" DESTDIR="${D}" install
-
-	rm -rf "${D}"/var
-
-	einfo "Setting default aliases..."
-	"${ED%/}/usr/bin/wm-icons-config" --force --user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	einfo "Users can use the wm-icons-config utility to create aliases in their"
-	einfo "home directory, FVWM users can then set this in their ImagePath"
-	einfo
-	einfo "Sample configurations for fvwm1, fvwm2, fvwm95 and scwm are available in"
-	einfo "/usr/share/wm-icons"
-	einfo
-}