Revision bump in order to remove static library and libtool archive. Bump the eapi to 4.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64
RepoMan-Options: --force

2 files changed, 24 insertions, 19 deletions

diff --git a/dev-libs/libg15render/ChangeLog b/dev-libs/libg15render/ChangeLog
index 2e252600b1e3..b7a04ef5a6b6 100644
--- a/dev-libs/libg15render/ChangeLog
+++ b/dev-libs/libg15render/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libg15render
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/ChangeLog,v 1.13 2010/03/06 20:19:01 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/ChangeLog,v 1.14 2011/09/09 16:51:21 scarabeus Exp $
+
+*libg15render-1.2-r2 (09 Sep 2011)
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libg15render-1.2-r1.ebuild, +libg15render-1.2-r2.ebuild:
+  Revision bump in order to remove static library and libtool archive. Bump the
+  eapi to 4.
 
   06 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Changing maintainer per emails of Jan 18th.
diff --git a/dev-libs/libg15render/libg15render-1.2-r1.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
index 5c8a8d9c8880..8cdc988fd8a2 100644
--- a/dev-libs/libg15render/libg15render-1.2-r1.ebuild
+++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/libg15render-1.2-r1.ebuild,v 1.6 2007/05/01 10:33:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/libg15render-1.2-r2.ebuild,v 1.1 2011/09/09 16:51:21 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils
 
@@ -14,30 +16,26 @@ KEYWORDS="amd64 ppc ppc64 x86"
 
 IUSE="truetype"
 
-DEPEND="dev-libs/libg15
-	truetype? ( media-libs/freetype )"
-
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+RDEPEND="
+	dev-libs/libg15
+	truetype? ( media-libs/freetype )
+"
+DEPEND=${RDEPEND}
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-pixel-c.patch"
 }
 
-src_compile() {
+src_configure() {
 	econf \
-		$(use_enable truetype ttf ) \
-		|| die "configure failed"
-
-	emake || die "make failed"
+		--disable-static \
+		$(use_enable truetype ttf )
 }
 
 src_install() {
 	emake DESTDIR="${D}" \
 		docdir=/usr/share/doc/${PF} install || die "make install failed"
-	rm "${D}/usr/share/doc/${PF}/COPYING"
+	rm "${ED}/usr/share/doc/${PF}/COPYING"
 
-	prepalldocs
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }