Fix #121453 (configure fails with new coreutils) and remove old version

(Portage version: 2.1_pre4-r1)

7 files changed, 44 insertions, 94 deletions

diff --git a/x11-themes/fvwm-themes/ChangeLog b/x11-themes/fvwm-themes/ChangeLog
index 865f5a9499d1..ba4c77757172 100644
--- a/x11-themes/fvwm-themes/ChangeLog
+++ b/x11-themes/fvwm-themes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/fvwm-themes
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.13 2005/11/02 17:58:39 gustavoz Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.14 2006/02/08 08:07:19 truedfx Exp $
+
+  08 Feb 2006; Harald van Dijk <truedfx@gentoo.org>
+  -files/fvwm-themes-0.6.2-gentoo.patch,
+  +files/fvwm-themes-0.7.0-posix-sort.patch, -fvwm-themes-0.6.2.ebuild,
+  fvwm-themes-0.7.0.ebuild:
+  Fix configure script to work with newer coreutils (#121453)
+  Remove old version
 
   02 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   fvwm-themes-0.7.0.ebuild:
diff --git a/x11-themes/fvwm-themes/Manifest b/x11-themes/fvwm-themes/Manifest
index 22c805a3fa8d..0a074a4e2d9e 100644
--- a/x11-themes/fvwm-themes/Manifest
+++ b/x11-themes/fvwm-themes/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fe2c4cb8d985d9f72a66ea022ec56466 fvwm-themes-0.6.2.ebuild 1108
-MD5 92c86ee3e6e42a773682653bf6ca64ba fvwm-themes-0.7.0.ebuild 1125
-MD5 5fc120fa79f574c8e86738713067e55c ChangeLog 1545
-MD5 fe26baf3e5e1b12866fe888f9b54cbc7 files/fvwm-themes-0.6.2-gentoo.patch 903
-MD5 c3edb7a019e0e522dd05ba85af0f7e7d files/digest-fvwm-themes-0.6.2 70
+MD5 fa82d8b262fff792612cfc29babe3299 ChangeLog 1822
+MD5 6829a5e08ae5216c84baa6a01c1dee2f fvwm-themes-0.7.0.ebuild 1175
 MD5 bb635670857b6057a6a65ce5d2778a2a files/digest-fvwm-themes-0.7.0 70
 MD5 fe26baf3e5e1b12866fe888f9b54cbc7 files/fvwm-themes-0.7.0-gentoo.patch 903
+MD5 fc403291a24a48fd3bc7929d196d0004 files/fvwm-themes-0.7.0-posix-sort.patch 772
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDaP5iKRy60XGEcJIRAmeGAKCE6bYPP3Qk9hnwt7CflKsoirG+1gCfYgau
-bfIb6mn8QbtRhuk6cK7M74A=
-=mY0s
+iD8DBQFD6aYnwnQyISwouHwRAkioAJ98S9Y5WBOG0bwpm+LPWib7IRJgxQCfW3aX
+jxUOM7HzkLeCWwP6mX+4cK8=
+=NdCk
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/fvwm-themes/files/digest-fvwm-themes-0.6.2 b/x11-themes/fvwm-themes/files/digest-fvwm-themes-0.6.2
deleted file mode 100644
index f7d5433ba749..000000000000
--- a/x11-themes/fvwm-themes/files/digest-fvwm-themes-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c2d90ebc2a7c71ae67d136eb73fb5ec fvwm-themes-0.6.2.tar.bz2 592419
diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.6.2-gentoo.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.6.2-gentoo.patch
deleted file mode 100644
index 5fdf7e5f3bb3..000000000000
--- a/x11-themes/fvwm-themes/files/fvwm-themes-0.6.2-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.am~	2002-12-06 03:01:37.000000000 +0100
-+++ Makefile.am	2003-04-15 20:14:34.000000000 +0200
-@@ -32,24 +32,7 @@
- 		$(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 ------------------------------------------------------------------------------
diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch
new file mode 100644
index 000000000000..8d2bb1fc4524
--- /dev/null
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch
@@ -0,0 +1,22 @@
+--- fvwm-themes-0.7.0/configure.in
++++ fvwm-themes-0.7.0/configure.in
+@@ -195,7 +195,7 @@
+ 
+ # Hopefully this "sort" is portable (after many tries using awk and expr)
+ if (echo $REQUIRED_FVWM_VERSION; echo $FVWM_VERSION) \
+-| sed 's/\./ /g' | uniq | sort -n +0 -1 +1 -2 +2 -3 -c 2>/dev/null; then
++| sort -c -n -t . -k 1,1 -k 2,2 -k 3,3 2>/dev/null; then
+ 	:
+ 	# fvwm version is ok
+ else
+--- fvwm-themes-0.7.0/configure
++++ fvwm-themes-0.7.0/configure
+@@ -4863,7 +4863,7 @@
+ 
+ # Hopefully this "sort" is portable (after many tries using awk and expr)
+ if (echo $REQUIRED_FVWM_VERSION; echo $FVWM_VERSION) \
+-| sed 's/\./ /g' | uniq | sort -n +0 -1 +1 -2 +2 -3 -c 2>/dev/null; then
++| sort -c -n -t . -k 1,1 -k 2,2 -k 3,3 2>/dev/null; then
+ 	:
+ 	# fvwm version is ok
+ else
diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.6.2.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.6.2.ebuild
deleted file mode 100644
index c6f0b802f38c..000000000000
--- a/x11-themes/fvwm-themes/fvwm-themes-0.6.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 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.6.2.ebuild,v 1.8 2005/05/20 19:26:10 luckyduck Exp $
-
-IUSE="gnome"
-
-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"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~alpha ~amd64 ppc"
-SLOT="0"
-
-DEPEND="x11-wm/fvwm
-	gnome? ( media-gfx/imagemagick )"
-RDEPEND="x11-wm/fvwm"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	local myconf
-
-	use gnome && myconf="--enable-gnome-icons"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Configuring ${P}"
-	einfo
-
-	fvwm-themes-config --site --reset
-	fvwm-themes-menuapp --site --build-menus --remove-popup
-
-	use gnome && fvwm-themes-images --ft-install --gnome
-}
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 dba0feb22dfd..4cd1cdb403aa 100644
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.11 2005/11/02 17:58:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.12 2006/02/08 08:07:19 truedfx Exp $
 
 IUSE="gnome"
 
@@ -19,8 +19,9 @@ RDEPEND="x11-wm/fvwm"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-posix-sort.patch
 }
 
 src_compile() {
@@ -34,7 +35,7 @@ src_compile() {
 
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }