gentoo resync : 23.06.2018

4 files changed, 35 insertions, 82 deletions

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
-}