From e32f95df8b28b01e45436c6b0bdacae1206204b6 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 4 Feb 2007 02:17:49 +0000 Subject: [PATCH] Fix pre-stripped files and get CC through tc-getCC. Bug #152253. Package-Manager: portage-2.1.2-r7 --- app-misc/countrycodes/ChangeLog | 8 ++++++-- app-misc/countrycodes/Manifest | 20 +++++++++++-------- .../countrycodes/countrycodes-1.0.5.ebuild | 15 ++++++++++++-- .../files/countrycodes-1.0.5-Makefile.patch | 12 +++++++++++ 4 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 app-misc/countrycodes/files/countrycodes-1.0.5-Makefile.patch diff --git a/app-misc/countrycodes/ChangeLog b/app-misc/countrycodes/ChangeLog index 7206e0b6261d..117ffc14d14d 100644 --- a/app-misc/countrycodes/ChangeLog +++ b/app-misc/countrycodes/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/countrycodes -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/countrycodes/ChangeLog,v 1.17 2006/12/04 20:45:35 eroyf Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/countrycodes/ChangeLog,v 1.18 2007/02/04 02:17:49 dirtyepic Exp $ + + 04 Feb 2007; Ryan Hill + +files/countrycodes-1.0.5-Makefile.patch, countrycodes-1.0.5.ebuild: + Fix pre-stripped files and get CC through tc-getCC. Bug #152253. 04 Dec 2006; Alexander H. Færøy countrycodes-1.0.5.ebuild: diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest index ca96e92d9744..2d1d9a939a43 100644 --- a/app-misc/countrycodes/Manifest +++ b/app-misc/countrycodes/Manifest @@ -1,12 +1,16 @@ +AUX countrycodes-1.0.5-Makefile.patch 564 RMD160 4f9e7d9048db744783f212ea1e9bcd8bda5e28ad SHA1 14f377e5537dce216ce365a786e91d37eb4bc208 SHA256 120e0483546f0d93009902f445a3360a5a0460ee78b03a188a8e149b7953886c +MD5 234196e4f1be2aa262118d615ccae68b files/countrycodes-1.0.5-Makefile.patch 564 +RMD160 4f9e7d9048db744783f212ea1e9bcd8bda5e28ad files/countrycodes-1.0.5-Makefile.patch 564 +SHA256 120e0483546f0d93009902f445a3360a5a0460ee78b03a188a8e149b7953886c files/countrycodes-1.0.5-Makefile.patch 564 DIST countrycodes-1.0.5.tar.gz 18621 RMD160 7231b553098ddbb3e3fc9d4e300f7dfdb3c078e3 SHA1 892a69dfabc0493fc8b38619c2be708fe7461ff5 SHA256 e56e10442c7353c39cd9e57fa747df279ae39a84a89336644a58c29de5b2b39b -EBUILD countrycodes-1.0.5.ebuild 905 RMD160 95defefd264cbae1a90f25d2b35c8f027b1b87a6 SHA1 844e411b8c60cdbd42bb68cc0766133ad7b52f01 SHA256 31fa0327736cde397b41aeafaa36a4e696ebf33c4b830e17006ba1f2ec8b0fcf -MD5 ba9cf682b9c4f288e4f8a16d8eb9eee5 countrycodes-1.0.5.ebuild 905 -RMD160 95defefd264cbae1a90f25d2b35c8f027b1b87a6 countrycodes-1.0.5.ebuild 905 -SHA256 31fa0327736cde397b41aeafaa36a4e696ebf33c4b830e17006ba1f2ec8b0fcf countrycodes-1.0.5.ebuild 905 -MISC ChangeLog 1969 RMD160 735efabf5f3ab27e668e1fd2d84d3aacd9b3e418 SHA1 79123eb39230d8716c9fd1562cf7fa44decf149b SHA256 e56af2aff760b8464e6fe5bfacfec7fed339f65e066164803fc0bdf34e52efdb -MD5 cd5ba6af82f842138526108c8f94e9f4 ChangeLog 1969 -RMD160 735efabf5f3ab27e668e1fd2d84d3aacd9b3e418 ChangeLog 1969 -SHA256 e56af2aff760b8464e6fe5bfacfec7fed339f65e066164803fc0bdf34e52efdb ChangeLog 1969 +EBUILD countrycodes-1.0.5.ebuild 1092 RMD160 7750ebd96ac39f5dd5d8be0fc4fb39347382f502 SHA1 84b51d14e73d56ed5c7353a83c75c95f647b1722 SHA256 93ce18b4a8686534bde780be78c9ddaf2dbf23f5d2937e28640eec8ab49f73b1 +MD5 07b7190e459989807fe31bced3285f4b countrycodes-1.0.5.ebuild 1092 +RMD160 7750ebd96ac39f5dd5d8be0fc4fb39347382f502 countrycodes-1.0.5.ebuild 1092 +SHA256 93ce18b4a8686534bde780be78c9ddaf2dbf23f5d2937e28640eec8ab49f73b1 countrycodes-1.0.5.ebuild 1092 +MISC ChangeLog 2161 RMD160 01f45068c4e52261ba101390a927921371a76563 SHA1 2114cb5f66801d08ffb9b5e952031fc4474347dd SHA256 5cff500be939b4a0e470e94600614938d40f4156599a01fd0025638ad2df9a8b +MD5 5069648fd31466341741b3d888324881 ChangeLog 2161 +RMD160 01f45068c4e52261ba101390a927921371a76563 ChangeLog 2161 +SHA256 5cff500be939b4a0e470e94600614938d40f4156599a01fd0025638ad2df9a8b ChangeLog 2161 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd MD5 0c131a7201c4670302767f93643876fa metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 metadata.xml 165 diff --git a/app-misc/countrycodes/countrycodes-1.0.5.ebuild b/app-misc/countrycodes/countrycodes-1.0.5.ebuild index afcf57249c87..d5fa31f49e7b 100644 --- a/app-misc/countrycodes/countrycodes-1.0.5.ebuild +++ b/app-misc/countrycodes/countrycodes-1.0.5.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-misc/countrycodes/countrycodes-1.0.5.ebuild,v 1.17 2006/12/04 20:45:35 eroyf Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/countrycodes/countrycodes-1.0.5.ebuild,v 1.18 2007/02/04 02:17:49 dirtyepic Exp $ + +inherit eutils toolchain-funcs DESCRIPTION="An ISO 3166 country code finder" HOMEPAGE="http://www.grigna.com/diego/linux/countrycodes/" @@ -15,6 +17,15 @@ RDEPEND="virtual/libc" DEPEND="${RDEPEND} sys-apps/sed" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-Makefile.patch + + sed -i -e "s:gcc:$(tc-getCC):" src/Makefile || die "sed failed" +} + src_compile() { emake -C src CCOPTS="${CFLAGS}" || die "emake failed" } diff --git a/app-misc/countrycodes/files/countrycodes-1.0.5-Makefile.patch b/app-misc/countrycodes/files/countrycodes-1.0.5-Makefile.patch new file mode 100644 index 000000000000..619d7a072360 --- /dev/null +++ b/app-misc/countrycodes/files/countrycodes-1.0.5-Makefile.patch @@ -0,0 +1,12 @@ +diff -Naur countrycodes-1.0.5-orig/src/Makefile countrycodes-1.0.5/src/Makefile +--- countrycodes-1.0.5-orig/src/Makefile 2003-02-01 09:56:08.000000000 -0600 ++++ countrycodes-1.0.5/src/Makefile 2007-02-03 20:12:26.000000000 -0600 +@@ -70,7 +70,7 @@ + strip $(PROGRAM) + + install: +- $(INSTALL) -g root -m $(BINMODE) -o root -s ${srcdir}/$(PROGRAM) ${bindir} ++ $(INSTALL) -g root -m $(BINMODE) -o root ${srcdir}/$(PROGRAM) ${bindir} + @echo "Installing man page..." + @$(SEDBIN) $(SEDCMDS) ${docdir}/iso3166.1.in > ${mandir}/iso3166.1 + @chown 0.0 ${mandir}/iso3166.1 -- 2.26.2