Make static library optional and remove libtool archive. Move to eapi4.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

diff --git a/media-libs/libdvdcss/ChangeLog b/media-libs/libdvdcss/ChangeLog
index a3b61fcb7af7d1a18849b21bd61567355afe08db..9601b5820cf05c6e0d024c72bed623ccc569feac 100644 (file)
--- a/media-libs/libdvdcss/ChangeLog
+++ b/media-libs/libdvdcss/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libdvdcss
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.86 2011/02/27 14:52:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.87 2011/09/09 17:28:44 scarabeus Exp $
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> libdvdcss-1.2.10.ebuild:
+  Make static library optional and remove libtool archive. Move to eapi4.
 
   27 Feb 2011; Alexis Ballier <aballier@gentoo.org> -libdvdcss-1.2.9.ebuild,
   -libdvdcss-1.2.9-r1.ebuild, -files/libdvdcss-1.2.9-doc.patch,

diff --git a/media-libs/libdvdcss/libdvdcss-1.2.10.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.10.ebuild
index c2521c06511783e21a58118926b5175bf809634c..368a9cb32aeae530e5c4bb8d0af3a175260999bc 100644 (file)
--- a/media-libs/libdvdcss/libdvdcss-1.2.10.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.10.ebuild,v 1.10 2011/02/27 14:49:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.10.ebuild,v 1.11 2011/09/09 17:28:44 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils autotools
 
@@ -11,20 +13,19 @@ SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="1.2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
+IUSE="doc static-libs"
 
 DEPEND="doc? (
-       app-doc/doxygen
-       virtual/latex-base
-       dev-tex/xcolor
-       || ( dev-texlive/texlive-latexextra app-text/ptex )
+               app-doc/doxygen
+               virtual/latex-base
+               dev-tex/xcolor
+               || ( dev-texlive/texlive-latexextra app-text/ptex )
        )"
 RDEPEND=""
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+DOCS=( AUTHORS ChangeLog NEWS README )
 
+src_prepare() {
        sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
                "${S}"/test/Makefile.am \
                || die "unable to disable tests building"
@@ -32,22 +33,22 @@ src_unpack() {
        eautoreconf
 }
 
-src_compile() {
+src_configure() {
        # See bug #98854, requires access to fonts cache for TeX
        # No need to use addwrite, just set TeX font cache in the sandbox
        use doc && export VARTEXFONTS="${T}/fonts"
 
        econf \
-               --enable-static --enable-shared \
-               $(use_enable doc) \
-               --disable-dependency-tracking || die
-       emake || die
+               --enable-shared \
+               $(use_enable static-libs static) \
+               $(use_enable doc)
 }
 
 src_install() {
-       emake install DESTDIR="${D}" || die
+       default
+
+       find "${ED}" -name '*.la' -exec rm -f {} +
 
-       dodoc AUTHORS ChangeLog NEWS README
        use doc && dohtml doc/html/*
        use doc && dodoc doc/latex/refman.ps
 }