Switch to autotools, bug 249638

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 26 insertions, 24 deletions

diff --git a/media-libs/libdvdread/ChangeLog b/media-libs/libdvdread/ChangeLog
index 071fe338ee4d..b78f23c7c421 100644
--- a/media-libs/libdvdread/ChangeLog
+++ b/media-libs/libdvdread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdvdread
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/ChangeLog,v 1.59 2009/03/09 17:54:13 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/ChangeLog,v 1.60 2009/03/09 18:55:16 beandog Exp $
+
+  09 Mar 2009; Steve Dibb <beandog@gentoo.org>
+  libdvdread-4.1.3_p1168.ebuild, libdvdread-9999.ebuild:
+  Switch to autotools, bug 249638
 
 *libdvdread-9999 (09 Mar 2009)
 *libdvdread-4.1.3_p1168 (09 Mar 2009)
diff --git a/media-libs/libdvdread/libdvdread-4.1.3_p1168.ebuild b/media-libs/libdvdread/libdvdread-4.1.3_p1168.ebuild
index 19dbc1861392..1511b4a0a6a6 100644
--- a/media-libs/libdvdread/libdvdread-4.1.3_p1168.ebuild
+++ b/media-libs/libdvdread/libdvdread-4.1.3_p1168.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-4.1.3_p1168.ebuild,v 1.1 2009/03/09 17:54:13 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-4.1.3_p1168.ebuild,v 1.2 2009/03/09 18:55:16 beandog Exp $
+
+EAPI="2"
 
 WANT_AUTOCONF="2.5"
 inherit eutils autotools multilib
@@ -12,22 +14,20 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="+css"
 
-DEPEND="!<=media-libs/libdvdnav-4.1.2"
+DEPEND="!<=media-libs/libdvdnav-4.1.2
+	css? ( media-libs/libdvdcss )"
 RDEPEND="$DEPEND"
 
-src_compile() {
-	./configure2 --prefix=/usr --libdir=/usr/$(get_libdir) \
-		--shlibdir=/usr/$(get_libdir) --enable-static --enable-shared \
-		--disable-strip --disable-opts $(use_enable debug) \
-		--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \
-		|| die "configure2 died"
-	emake version.h || die "emake version.h died"
-	emake || die "emake died"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	elibtoolize
+	eautoreconf
 }
 
 src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install died"
+	emake DESTDIR="${D}" install || die "emake install died"
 	dodoc AUTHORS DEVELOPMENT-POLICY.txt ChangeLog TODO README
 }
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index 2ef4f309044e..90570e010f2d 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-9999.ebuild,v 1.1 2009/03/09 17:54:13 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-9999.ebuild,v 1.2 2009/03/09 18:55:16 beandog Exp $
 
+EAPI="2"
 WANT_AUTOCONF="2.5"
 
 inherit eutils autotools multilib subversion
@@ -12,22 +13,19 @@ HOMEPAGE="http://mplayerhq.hu/ http://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
+IUSE="+css"
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread"
 ESVN_PROJECT="libdvdread"
 
-src_compile() {
-	./configure2 --prefix=/usr --libdir=/usr/$(get_libdir) \
-		--shlibdir=/usr/$(get_libdir) --enable-static --enable-shared \
-		--disable-strip --disable-opts $(use_enable debug) \
-		--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \
-		|| die "configure2 died"
-	emake version.h || die "emake version.h died"
-	emake || die "emake died"
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+	elibtoolize
+	eautoreconf
 }
 
 src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install died"
+	emake DESTDIR="${D}" install || die "emake install died"
 	dodoc AUTHORS DEVELOPMENT-POLICY.txt ChangeLog TODO README
 }