gentoo resync : 28.04.2018

4 files changed, 55 insertions, 34 deletions

diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest
index 7cf248079804..ac76ecce204d 100644
--- a/x11-themes/wm-icons/Manifest
+++ b/x11-themes/wm-icons/Manifest
@@ -1,5 +1,6 @@
+AUX wm-icons-0.4.0-build.patch 747 BLAKE2B d74f553bd1f7c4de8c2dbb9e128f5da13dd39d72d440c6a6815f7d70abc319eaf134850e370f02c5471caec39708edb8759441a516da3766ac78c67438498734 SHA512 3f48412b4af34a1ae3ed781182c28f269c85cc582e93292c17bc681d67cc2801ed58264d3b05d66341ac0df6ec1262869b00aa6880fb8f4c66c16f0f6b5ea790
 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 1167 BLAKE2B d49b937e3b832b203af3e8fde7b1f266f5d06ef44629b7b20fdf08598d4288d8b7579fd55dc1f72cabeadff256319ef29eb94a9be2711b2a23259591161260ea SHA512 c3f44c3bc956e2cdc32d04a20fcc45b786bbda4afac64b15d80ecd27ed4e3e15487243ff31561091e501578b57de0be4322fea03c1ea3afbdec054dd4829f042
-EBUILD wm-icons-0.4.0_pre1-r1.ebuild 1577 BLAKE2B c5aeda99c0ab129349e0bd9528a26a6ee231d0c42971070952393a116832faff96a6b7cbb04142600e64b635606d54f399912a5043d8a1e3bd700ff313d46840 SHA512 840dc711156fceb435a17291dc174981127c333f64ef937300fafaf6a9af61575f7a25e3e80e952c8ecedda86ddc6398faed798da8e4a4ef09ef4dc1b514833d
+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
 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
new file mode 100644
index 000000000000..bd92342e1edc
--- /dev/null
+++ b/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
@@ -0,0 +1,24 @@
+--- 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
+ # is for a distribution package building.
+ 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
+ 
+ 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 0ab33021870c..d6932e13238d 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind"
+EAPI=6
 
+DESCRIPTION="A Large Assortment of Beautiful Themed Icons, Created with FVWM in mind"
 HOMEPAGE="http://wm-icons.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wm-icons/wm-icons-${PV}.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 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"
 
-src_compile() {
-	econf --enable-all-sets --enable-icondir=/usr/share/icons/wm-icons || die "econf failed"
-	emake || die
+src_configure() {
+	econf --enable-all-sets \
+		--enable-icondir="${EPREFIX}"/usr/share/icons/wm-icons
 }
 
 src_install() {
-	make icondir="${D}/usr/share/icons/wm-icons" DESTDIR="${D}" install
+	# strange makefile...
+	emake icondir="${ED%/}/usr/share/icons/wm-icons" DESTDIR="${D}" install
 
 	einfo "Setting default aliases..."
-	"${D}"/usr/bin/wm-icons-config --force --user-dir="${D}/usr/share/icons/wm-icons" --defaults
+	"${ED%/}/usr/bin/wm-icons-config" --force --user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
 
-	dodoc AUTHORS ChangeLog NEWS README
+	einstalldocs
 }
 
 pkg_postinst() {
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
index 68a7e5ba3b2d..733a3a198bd7 100644
--- 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
@@ -1,52 +1,46 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit autotools
+EAPI=6
 
-DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind"
+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"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 x86"
-
 IUSE=""
+
 RDEPEND="virtual/awk dev-lang/perl"
 
 S=${WORKDIR}/wm-icons
 
-src_unpack() {
-	unpack ${A}
-
-	sed -i 's#$(bindir)/wm-icons-config#true#g' "${S}"/Makefile.am
-	# duplication of bin/Makefile in configure.in #91764
-	sed -i '132s/bin\/Makefile//' "${S}"/configure.in
-	# non-portable comment bombs automake.
-	sed -i 's/\t#/#/' "${S}"/Makefile.am
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.0-build.patch
+)
 
-	cd "${S}"
+src_prepare() {
+	default
 	eautoreconf
 }
 
-src_compile() {
-	econf --enable-all-sets --enable-icondir=/usr/share/icons/wm-icons || die "econf failed"
-	emake || die "emake failed"
+src_configure() {
+	econf --enable-icondir="${EPREFIX}"/usr/share/icons/wm-icons
 }
 
 src_install() {
 	# strange makefile...
-	einstall icondir="${D}/usr/share/icons/wm-icons" DESTDIR="${D}" || die
+	emake icondir="${ED%/}/usr/share/icons/wm-icons" DESTDIR="${D}" install
 
-	dodir /usr/bin
-	mv "${D}"/"${D}"/usr/bin/wm-icons-config "${D}"/usr/bin/wm-icons-config
 	rm -rf "${D}"/var
 
 	einfo "Setting default aliases..."
-	"${D}"/usr/bin/wm-icons-config --user-dir="${D}/usr/share/icons/wm-icons" --defaults
+	"${ED%/}/usr/bin/wm-icons-config" --force --user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
 
-	dodoc AUTHORS ChangeLog NEWS README
+	einstalldocs
 }
 
 pkg_postinst() {