summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-06-18 07:03:59 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-06-18 07:03:59 +0000
commit882da66976f9b2590e50dca2a1feca7694e3ab66 (patch)
treee808b9dece073eedbd0792ebf8ee13a5a498f33a /dev-libs/libsigc++
parentRunning auto* tools to fix a problem discussed in bug #54009. (diff)
downloadhistorical-882da66976f9b2590e50dca2a1feca7694e3ab66.tar.gz
historical-882da66976f9b2590e50dca2a1feca7694e3ab66.tar.bz2
historical-882da66976f9b2590e50dca2a1feca7694e3ab66.zip
Fixed dependencies. Ebuild cleanup. Detect bad ACLOCAL_FLAGS. Closes bug #54099.
Diffstat (limited to 'dev-libs/libsigc++')
-rw-r--r--dev-libs/libsigc++/ChangeLog7
-rw-r--r--dev-libs/libsigc++/Manifest12
-rw-r--r--dev-libs/libsigc++/libsigc++-1.2.5.ebuild29
3 files changed, 32 insertions, 16 deletions
diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index 06e905448913..3d074d7a314c 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/libsigc++
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.29 2004/05/21 13:10:09 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.30 2004/06/18 07:03:59 eradicator Exp $
+
+ 18 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ libsigc++-1.2.5.ebuild:
+ Fixed dependencies. Ebuild cleanup. Detect bad ACLOCAL_FLAGS. Closes bug
+ #54099.
21 May 2004; Danny van Dyk <kugelfang@gentoo.org> libsigc++-2.0.1.ebuild:
Added libtoolize/autoconf, necessary on amd64, Marked ~amd64.
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 38f68ed0ba71..c52ebbba4ca7 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,10 +1,10 @@
-MD5 b86671d6167bf52d47deda29003cc15a ChangeLog 3800
-MD5 d569721128615722caadfb535011b92d libsigc++-1.0.4-r2.ebuild 1579
-MD5 9cd6d743a496b1541fb2ee8101fd1fad libsigc++-1.2.2.ebuild 1048
-MD5 2035d08130597fee402e0f0a7b5c00b0 libsigc++-1.2.3.ebuild 1048
-MD5 cf2571ce2903c44d3a8570d8a3f5f42a libsigc++-1.2.5.ebuild 1297
+MD5 4f5f5f098d9dc858666071c2571c9c06 ChangeLog 3969
+MD5 4c3afcc5e6bfbf38095661a8281197ca libsigc++-1.0.4-r2.ebuild 1578
+MD5 a50f2239dc1e4f6661e40b7cdd31f43b libsigc++-1.2.2.ebuild 1047
+MD5 95b5cbffc3ac79f9198f8b65f0a5e5f6 libsigc++-1.2.3.ebuild 1047
+MD5 149cc1fa7c9aa5eec7380f19c639ff95 libsigc++-1.2.5.ebuild 1456
+MD5 4f197152814cc07f5c051d18b8616781 libsigc++-2.0.1.ebuild 1287
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 a772c16dd91383b068650af2d4b98076 libsigc++-2.0.1.ebuild 1288
MD5 628fd3eec229a5ec7bdf9751004f9b46 files/digest-libsigc++-1.0.4-r2 67
MD5 1dafc199015856931c135a0a15a757c1 files/digest-libsigc++-1.2.2 67
MD5 d022afc817cff89e7d0eec21e87613f3 files/digest-libsigc++-1.2.3 67
diff --git a/dev-libs/libsigc++/libsigc++-1.2.5.ebuild b/dev-libs/libsigc++/libsigc++-1.2.5.ebuild
index 57005c9f62f6..a8be99810319 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.5.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.5.ebuild,v 1.14 2004/04/25 21:00:29 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.5.ebuild,v 1.15 2004/06/18 07:03:59 eradicator Exp $
DESCRIPTION="Typesafe callback system for standard C++"
HOMEPAGE="http://libsigc.sourceforge.net/"
@@ -11,21 +11,32 @@ SLOT="1.2"
KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
IUSE="debug"
-DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc"
-src_compile() {
- local myconf
- if [ "${ARCH}" = "amd64" ]; then
- myconf="${myconf} --enabled-maintainer-mode"
+DEPEND="${RDEPEND}
+ amd64? ( >=sys-devel/automake-1.7 )"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ if use amd64; then
libtoolize -c -f --automake
- aclocal -I scripts $ACLOCAL_FLAGS
- automake --add-missing --copy
- autoconf
+ WANT_AUTOMAKE=1.7 aclocal -I scripts ${ACLOCAL_FLAGS} || die "aclocal failed. Are your \$ACLOCAL_FLAGS sane?"
+ WANT_AUTOMAKE=1.7 automake --add-missing --copy
+ WANT_AUTOCONF=2.5 autoconf
fi
+}
+
+src_compile() {
+ local myconf
+
use debug \
&& myconf="--enable-debug=yes" \
|| myconf="--enable-debug=no"
+
econf ${myconf} --enable-maintainer-mode --enable-threads || die
+
emake || die "emake failure"
}