summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-12-02 00:41:31 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-12-02 00:41:31 +0000
commit4a9508a498363e52a0c88f0fd1eb70dcfd747c5d (patch)
tree163234adaf1de416ea5d33b0a6d66e9ee38a52ec /media-video/camserv
parentStable on amd64 wrt bug #347099 (diff)
downloadgentoo-2-4a9508a498363e52a0c88f0fd1eb70dcfd747c5d.tar.gz
gentoo-2-4a9508a498363e52a0c88f0fd1eb70dcfd747c5d.tar.bz2
gentoo-2-4a9508a498363e52a0c88f0fd1eb70dcfd747c5d.zip
No longer force automake 1.6; this allows the package to be built with libtool-2.4
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
Diffstat (limited to 'media-video/camserv')
-rw-r--r--media-video/camserv/ChangeLog9
-rw-r--r--media-video/camserv/camserv-0.5.1-r2.ebuild9
2 files changed, 11 insertions, 7 deletions
diff --git a/media-video/camserv/ChangeLog b/media-video/camserv/ChangeLog
index 693c3882900b..f88e46f8aa64 100644
--- a/media-video/camserv/ChangeLog
+++ b/media-video/camserv/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/camserv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.22 2009/11/26 10:22:09 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.23 2010/12/02 00:41:31 flameeyes Exp $
+
+ 02 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ camserv-0.5.1-r2.ebuild:
+ No longer force automake 1.6; this allows the package to be built with
+ libtool-2.4
26 Nov 2009; Markus Meier <maekke@gentoo.org> camserv-0.5.1-r2.ebuild:
amd64 stable, bug #287170
diff --git a/media-video/camserv/camserv-0.5.1-r2.ebuild b/media-video/camserv/camserv-0.5.1-r2.ebuild
index 67c7ab5b218e..476d1ebe697b 100644
--- a/media-video/camserv/camserv-0.5.1-r2.ebuild
+++ b/media-video/camserv/camserv-0.5.1-r2.ebuild
@@ -1,9 +1,6 @@
-# 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/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.13 2009/11/26 10:22:09 maekke Exp $
-
-WANT_AUTOCONF=2.5
-WANT_AUTOMAKE=1.6
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.14 2010/12/02 00:41:31 flameeyes Exp $
inherit autotools eutils
@@ -26,6 +23,8 @@ src_unpack() {
epatch "${FILESDIR}"/${P/.1}-errno.patch
epatch "${FILESDIR}"/${P}-libtool.patch
epatch "${FILESDIR}"/${P}-memcpy.patch
+ # no longer existing macro, but we don't need it
+ sed -i -e '/AM_ACLOCAL_INCLUDE/d' configure.in || die
AT_M4DIR="${S}/macros" eautoreconf
}