From 6e81f5cd9a43fd0f6c49ad5d5a129570f87870b2 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 4 Feb 2007 01:56:12 +0000 Subject: [PATCH] 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. Package-Manager: portage-2.1.2-r7 --- app-admin/realpath/ChangeLog | 11 +++- app-admin/realpath/Manifest | 66 ++++++++----------- .../realpath/files/digest-realpath-1.9.10 | 1 - .../realpath/files/digest-realpath-1.9.16 | 2 + .../realpath/files/digest-realpath-1.9.3 | 1 - .../files/realpath-1.9.16-Makefile.patch | 43 ++++++++++++ .../files/realpath-1.9.28-Makefile.patch | 44 +++++++++++++ app-admin/realpath/realpath-1.9.10.ebuild | 39 ----------- app-admin/realpath/realpath-1.9.16.ebuild | 11 +++- app-admin/realpath/realpath-1.9.28.ebuild | 11 +++- app-admin/realpath/realpath-1.9.3.ebuild | 24 ------- 11 files changed, 145 insertions(+), 108 deletions(-) delete mode 100644 app-admin/realpath/files/digest-realpath-1.9.10 delete mode 100644 app-admin/realpath/files/digest-realpath-1.9.3 create mode 100644 app-admin/realpath/files/realpath-1.9.16-Makefile.patch create mode 100644 app-admin/realpath/files/realpath-1.9.28-Makefile.patch delete mode 100644 app-admin/realpath/realpath-1.9.10.ebuild delete mode 100644 app-admin/realpath/realpath-1.9.3.ebuild 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 + +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ò realpath-1.9.28.ebuild: Drop ~x86-fbsd keyword and block freebsd-bin, as that already provides a diff --git a/app-admin/realpath/Manifest b/app-admin/realpath/Manifest index 3c3c8e291568..249c60b7ca98 100644 --- a/app-admin/realpath/Manifest +++ b/app-admin/realpath/Manifest @@ -1,40 +1,32 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 776e1be05a2d4d903c1b777af88ab541 ChangeLog 2598 -RMD160 b983b8459209ed7d21307556154082d8c2d544c7 ChangeLog 2598 -SHA256 4e00fe0325df72c3d035fcb09e9e4784e0ce1819ae252c75d36bafc58e0751a5 ChangeLog 2598 -MD5 71c6c08064dca9cfc27fb3f8c9292789 files/digest-realpath-1.9.10 62 -RMD160 77b3efbb5c5cdd13642a8f90d2b4b9e841d66bd3 files/digest-realpath-1.9.10 62 -SHA256 53092df3ca9171d54903e0359fffc03dd6f8fe407bde87cc19811268de396ac8 files/digest-realpath-1.9.10 62 -MD5 afa5ce8cb15a102949a793cac1934ab0 files/digest-realpath-1.9.16 62 -RMD160 c6f9eb698a8bd4aefa4c0b9272315e88ce123553 files/digest-realpath-1.9.16 62 -SHA256 ac227adc3aa51d301c1c35a4dffca99f710fabef3c4b40c456b1e260ba02e805 files/digest-realpath-1.9.16 62 -MD5 136d2dfc67b2a4cb11fbad4ce4ca7913 files/digest-realpath-1.9.28 235 -RMD160 5c70e21b82dbd269fbc03bc126b7bc7805526745 files/digest-realpath-1.9.28 235 -SHA256 39cb6cbcfbb481a2d65ac998d5241f88c7184c03d67de12b0a02d94473003f62 files/digest-realpath-1.9.28 235 -MD5 ad4ce8882c1d563642c89dcd344e6b4d files/digest-realpath-1.9.3 61 -RMD160 e0de06e4ac1cdb6cbe2bd634005f03298c601e0b files/digest-realpath-1.9.3 61 -SHA256 0c6916d19faf497cdca45506a523a1ff2e353af410ba01bdf14605538a19e389 files/digest-realpath-1.9.3 61 +AUX realpath-1.9.16-Makefile.patch 1038 RMD160 0955f94097b6e3f942cec8b1b404d5eef5908ed2 SHA1 3252ef417527e3e370bd77fcf1527f9c6ecf2c4c SHA256 8b2c2013bc4416181429b0000559d59a7ad672c69e044165fe72d44a60edf492 +MD5 e9a5d9c8314d72f170d5656382cadf6b files/realpath-1.9.16-Makefile.patch 1038 +RMD160 0955f94097b6e3f942cec8b1b404d5eef5908ed2 files/realpath-1.9.16-Makefile.patch 1038 +SHA256 8b2c2013bc4416181429b0000559d59a7ad672c69e044165fe72d44a60edf492 files/realpath-1.9.16-Makefile.patch 1038 +AUX realpath-1.9.28-Makefile.patch 1060 RMD160 346d04ce972ad976c3baa9f1bd4f1862d81540c0 SHA1 3fe525241a334f92a41ca065384c9c5e558c2f7b SHA256 81f9b51c71933db619ad5323bda7eb1a8a40a12473f948e72575a227faee6184 +MD5 e0fc572cbfb7c4b31e5691b5827af600 files/realpath-1.9.28-Makefile.patch 1060 +RMD160 346d04ce972ad976c3baa9f1bd4f1862d81540c0 files/realpath-1.9.28-Makefile.patch 1060 +SHA256 81f9b51c71933db619ad5323bda7eb1a8a40a12473f948e72575a227faee6184 files/realpath-1.9.28-Makefile.patch 1060 +DIST dwww_1.9.16.tar.gz 97735 RMD160 7e3b514ab593ccff4e6c5c49f602a9fe586f6987 SHA1 9abcc63fda3f1c23cdf82b0cd47b1eccfd0b67b1 SHA256 2bc5a2dc8c752402fb4d780972aec593b5d1239c5f8b592d85d40334a88a63ac +DIST dwww_1.9.28.tar.gz 108454 RMD160 d1df920ebdec61f9db3087e0b3c437c6db28cf24 SHA1 0abaa328b6c5bde0989b35ba0ea789d182df35ca SHA256 e5af232c98cd614dc15ee3ee79af229f09f32d485935a09c85ae2b5dc333e8d7 +EBUILD realpath-1.9.16.ebuild 1126 RMD160 13a214101a93f79db21b1d455199d79d71d43030 SHA1 990b046db154551d44fb6aaae76df34988b5345c SHA256 1cdcfb0622a4aa24fe4b2f113256ba0c95c6746c35f7cc266ede9fc300038aa6 +MD5 684da53f9c9f4a4bee0d851d79136560 realpath-1.9.16.ebuild 1126 +RMD160 13a214101a93f79db21b1d455199d79d71d43030 realpath-1.9.16.ebuild 1126 +SHA256 1cdcfb0622a4aa24fe4b2f113256ba0c95c6746c35f7cc266ede9fc300038aa6 realpath-1.9.16.ebuild 1126 +EBUILD realpath-1.9.28.ebuild 1234 RMD160 e9d651cc93b55e2809bc0ca806d6320df6eca73c SHA1 00756bc121fe923758aa019ed470f00d3284444c SHA256 69c3e366dc8d20479847f85ad625adb428dfd0886bfa2c979234fcebd1f3f2c8 +MD5 405cd231684e8411beb52a4c26700cc8 realpath-1.9.28.ebuild 1234 +RMD160 e9d651cc93b55e2809bc0ca806d6320df6eca73c realpath-1.9.28.ebuild 1234 +SHA256 69c3e366dc8d20479847f85ad625adb428dfd0886bfa2c979234fcebd1f3f2c8 realpath-1.9.28.ebuild 1234 +MISC ChangeLog 2975 RMD160 d7956e7c4e20e13cf9897d3da0a34eedf2ff0299 SHA1 7e9d4349314c2ca2e0fa18be2b227561d03669cd SHA256 ab2186e538f4fd4c3b6b8ec98e3558b62fb0bc59b9af70736e96d22161536016 +MD5 6b845f9f25436a845577f754d037cef2 ChangeLog 2975 +RMD160 d7956e7c4e20e13cf9897d3da0a34eedf2ff0299 ChangeLog 2975 +SHA256 ab2186e538f4fd4c3b6b8ec98e3558b62fb0bc59b9af70736e96d22161536016 ChangeLog 2975 +MISC metadata.xml 330 RMD160 5950556892ea6f23923cffac156e97738e7fa100 SHA1 c2de52e56f312be68eb5f2966ca0fa62f07c3a4a SHA256 f17d27a5a01ee6d023639016bc98148c14af2ec8566c7253d4049941c1e54760 MD5 7a711b11007db44ec554fbbbd2584253 metadata.xml 330 RMD160 5950556892ea6f23923cffac156e97738e7fa100 metadata.xml 330 SHA256 f17d27a5a01ee6d023639016bc98148c14af2ec8566c7253d4049941c1e54760 metadata.xml 330 -MD5 77b3658d53fbecfa53158666209a50cb realpath-1.9.10.ebuild 964 -RMD160 24a76dc0adf1d0f35b8c13b1f8da9eabba42c0bf realpath-1.9.10.ebuild 964 -SHA256 a51dff2c14470de7976a3d2640614914d5887efb94640c173e87b4e4f6be3219 realpath-1.9.10.ebuild 964 -MD5 0616330d160c23d0a5ebe1bd8cb203cb realpath-1.9.16.ebuild 972 -RMD160 e0d1ea69c1fa1bf37d0809353c301e3372fc5b21 realpath-1.9.16.ebuild 972 -SHA256 f5aaeb71934361f199ad2ea8e947e53f3b1ea7cc7d514e14e371dba7a1e6c7ed realpath-1.9.16.ebuild 972 -MD5 f9b59f1bceb1357ad951a9efe4133fbf realpath-1.9.28.ebuild 1085 -RMD160 2ee50d8b605565448f630fb9670b9a3b24f56e09 realpath-1.9.28.ebuild 1085 -SHA256 1967c2d080068e265a982c02a47e41d80924f921f4b291b1c2ba24ae91c4cb28 realpath-1.9.28.ebuild 1085 -MD5 87286ca1bb4f094eb738192d8b79a956 realpath-1.9.3.ebuild 654 -RMD160 f795dea9edabeed5f89f0fe2fdf3ccdb7ce739dc realpath-1.9.3.ebuild 654 -SHA256 2c6782f7c598fd3b4264314d561654e36016094313db0a5ece0eb8196512c9ec realpath-1.9.3.ebuild 654 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFER+oFAiZjviIA2XgRAqswAJ0f/GLTBwQlyua5+IfHE2IgGn0ekACfTe/6 -50SI8DeKeuC+LeL1qQfH+xI= -=144k ------END PGP SIGNATURE----- +MD5 b2ca211a5c8d7225fa83bbb26d0a0892 files/digest-realpath-1.9.16 232 +RMD160 30f7109d2ae55f8b17554ca327bbffd9f0f6ad56 files/digest-realpath-1.9.16 232 +SHA256 3c3f4268078c4892029e5887d4286468c0b589ad3fae107142f47f94ed121a84 files/digest-realpath-1.9.16 232 +MD5 136d2dfc67b2a4cb11fbad4ce4ca7913 files/digest-realpath-1.9.28 235 +RMD160 5c70e21b82dbd269fbc03bc126b7bc7805526745 files/digest-realpath-1.9.28 235 +SHA256 39cb6cbcfbb481a2d65ac998d5241f88c7184c03d67de12b0a02d94473003f62 files/digest-realpath-1.9.28 235 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 -} -- 2.26.2