Patch by Jaroslaw Kalinowski to fix build error. (bug #150623)

Package-Manager: portage-2.1.4_rc11

4 files changed, 66 insertions, 18 deletions

diff --git a/x11-themes/fvwm-themes/ChangeLog b/x11-themes/fvwm-themes/ChangeLog
index bc9e52ea18e3..cd28cdd7fb8d 100644
--- a/x11-themes/fvwm-themes/ChangeLog
+++ b/x11-themes/fvwm-themes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/fvwm-themes
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.16 2006/07/08 08:40:31 corsair Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.17 2008/01/06 08:57:22 omp Exp $
+
+  06 Jan 2008; David Shakaryan <omp@gentoo.org>
+  +files/fvwm-themes-0.7.0-gentoo1.patch, fvwm-themes-0.7.0.ebuild:
+  Patch by Jaroslaw Kalinowski to fix build error. (bug #150623)
 
   08 Jul 2006; Markus Rothe <corsair@gentoo.org> fvwm-themes-0.7.0.ebuild:
   Stable on ppc64
diff --git a/x11-themes/fvwm-themes/Manifest b/x11-themes/fvwm-themes/Manifest
index df2ef2317ff7..b9217e6a285c 100644
--- a/x11-themes/fvwm-themes/Manifest
+++ b/x11-themes/fvwm-themes/Manifest
@@ -1,20 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fvwm-themes-0.7.0-gentoo.patch 903 RMD160 0be80245fb91d24ea9e7307480e40eb3ec07c028 SHA1 ed26dd33428f0909073a6cd08f55ffcb653bcd6e SHA256 d9e6facd31d9d84fc668a90dabd0c9801e3ca04f09e441f6090362857c41a9d9
 MD5 fe26baf3e5e1b12866fe888f9b54cbc7 files/fvwm-themes-0.7.0-gentoo.patch 903
 RMD160 0be80245fb91d24ea9e7307480e40eb3ec07c028 files/fvwm-themes-0.7.0-gentoo.patch 903
 SHA256 d9e6facd31d9d84fc668a90dabd0c9801e3ca04f09e441f6090362857c41a9d9 files/fvwm-themes-0.7.0-gentoo.patch 903
+AUX fvwm-themes-0.7.0-gentoo1.patch 958 RMD160 79283cb232e67d7184a520a0dadccb03dbf478e3 SHA1 4abdce6075a6cc4a8ce67846c85befbb4c02ff28 SHA256 7f82418401d15a9ebfc62b681cedc47a894317a623579d345dadbe7f773ea0bb
+MD5 76ea4149acd06595b43dfb5ffa41e9eb files/fvwm-themes-0.7.0-gentoo1.patch 958
+RMD160 79283cb232e67d7184a520a0dadccb03dbf478e3 files/fvwm-themes-0.7.0-gentoo1.patch 958
+SHA256 7f82418401d15a9ebfc62b681cedc47a894317a623579d345dadbe7f773ea0bb files/fvwm-themes-0.7.0-gentoo1.patch 958
 AUX fvwm-themes-0.7.0-posix-sort.patch 772 RMD160 4f18bf0ef0d0b3d3a6ee1a8913d25ed923dec58a SHA1 1c759c7a86e469b324bd5457e9c001d3c6a4c27a SHA256 5839e87c9f2faa2ebe3712824c55106f6c333039fff8dbd575e7639c3c7e7468
 MD5 fc403291a24a48fd3bc7929d196d0004 files/fvwm-themes-0.7.0-posix-sort.patch 772
 RMD160 4f18bf0ef0d0b3d3a6ee1a8913d25ed923dec58a files/fvwm-themes-0.7.0-posix-sort.patch 772
 SHA256 5839e87c9f2faa2ebe3712824c55106f6c333039fff8dbd575e7639c3c7e7468 files/fvwm-themes-0.7.0-posix-sort.patch 772
 DIST fvwm-themes-0.7.0.tar.bz2 921517 RMD160 787147a95cfeb247ee511b6e2a3c5325839bf3e8 SHA1 e6c1fb5f776d4a03e05facfc1bc06f211bfac605 SHA256 0854ab07c2d765a499e6bbb2fd0b2722bc824c5b4fe6d9f917d71042919b5848
-EBUILD fvwm-themes-0.7.0.ebuild 1181 RMD160 650b995a6755cfab50dca313984eb7921bcbc30d SHA1 dc4df800e31facd78691a7d15719d7fbeff1862f SHA256 f05ce15e5ebb73aadb5388239f29a7744f47e0220a3be8e2536c03b125f6c701
-MD5 f85ee27f0d62e31e3853b943c36ace3f fvwm-themes-0.7.0.ebuild 1181
-RMD160 650b995a6755cfab50dca313984eb7921bcbc30d fvwm-themes-0.7.0.ebuild 1181
-SHA256 f05ce15e5ebb73aadb5388239f29a7744f47e0220a3be8e2536c03b125f6c701 fvwm-themes-0.7.0.ebuild 1181
-MISC ChangeLog 2006 RMD160 be2b9e58d7db8cff0a63877341970b2c2e7eaf65 SHA1 35e47b1f8ef75d8c7cd53df2b20d0b239eb9e31f SHA256 aecdfadd76ab094e216783c00832ce738a7d84c5a60b563aaf903ab5822e852c
-MD5 ab187a79df2af26964f6b4f1df13f867 ChangeLog 2006
-RMD160 be2b9e58d7db8cff0a63877341970b2c2e7eaf65 ChangeLog 2006
-SHA256 aecdfadd76ab094e216783c00832ce738a7d84c5a60b563aaf903ab5822e852c ChangeLog 2006
+EBUILD fvwm-themes-0.7.0.ebuild 1211 RMD160 e75ed40dbe9420ce2c6a69471721647ed13bf8c8 SHA1 ea6d8dc17e580eae47dd2c85d1cd2eb8cf5f29be SHA256 25ab7784a75c013fad569970b051bcefbe6aff4008682721bbe6e405e895e34f
+MD5 16d0917cd3c66a38c68df3a4fae9ebc6 fvwm-themes-0.7.0.ebuild 1211
+RMD160 e75ed40dbe9420ce2c6a69471721647ed13bf8c8 fvwm-themes-0.7.0.ebuild 1211
+SHA256 25ab7784a75c013fad569970b051bcefbe6aff4008682721bbe6e405e895e34f fvwm-themes-0.7.0.ebuild 1211
+MISC ChangeLog 2184 RMD160 82b52d636d04c1a65cbb64a5f7fb20beb6ebf928 SHA1 a20c9a03b74eec02ca8f33795bdd74ebad2907a5 SHA256 47171cf60b8a78155c0db45c15d1ed53863a62557ab19039470aec764d74b1a4
+MD5 9004aab5197209ad1deb70676e54a30a ChangeLog 2184
+RMD160 82b52d636d04c1a65cbb64a5f7fb20beb6ebf928 ChangeLog 2184
+SHA256 47171cf60b8a78155c0db45c15d1ed53863a62557ab19039470aec764d74b1a4 ChangeLog 2184
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 metadata.xml 163
@@ -22,3 +29,10 @@ SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797 metadata
 MD5 35563777d7fad11e4ea77b029918acaf files/digest-fvwm-themes-0.7.0 256
 RMD160 22480b60d184e5926f570e6538987b7b93506528 files/digest-fvwm-themes-0.7.0 256
 SHA256 fad8d0e17c4e40792ff4852a23d473a8966c574c24fcd206283e57b8fe805357 files/digest-fvwm-themes-0.7.0 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeAmBgACgkQvSApE0uP4UuUCwCffIkz3s4UY5R5b1msdiSirVOs
+yUoAoKPn1EMhrr/uvHOu3pA6y34a4vVv
+=53DG
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo1.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo1.patch
new file mode 100644
index 000000000000..04d83f4ad98c
--- /dev/null
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo1.patch
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	2007-11-05 22:50:39.000000000 +0100
++++ Makefile.in	2007-11-05 22:57:22.000000000 +0100
+@@ -462,25 +462,6 @@
+ 		$(DESTDIR)$(SETTINGS_FILE) > $(DESTDIR)$(SETTINGS_FILE).tmp && \
+ 	mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)
+ 
+-	PATH="$(DESTDIR)$(bindir):$(FVWM_BINDIR):$$PATH"; \
+-	$(DESTDIR)$(bindir)/fvwm-themes-config --site --reset
+-
+-	if test "$(BUILD_MENUS)" = "yes"; then \
+-		$(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \
+-	fi
+-
+-	if test "$(GNOME_ICONS)" = "yes"; then \
+-		$(DESTDIR)$(bindir)/fvwm-themes-images --ft-install --gnome; \
+-	fi
+-
+-	if test "$(KDE2_ICONS)" = "yes"; then \
+-		$(DESTDIR)$(bindir)/fvwm-themes-images --ft-install --kde2; \
+-	fi
+-
+-	if test "$(RUN_UPDATEMENU)" = "yes"; then \
+-		$(UPDATE_MENU); \
+-	fi
+-
+ 	@echo
+ 	@echo ------------------------------------------------------------------------------
+ 	@echo "fvwm-themes is successfully installed."
diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
index de6d348770da..a8d0b9b4b7e4 100644
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.15 2007/07/12 07:35:24 mr_bones_ Exp $
-
-IUSE="gnome"
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.16 2008/01/06 08:57:22 omp Exp $
 
 inherit eutils
 
 DESCRIPTION="A configuration framework for the fvwm window manager"
 HOMEPAGE="http://fvwm-themes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fvwm-themes/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="gnome"
 
 DEPEND=">=x11-wm/fvwm-2.5.8
 	gnome? ( media-gfx/imagemagick )"
@@ -20,8 +20,10 @@ RDEPEND="x11-wm/fvwm"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-posix-sort.patch
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gentoo1.patch"
+	epatch "${FILESDIR}/${P}-posix-sort.patch"
 }
 
 src_compile() {