Fix pre-stripping of files, pass CFLAGS and LDFLAGS and get CC using

tc-getCC for bug #152219. Patch by jakub@gentoo.org. Remove old versions.
(Portage version: 2.1.2-r7)

10 files changed, 116 insertions, 71 deletions

diff --git a/app-admin/realpath/ChangeLog b/app-admin/realpath/ChangeLog
index 671be130235c..aad6eac17a93 100644
--- a/app-admin/realpath/ChangeLog
+++ b/app-admin/realpath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/realpath
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/ChangeLog,v 1.21 2006/04/20 20:10:31 flameeyes Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/ChangeLog,v 1.22 2007/02/04 01:56:12 dirtyepic Exp $
+
+  04 Feb 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/realpath-1.9.16-Makefile.patch,
+  +files/realpath-1.9.28-Makefile.patch, -realpath-1.9.3.ebuild,
+  -realpath-1.9.10.ebuild, realpath-1.9.16.ebuild, realpath-1.9.28.ebuild:
+  Fix pre-stripping of files, pass CFLAGS and LDFLAGS and get CC using
+  tc-getCC for bug #152219. Patch by jakub@gentoo.org. Remove old versions.
 
   20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> realpath-1.9.28.ebuild:
   Drop ~x86-fbsd keyword and block freebsd-bin, as that already provides a
diff --git a/app-admin/realpath/files/digest-realpath-1.9.10 b/app-admin/realpath/files/digest-realpath-1.9.10
deleted file mode 100644
index 5acf26063fdc..000000000000
--- a/app-admin/realpath/files/digest-realpath-1.9.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5bc4de9683ac889d86becbd36666fea8 dwww_1.9.10.tar.gz 96864
diff --git a/app-admin/realpath/files/digest-realpath-1.9.16 b/app-admin/realpath/files/digest-realpath-1.9.16
index 2fc15b396dda..d0da8bb11770 100644
--- a/app-admin/realpath/files/digest-realpath-1.9.16
+++ b/app-admin/realpath/files/digest-realpath-1.9.16
@@ -1 +1,3 @@
 MD5 65eb0c4c7925ad6582cd05b091a11d36 dwww_1.9.16.tar.gz 97735
+RMD160 7e3b514ab593ccff4e6c5c49f602a9fe586f6987 dwww_1.9.16.tar.gz 97735
+SHA256 2bc5a2dc8c752402fb4d780972aec593b5d1239c5f8b592d85d40334a88a63ac dwww_1.9.16.tar.gz 97735
diff --git a/app-admin/realpath/files/digest-realpath-1.9.3 b/app-admin/realpath/files/digest-realpath-1.9.3
deleted file mode 100644
index 3caf07d9526b..000000000000
--- a/app-admin/realpath/files/digest-realpath-1.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86afe331e9a62a7b234395fc0512a91c dwww_1.9.3.tar.gz 92058
diff --git a/app-admin/realpath/files/realpath-1.9.16-Makefile.patch b/app-admin/realpath/files/realpath-1.9.16-Makefile.patch
new file mode 100644
index 000000000000..436f1705b4e3
--- /dev/null
+++ b/app-admin/realpath/files/realpath-1.9.16-Makefile.patch
@@ -0,0 +1,43 @@
+diff -Naur dwww-1.9.16-orig/Makefile dwww-1.9.16/Makefile
+--- dwww-1.9.16-orig/Makefile	2003-09-02 14:02:00.000000000 -0600
++++ dwww-1.9.16/Makefile	2007-02-03 19:26:06.000000000 -0600
+@@ -6,24 +6,24 @@
+ VERSION	= $(shell dpkg-parsechangelog | sed -ne 's/^Version: *//p')
+ 
+ CC	= gcc
+-CFLAGS	= -Wall -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' 
+-LDFLAGS	=
++CFLAGS	+= -Wall -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' 
++LDFLAGS	+=
+ LIBS	= -lpub
+ 
+ 
+-ifeq (,$(findstring nodebug,$(DEB_BUILD_OPTIONS)))
+-  CFLAGS += -g
+-endif
+-
+-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+-  CFLAGS += -O0
+-else
+-  CFLAGS += -O2
+-endif
+-
+-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+-  LDFLAGS += -s
+-endif
++#ifeq (,$(findstring nodebug,$(DEB_BUILD_OPTIONS)))
++#  CFLAGS += -g
++#endif
++#
++#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++#  CFLAGS += -O0
++#else
++#  CFLAGS += -O2
++#endif
++#
++#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++#  LDFLAGS += -s
++#endif
+ 
+ 
+ prefix		= debian/dwww
diff --git a/app-admin/realpath/files/realpath-1.9.28-Makefile.patch b/app-admin/realpath/files/realpath-1.9.28-Makefile.patch
new file mode 100644
index 000000000000..eeb7e89a26b1
--- /dev/null
+++ b/app-admin/realpath/files/realpath-1.9.28-Makefile.patch
@@ -0,0 +1,44 @@
+diff -Naur dwww-1.9.28-orig/Makefile dwww-1.9.28/Makefile
+--- dwww-1.9.28-orig/Makefile	2006-01-14 05:06:21.000000000 -0600
++++ dwww-1.9.28/Makefile	2007-02-03 19:45:32.000000000 -0600
+@@ -6,25 +6,25 @@
+ VERSION	= $(shell dpkg-parsechangelog | sed -ne 's/^Version: *//p')
+ 
+ CC	= gcc
+-CFLAGS	= -Wall -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' 
+-LDFLAGS	=
++CFLAGS	+= -Wall -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' 
++LDFLAGS	+=
+ LIBS	= -lpub
+ PERL	= /usr/bin/perl
+ 
+ 
+-ifeq (,$(findstring nodebug,$(DEB_BUILD_OPTIONS)))
+-  CFLAGS += -g
+-endif
+-
+-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+-  CFLAGS += -O0
+-else
+-  CFLAGS += -O2
+-endif
+-
+-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+-  LDFLAGS += -s
+-endif
++#ifeq (,$(findstring nodebug,$(DEB_BUILD_OPTIONS)))
++#  CFLAGS += -g
++#endif
++#
++#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++#  CFLAGS += -O0
++#else
++#  CFLAGS += -O2
++#endif
++#
++#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++#  LDFLAGS += -s
++#endif
+ 
+ 
+ prefix		= debian/dwww
diff --git a/app-admin/realpath/realpath-1.9.10.ebuild b/app-admin/realpath/realpath-1.9.10.ebuild
deleted file mode 100644
index cae62934ffa1..000000000000
--- a/app-admin/realpath/realpath-1.9.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.10.ebuild,v 1.10 2005/01/03 00:10:33 gongloo Exp $
-
-DESCRIPTION="Return the canonicalized absolute pathname"
-HOMEPAGE="http://packages.debian.org/unstable/utils/realpath.html"
-SRC_URI="mirror://debian/pool/main/d/dwww/dwww_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips amd64 ppc64 ppc-macos"
-IUSE=""
-
-S=${WORKDIR}/dwww-${PV}
-
-src_unpack() {
-	if use ppc-macos; then
-		local dirname="dwww-${PV}"
-		tar xzf ${DISTDIR}/${A} \
-			${dirname}/Makefile \
-			${dirname}/realpath.c \
-			${dirname}/README \
-			${dirname}/TODO \
-			${dirname}/BUGS \
-			${dirname}/man/realpath.1 || die "unpack failed."
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	make LIBS='' VERSION=$PV realpath || die
-}
-
-src_install() {
-	dobin realpath || die
-	doman man/realpath.1
-	dodoc README TODO BUGS
-}
diff --git a/app-admin/realpath/realpath-1.9.16.ebuild b/app-admin/realpath/realpath-1.9.16.ebuild
index 45e8276f99ce..d1f88b955c69 100644
--- a/app-admin/realpath/realpath-1.9.16.ebuild
+++ b/app-admin/realpath/realpath-1.9.16.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.16.ebuild,v 1.8 2005/07/16 03:02:44 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.16.ebuild,v 1.9 2007/02/04 01:56:12 dirtyepic Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Return the canonicalized absolute pathname"
 HOMEPAGE="http://packages.debian.org/unstable/utils/realpath.html"
@@ -26,6 +28,11 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+
+	sed -i -e "s:gcc:$(tc-getCC):" Makefile || die "sed failed."
 }
 
 src_compile() {
diff --git a/app-admin/realpath/realpath-1.9.28.ebuild b/app-admin/realpath/realpath-1.9.28.ebuild
index f7037910b02a..2a7ec6a3d9e0 100644
--- a/app-admin/realpath/realpath-1.9.28.ebuild
+++ b/app-admin/realpath/realpath-1.9.28.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.28.ebuild,v 1.3 2006/04/20 20:10:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.28.ebuild,v 1.4 2007/02/04 01:56:12 dirtyepic Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Return the canonicalized absolute pathname"
 HOMEPAGE="http://packages.debian.org/unstable/utils/realpath.html"
@@ -31,6 +33,11 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+
+	sed -i -e "s:gcc:$(tc-getCC):" Makefile || die "sed failed."
 }
 
 src_compile() {
diff --git a/app-admin/realpath/realpath-1.9.3.ebuild b/app-admin/realpath/realpath-1.9.3.ebuild
deleted file mode 100644
index 8adf0e379df8..000000000000
--- a/app-admin/realpath/realpath-1.9.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.3.ebuild,v 1.10 2005/01/01 11:23:10 eradicator Exp $
-
-DESCRIPTION="Return the canonicalized absolute pathname"
-HOMEPAGE="http://packages.debian.org/unstable/utils/realpath.html"
-SRC_URI="mirror://debian/pool/main/d/dwww/dwww_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~mips amd64"
-IUSE=""
-
-S=${WORKDIR}/dwww-${PV}
-
-src_compile() {
-	make LIBS='' VERSION=$PV realpath || die
-}
-
-src_install() {
-	dobin realpath || die
-	doman man/realpath.1
-	dodoc README TODO
-}