commit: 92588b49bef5cfe6f7e16333160d272753c42eb6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 18:43:25 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 18:46:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92588b49
x11-themes/wm-icons: Fix install (#655174 by Kevin Korb)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../wm-icons/files/wm-icons-0.4.0-build.patch | 30 ++++++++++------------
x11-themes/wm-icons/wm-icons-0.4.0.ebuild | 28 +++++++++++++-------
2 files changed, 33 insertions(+), 25 deletions(-)
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 bd92342e1ed..9cc4225ea7b 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 d6932e13238..641611583e1 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
}
