# HG changeset patch # User Nathan Phillip Brink # Date 2010-04-10 16:44:36 # Node ID 25b90c0cdf2b5951203474614ef82116841675fa # Parent c49126f7ac6cef55938b913c298f6b0e6806f0b0 Drop old versions. Add patch to fix compilation with CFLAGS=-combine. (Portage version: 2.2_rc67-r3/hg/Linux x86_64) (Unsigned Manifest commit) diff --git a/net-misc/whois/ChangeLog b/net-misc/whois/ChangeLog --- a/net-misc/whois/ChangeLog +++ b/net-misc/whois/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for net-misc/whois -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/whois/ChangeLog,v 1.134 2009/11/17 19:49:49 ranger Exp $ + 10 Apr 2010; Nathan Phillip Brink (ohnobinki) + -whois-4.7.30.ebuild, -whois-4.7.33.ebuild, + -whois-4.7.34.ebuild, whois-4.7.36.ebuild, + +files/whois-5.0.1-cflags-combine.patch: + Drop old versions. Add patch to fix compilation with CFLAGS=-combine. + 17 Nov 2009; Brent Baude whois-4.7.36.ebuild: Marking whois-4.7.36 ppc64 for bug 291095 diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -1,12 +1,7 @@ AUX whois-4.7.2-config-file.patch 198 RMD160 874ed86cab594d8fa69ee9599e2a1c3b52c611c7 SHA1 83b2db998f9ee90398138029816952f19a91634a SHA256 b7ad9cb716a8dbd1bb64dc80c1d4460c4a5661ba9420b771f9323c4337dbbea2 AUX whois-4.7.26-gentoo-security.patch 2846 RMD160 e68e6a00fa79ca7a1d06cf8732c01f338563fd1b SHA1 d1ed78c1f9bf21b0db6324901ed3dfbc1fbd2733 SHA256 33d7b92a7506d8de19b9311aac4ec137de82ad592b59116807eef384d81fe6e2 -DIST whois_4.7.30.tar.gz 69685 RMD160 a311c17d19fa8d062379144f9051e22952521262 SHA1 049a8946a62d95d00ca1cafe928a064119237cb0 SHA256 67581c0fa7b75ccea366e531b807b02a7f1dbe6fc55d4cd440e8f09eea491d36 -DIST whois_4.7.33.tar.gz 71804 RMD160 0c05765851c68d4ae512a735ab4d3a18e77ec770 SHA1 0b7ead36d5dd3155ca1563e089371da468894176 SHA256 d27d6936d23a81e481eb35b3ed8d0cde6e2ac801b299580ceae8104bb10e6883 -DIST whois_4.7.34.tar.gz 71941 RMD160 026b134caff5998d355ed6e07919067f36555dc6 SHA1 bf706efc0b85e180e2cd5d2fa265c6015f7b791d SHA256 4ab43d1b638cf3603c8117cdfce25b76e15ab828a1e762ba25ec924cb080e299 +AUX whois-5.0.1-cflags-combine.patch 902 RMD160 9256fc53cafa76bfc3ae1fcfb0832903dea457cb SHA1 b8caf79e4503210eb1b347e93d1cfda94b16ac77 SHA256 26f5d8f24228d295c473ad1de63683f908cec8cd8e4d01c38d4bbbe348fe2013 DIST whois_4.7.36.tar.gz 72516 RMD160 0c26501e4de028fb62541db2a5fe8a38dd99d532 SHA1 b3625fac4fb7fdb9b6ab1305d78bcfe260ec0691 SHA256 5bfbb9f9ad9747795945f876764c974719509705b5c445f42b3bdd6c60c66cea -EBUILD whois-4.7.30.ebuild 1310 RMD160 d872c4fe7e4907cb67e9217e40c9ded12deb1d09 SHA1 e87d733ab8ab663bdab19444427c30a12718ac90 SHA256 a90a0749988f82801ecdbe017f636f4ce5546d218dc45edbe350ffc73db08964 -EBUILD whois-4.7.33.ebuild 1321 RMD160 3f9cd9b84a714353f702c7a4f0d2f67b06793687 SHA1 084ee205a520534873979e22ff794539967e6c32 SHA256 03e9fceacc3e1933f9c89c0a334d385f408d6833bad7ad5a45dc87d4645b4c15 -EBUILD whois-4.7.34.ebuild 1242 RMD160 001c00db3e7875cc8d98652714f1bb76d2429673 SHA1 a1cfb74266bfaf43f40537b772c1d9d1b0f5c795 SHA256 7be9c0740cabde3c33dbdd30a0e914da869e575ad1e9a9a5238a58c5a9f8f5e7 -EBUILD whois-4.7.36.ebuild 1231 RMD160 3b5c68918eb89f336ad87baab57ef4f173eb7a98 SHA1 afea5dfdc49091710d862c6a17753cc48db0b8b5 SHA256 1bc52753e723dc825cc6ebf79e31878b0e935b5a77ed559e13a11cdeb0e9aa6b -MISC ChangeLog 16797 RMD160 81fae3968e182640eb1c9531c21c95916fa23320 SHA1 d4dc2140a2b850a79027fee7eae6051ff23789a2 SHA256 b996c64eadff87a6ae42f50e5dcd5e13431acef293704ecd4ebbd99276ab17b9 +EBUILD whois-4.7.36.ebuild 1286 RMD160 06dc29764e9d34ba1abf9fec6a08d4f5fdd4de1d SHA1 061967b8f26fff3058f3c1afca5818d168737e93 SHA256 45ace090dd484054fbdfeaffe4121b59b1dabdfbde2f8d51dd05bbcb6d859435 +MISC ChangeLog 17083 RMD160 41a8ecde86e0972dfb7c4dae79d4403056898c72 SHA1 b7057190bfbd04569308ea1ec8d6b4aeb934cea4 SHA256 8c2b6514fce2b3b74c2ed01bc06c2158bc2c4fe9c7c7e5455c34ccb996204ffb MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/net-misc/whois/files/whois-5.0.1-cflags-combine.patch b/net-misc/whois/files/whois-5.0.1-cflags-combine.patch new file mode 100644 --- /dev/null +++ b/net-misc/whois/files/whois-5.0.1-cflags-combine.patch @@ -0,0 +1,35 @@ +diff -U 1 -r whois-5.0.1/Makefile whois-5.0.1.bac/Makefile +--- whois-5.0.1/Makefile 2009-12-16 17:40:11.000000000 -0500 ++++ whois-5.0.1.bac/Makefile 2010-04-08 21:39:02.000000000 -0400 +@@ -4,2 +4,3 @@ + ++CAT = cat + PERL = perl +@@ -7,4 +8,8 @@ + ++.PHONY: all install install-whois install-mkpasswd install-pos distclean clean pos depend ++ ++ + whois_OBJECTS := whois.o utils.o + mkpasswd_OBJECTS := mkpasswd.o utils.o ++DEPINFOS := mkpasswd.depinfo utils.depinfo whois.depinfo + +@@ -58,2 +63,5 @@ + ++%.depinfo: %.c ++ $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -MM -MG $< > $@ ++ + whois: $(whois_OBJECTS) +@@ -108,2 +116,3 @@ + rm -f po/*.mo ++ rm -f $(DEPINFOS) + +@@ -113,4 +122,4 @@ + depend: Makefile.depend +-Makefile.depend: +- $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -MM -MG *.c > $@ ++Makefile.depend: $(DEPINFOS) ++ $(CAT) $(DEPINFOS) > $@ + +Only in whois-5.0.1.bac: Makefile.orig +Only in whois-5.0.1.bac: Makefile.rej diff --git a/net-misc/whois/whois-4.7.30.ebuild b/net-misc/whois/whois-4.7.30.ebuild deleted file mode 100644 --- a/net-misc/whois/whois-4.7.30.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.30.ebuild,v 1.8 2009/05/30 18:24:06 nixnut Exp $ - -inherit eutils toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="improved Whois Client" -HOMEPAGE="http://www.linux.it/~md/software/" -SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="nls" -RESTRICT="test" #59327 - -RDEPEND="net-dns/libidn" -DEPEND="${RDEPEND} - >=dev-lang/perl-5" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.7.26-gentoo-security.patch - epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch - - if use nls ; then - cd po - sed -i -e "s:/usr/bin/install:install:" Makefile - echo 'install-pos: install' >> Makefile - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h - sed -i -e "s:cd po.*::" Makefile - fi -} - -src_compile() { - tc-export CC - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" HAVE_LIBIDN=1 || die -} - -src_install() { - emake BASEDIR="${D}" prefix=/usr install || die - insinto /etc - doins whois.conf - dodoc README - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${D}"/usr/share/man/man1/{whois,mdwhois}.1 - mv "${D}"/usr/bin/{whois,mdwhois} - fi -} diff --git a/net-misc/whois/whois-4.7.33.ebuild b/net-misc/whois/whois-4.7.33.ebuild deleted file mode 100644 --- a/net-misc/whois/whois-4.7.33.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.33.ebuild,v 1.1 2009/05/24 18:31:47 vapier Exp $ - -inherit eutils toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="improved Whois Client" -HOMEPAGE="http://www.linux.it/~md/software/" -SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="nls" -RESTRICT="test" #59327 - -RDEPEND="net-dns/libidn" -DEPEND="${RDEPEND} - >=dev-lang/perl-5" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.7.26-gentoo-security.patch - epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch - - if use nls ; then - cd po - sed -i -e "s:/usr/bin/install:install:" Makefile - echo 'install-pos: install' >> Makefile - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h - sed -i -e "s:cd po.*::" Makefile - fi -} - -src_compile() { - tc-export CC - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" HAVE_LIBIDN=1 || die -} - -src_install() { - emake BASEDIR="${D}" prefix=/usr install || die - insinto /etc - doins whois.conf - dodoc README - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${D}"/usr/share/man/man1/{whois,mdwhois}.1 - mv "${D}"/usr/bin/{whois,mdwhois} - fi -} diff --git a/net-misc/whois/whois-4.7.34.ebuild b/net-misc/whois/whois-4.7.34.ebuild deleted file mode 100644 --- a/net-misc/whois/whois-4.7.34.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.34.ebuild,v 1.1 2009/06/25 22:28:48 vapier Exp $ - -inherit eutils toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="improved Whois Client" -HOMEPAGE="http://www.linux.it/~md/software/" -SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="nls" -RESTRICT="test" #59327 - -RDEPEND="net-dns/libidn" -DEPEND="${RDEPEND} - >=dev-lang/perl-5" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.7.26-gentoo-security.patch - epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch - - if use nls ; then - sed -i -e 's:#\(.*pos\):\1:' Makefile - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h - fi -} - -src_compile() { - tc-export CC - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" HAVE_LIBIDN=1 || die -} - -src_install() { - emake BASEDIR="${D}" prefix=/usr install || die - insinto /etc - doins whois.conf - dodoc README debian/changelog - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${D}"/usr/share/man/man1/{whois,mdwhois}.1 - mv "${D}"/usr/bin/{whois,mdwhois} - fi -} diff --git a/net-misc/whois/whois-4.7.36.ebuild b/net-misc/whois/whois-4.7.36.ebuild --- a/net-misc/whois/whois-4.7.36.ebuild +++ b/net-misc/whois/whois-4.7.36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.36.ebuild,v 1.6 2009/11/17 19:49:49 ranger Exp $ @@ -24,6 +24,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PN}-4.7.26-gentoo-security.patch epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch + epatch "${FILESDIR}"/${PN}-5.0.1-cflags-combine.patch if use nls ; then sed -i -e 's:#\(.*pos\):\1:' Makefile