Make static-libs optional. Punt .la files. Drop overshadowed versions.

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

4 files changed, 12 insertions, 75 deletions

diff --git a/media-libs/libass/ChangeLog b/media-libs/libass/ChangeLog
index 77e343537747..34784ff1bb46 100644
--- a/media-libs/libass/ChangeLog
+++ b/media-libs/libass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/ChangeLog,v 1.39 2011/03/20 10:59:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/ChangeLog,v 1.40 2011/04/05 17:44:35 scarabeus Exp $
+
+  05 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libass-0.9.9.ebuild,
+  -libass-0.9.10.ebuild, libass-0.9.11.ebuild:
+  Make static-libs optional. Punt .la files. Drop overshadowed versions.
 
   20 Mar 2011; Raúl Porcel <armin76@gentoo.org> libass-0.9.11.ebuild:
   arm/ia64/sparc stable wrt #343977
diff --git a/media-libs/libass/libass-0.9.10.ebuild b/media-libs/libass/libass-0.9.10.ebuild
deleted file mode 100644
index d89ad1f04c95..000000000000
--- a/media-libs/libass/libass-0.9.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/libass-0.9.10.ebuild,v 1.1 2010/08/07 21:22:54 aballier Exp $
-
-EAPI=2
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="http://code.google.com/p/libass/"
-SRC_URI="http://libass.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="enca +fontconfig png"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 )
-	>=media-libs/freetype-2.2.1
-	png? ( >=media-libs/libpng-1.2.43-r2:0 )
-	virtual/libiconv
-	enca? ( app-i18n/enca )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable enca) \
-		$(use_enable fontconfig) \
-		$(use_enable png)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc Changelog
-}
diff --git a/media-libs/libass/libass-0.9.11.ebuild b/media-libs/libass/libass-0.9.11.ebuild
index 3090a740b603..d7aa7897fc77 100644
--- a/media-libs/libass/libass-0.9.11.ebuild
+++ b/media-libs/libass/libass-0.9.11.ebuild
@@ -1,8 +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/libass/libass-0.9.11.ebuild,v 1.9 2011/03/20 10:59:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/libass-0.9.11.ebuild,v 1.10 2011/04/05 17:44:35 scarabeus Exp $
 
-EAPI=2
+EAPI=3
 
 DESCRIPTION="Library for SSA/ASS subtitles rendering"
 HOMEPAGE="http://code.google.com/p/libass/"
@@ -11,7 +11,7 @@ SRC_URI="http://libass.googlecode.com/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+enca +fontconfig"
+IUSE="+enca +fontconfig static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 )
 	>=media-libs/freetype-2.2.1
@@ -24,10 +24,13 @@ DEPEND="${RDEPEND}
 src_configure() {
 	econf \
 		$(use_enable enca) \
-		$(use_enable fontconfig)
+		$(use_enable fontconfig) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc Changelog
+
+	find "${ED}" -name '*.la' -delete
 }
diff --git a/media-libs/libass/libass-0.9.9.ebuild b/media-libs/libass/libass-0.9.9.ebuild
deleted file mode 100644
index 78a3fee405d1..000000000000
--- a/media-libs/libass/libass-0.9.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/libass-0.9.9.ebuild,v 1.6 2010/06/01 20:14:35 darkside Exp $
-
-EAPI=2
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="http://code.google.com/p/libass/"
-SRC_URI="http://libass.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="enca +fontconfig png"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 )
-	>=media-libs/freetype-2.2.1
-	png? ( >=media-libs/libpng-1.2.43-r2:0 )
-	virtual/libiconv
-	enca? ( app-i18n/enca )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable enca) \
-		$(use_enable fontconfig) \
-		$(use_enable png)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc Changelog
-}