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
commitf4f1c638be93da4f892e387871b05524e75aea46 (patch)
tree6e13a23d4ccf34f7c77acdc42a87a2d4320d67c8 /dev-libs/libsigc++
parentRunning auto* tools to fix a problem discussed in bug #54009. (Manifest recom... (diff)
downloadgentoo-2-f4f1c638be93da4f892e387871b05524e75aea46.tar.gz
gentoo-2-f4f1c638be93da4f892e387871b05524e75aea46.tar.bz2
gentoo-2-f4f1c638be93da4f892e387871b05524e75aea46.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++/libsigc++-1.2.5.ebuild29
2 files changed, 26 insertions, 10 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++/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"
}