summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-10-10 08:35:14 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-10-10 08:35:14 +0000
commit0aecc42c2cfa388de04e8bba47358dfda6522542 (patch)
tree1d4e2b80366634f9e94dd542ba44352cd020e5bc /net-misc/aggregate
parentadd cxx use flag (diff)
downloadhistorical-0aecc42c2cfa388de04e8bba47358dfda6522542.tar.gz
historical-0aecc42c2cfa388de04e8bba47358dfda6522542.tar.bz2
historical-0aecc42c2cfa388de04e8bba47358dfda6522542.zip
Fix pre-stripping for bug #240930, also now builds with the user CFLAGS and LDFLAGS.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64
Diffstat (limited to 'net-misc/aggregate')
-rw-r--r--net-misc/aggregate/ChangeLog9
-rw-r--r--net-misc/aggregate/Manifest5
-rw-r--r--net-misc/aggregate/aggregate-1.6.ebuild16
-rw-r--r--net-misc/aggregate/files/aggregate-1.6-build-fixup.patch14
4 files changed, 35 insertions, 9 deletions
diff --git a/net-misc/aggregate/ChangeLog b/net-misc/aggregate/ChangeLog
index 2a1b8a868401..6bca1ba848c4 100644
--- a/net-misc/aggregate/ChangeLog
+++ b/net-misc/aggregate/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/aggregate
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate/ChangeLog,v 1.13 2007/04/22 08:48:42 kloeri Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate/ChangeLog,v 1.14 2008/10/10 08:35:14 robbat2 Exp $
+
+ 10 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/aggregate-1.6-build-fixup.patch, aggregate-1.6.ebuild:
+ Fix pre-stripping for bug #240930, also now builds with the user CFLAGS
+ and LDFLAGS.
22 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> aggregate-1.6.ebuild:
Stable on Mips, bug 173860.
diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest
index fef8718c470b..311f8fede05e 100644
--- a/net-misc/aggregate/Manifest
+++ b/net-misc/aggregate/Manifest
@@ -1,4 +1,5 @@
+AUX aggregate-1.6-build-fixup.patch 362 RMD160 4d619f9f6bcbbb58674f02e1eacbebf85c37be54 SHA1 3e37a6a4f6b6d4aecc6ec99ba555a9a848f7a313 SHA256 18c1858d07b1ae3117ae844e800bb63c5398df1cc971dec0b76450f6cc52d0d9
DIST aggregate-1.6.tar.gz 20566 RMD160 f6ce594c0fb44642c839d1514d8c3e3fe014a865 SHA1 13420baf4f3f93dbed3c380ab6cca175609c5d7d SHA256 166503005cd8722c730e530cc90652ddfa198a25624914c65dffc3eb87ba5482
-EBUILD aggregate-1.6.ebuild 699 RMD160 0a3cbee5ed27393b3d5e5fe5bbb683b59ac35a95 SHA1 7f83289d8451aff4547effe192e1faa1cb3aa954 SHA256 166aa31fa5bf32e7723190b023fc8259ed25a988edf0aec9df013d1750a3d1b1
-MISC ChangeLog 1585 RMD160 f6e75335b8abb2036b5a30f84da8eb1219b357ec SHA1 774adbc15eaf9386d2e7da88c03e9336ebd3e9b2 SHA256 d05bcc39b9f6515d1d82a25a3f304e24d49f8a025ba1f91ab5b03563a6befe0c
+EBUILD aggregate-1.6.ebuild 771 RMD160 519895b4a45dbad3a5c77738d4a728d879ca82aa SHA1 0f710c665268ebb5d7bb5b798b62e9d0453b36fe SHA256 903803caeae71325b9c698db5ac821375198f574254f35d773eda6e034618511
+MISC ChangeLog 1793 RMD160 ebf521794d2b5e85bf68172b5728f67a7fe7a77e SHA1 21322a5631c5743044ca8e3cd075386ace08072c SHA256 27ae23cab42e5f8288a76e8246b468f8cd6cc6054dc12fd872cf1ad41dd45e70
MISC metadata.xml 982 RMD160 431f958562b5b3f78edb5f7318d3a93c69a4da4b SHA1 904427c9f56e5e9a022bdd94856a8dd95b70f9c1 SHA256 a360aaeb1657b807a204f81b658b12de344d936fa258478992499d9baf70262f
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index f6cd0b4ee362..830b3cacb2ff 100644
--- a/net-misc/aggregate/aggregate-1.6.ebuild
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate/aggregate-1.6.ebuild,v 1.13 2007/04/22 08:48:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate/aggregate-1.6.ebuild,v 1.14 2008/10/10 08:35:14 robbat2 Exp $
+
+inherit eutils
DESCRIPTION="aggregate takes a list of prefixes in conventional format on stdin, and performs two optimisations to reduce the length of the prefix list."
-BASE_URI="http://dist.automagic.org/"
-HOMEPAGE="${BASE_URI}"
-SRC_URI="${BASE_URI}/${P}.tar.gz"
+HOMEPAGE="http://dist.automagic.org/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
@@ -13,6 +14,11 @@ IUSE=""
DEPEND=""
RDEPEND="dev-lang/perl"
+src_unpack() {
+ unpack "${A}"
+ epatch "${FILESDIR}"/${P}-build-fixup.patch
+}
+
src_install() {
dobin aggregate aggregate-ios
doman aggregate.1 aggregate-ios.1
diff --git a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
new file mode 100644
index 000000000000..51c9f9f96128
--- /dev/null
+++ b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
@@ -0,0 +1,14 @@
+diff -Nuar aggregate-1.6.orig/Makefile.in aggregate-1.6/Makefile.in
+--- aggregate-1.6.orig/Makefile.in 2002-03-06 08:59:37.000000000 -0800
++++ aggregate-1.6/Makefile.in 2008-10-10 01:31:42.613937925 -0700
+@@ -25,8 +25,8 @@
+ INSTALL = @INSTALL@
+ DEFS = @DEFS@
+ LIBS = @LIBS@
+-CFLAGS = -O
+-LDFLAGS = -s
++CFLAGS +=
++LDFLAGS +=
+ prefix = @prefix@
+
+ SHELL = /bin/sh