Apply patches from debian. Clean up deps. Move to eapi2. Remove sdl useflag and introduce new gpc useflag.

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

7 files changed, 140 insertions, 8 deletions

diff --git a/x11-libs/agg/ChangeLog b/x11-libs/agg/ChangeLog
index 210c6db70aac..c09239b3dd42 100644
--- a/x11-libs/agg/ChangeLog
+++ b/x11-libs/agg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/agg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/agg/ChangeLog,v 1.15 2008/11/30 18:48:35 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/agg/ChangeLog,v 1.16 2009/03/26 14:00:32 scarabeus Exp $
+
+*agg-2.5-r1 (26 Mar 2009)
+
+  26 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/2.5/02_maintainer_mode.patch, +files/2.5/03_pkg_config_pic.patch,
+  +files/2.5/04_no_rpath.patch, metadata.xml, +agg-2.5-r1.ebuild:
+  Apply patches from debian. Clean up deps. Move to eapi2. Remove sdl
+  useflag and introduce new gpc useflag.
 
   30 Nov 2008; Raúl Porcel <armin76@gentoo.org> agg-2.5.ebuild:
   sparc stable wrt #244336
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index 2e0d5258f120..2897ccc38485 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -1,4 +1,8 @@
+AUX 2.5/02_maintainer_mode.patch 590 RMD160 ba3e5f75525e64faa5d12f090871ca3f51ce218c SHA1 70a072f5aa9eaf93bc28159708d4eedf4fe15be4 SHA256 354eb06466f2f6d5dee100e3fa3b3aaa9d9fe331170f675b6d4dbedc569c9b17
+AUX 2.5/03_pkg_config_pic.patch 634 RMD160 999de6dc92c6a9da2ffd6bd7172f0be1a277caf4 SHA1 5eac567068049a1437599bce096a9eb0a79d2970 SHA256 e092bbbe9aaa3668ad9bd137f527dafb537a0b9d0b4b92e1ecc8f71f63e66da2
+AUX 2.5/04_no_rpath.patch 608 RMD160 aeb0a2aff963d2633c226c6e2a78bd2d6ad32fad SHA1 8e5c7fdd1a9c6e6532bf07e85aae36cf3d09a3b3 SHA256 7f8f242fdd2f6b64130c28b36f355f16a494e929653a642150bcc53707fbd2a3
 DIST agg-2.5.tar.gz 564204 RMD160 bb494d26f2f2922bc41f3a6cc4ea5d6315168b98 SHA1 a10b9085bbb07b9865a2ea381f449d734ea43412 SHA256 039c8b2626485cee67be8cebf6a32d7067c44b976cb91e9dec933fbaa9556ff7
+EBUILD agg-2.5-r1.ebuild 1449 RMD160 f1ef9293b31e3b3e54436b45370ac60993c2a694 SHA1 2750b41b08aeca4bdc0290ce3ef623e17e47b383 SHA256 b3593f180201bd9766ea48de5a217339e099d7a77c829241d7921e806676f3cd
 EBUILD agg-2.5.ebuild 1224 RMD160 2948804bb4647d3bb2f82eb4831846bfd04567fb SHA1 f566c6829e20bf11bca809c6a849c0bf3a424e7f SHA256 92f1aec82f345cd182ca8896d247ecd55c5427bfb77afa37f7eea6efb369a773
-MISC ChangeLog 2401 RMD160 3d568a5fbbb33184729655f7da37b5f44209ceb5 SHA1 5b76518a4dc69e11db24c2c93fe46b5260e287d8 SHA256 37e04b2224c80696ba445911eb7c4fbb28b3fd9e3c990ef76ca03a5683376994
-MISC metadata.xml 263 RMD160 3a7c4caf761fd53690c78d1352c1f7c2858a2c3b SHA1 0a3e12eb5d6d1c8e869b12ce442e89791f96d1a9 SHA256 05cfd5d6b86ee3f8cfda20636cefb676c252d2f4410b610d4f189ea8bfdff37e
+MISC ChangeLog 2735 RMD160 7c3414e2c426ea399a62ee8b39d31b123ab340eb SHA1 078835d4b6874be59ed33df30a9a7bbbfca543e2 SHA256 26cb1c6984102a8ae85e4721bf5356ee305f438c7c1a59db6962fd8b1f051ec0
+MISC metadata.xml 326 RMD160 37b1669f22e846884252e4a31e469d1516b7dab7 SHA1 4ceda2ada3d73fe75680ed201aea7c512a648a6c SHA256 a30895a8fcb32de52ca3d98d25127e31c9661e2fe0aaf52b4d93966f031a435c
diff --git a/x11-libs/agg/agg-2.5-r1.ebuild b/x11-libs/agg/agg-2.5-r1.ebuild
new file mode 100644
index 000000000000..d25cb69deb7b
--- /dev/null
+++ b/x11-libs/agg/agg-2.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/agg/agg-2.5-r1.ebuild,v 1.1 2009/03/26 14:00:32 scarabeus Exp $
+
+EAPI="2"
+
+inherit eutils autotools base
+
+DESCRIPTION="Anti-Grain Geometry - A High Quality Rendering Engine for C++"
+HOMEPAGE="http://antigrain.com/"
+SRC_URI="http://antigrain.com/${P}.tar.gz"
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="+gpc +truetype +X"
+
+# preffer X with enabled xcb, really
+RDEPEND="
+	media-libs/libsdl[X?]
+	X? ( x11-libs/libX11[xcb] )
+	truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
+
+# taken from debian
+PATCHES=(
+	"${FILESDIR}/${PV}/02_maintainer_mode.patch"
+	"${FILESDIR}/${PV}/03_pkg_config_pic.patch"
+	"${FILESDIR}/${PV}/04_no_rpath.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	sed -r -i \
+		-e 's:^(.*)  -L@.*:\1:' \
+		src/platform/X11/Makefile.am || die "Failed to sed"
+	eautoreconf
+}
+
+src_configure() {
+	# examples are not (yet) installed, so do not compile them
+	# sdl is harddep only sdl-tests are optional so we enable them anyway
+	econf \
+		--enable-ctrl \
+		--enable-sdltest \
+		--disable-examples \
+		--disable-dependency-tracking \
+		$(use_enable gpc gpc) \
+		$(use_enable truetype freetype) \
+		$(use_with X x)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc readme authors ChangeLog news
+}
diff --git a/x11-libs/agg/files/2.5/02_maintainer_mode.patch b/x11-libs/agg/files/2.5/02_maintainer_mode.patch
new file mode 100644
index 000000000000..4c65c9723e34
--- /dev/null
+++ b/x11-libs/agg/files/2.5/02_maintainer_mode.patch
@@ -0,0 +1,21 @@
+
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_maintainer_mode.dpatch by  <rodrigo@nul-unu.com>
+##
+## DP: Use AM_MAINTAINER_MODE, to avoid re-running autotools
+## DP: except when explicitely called in debian/rules
+
+@DPATCH@
+diff -urNad agg-2.5+dfsg~/configure.in agg-2.5+dfsg/configure.in
+--- agg-2.5+dfsg~/configure.in 2007-07-21 19:58:06.966030999 -0500
++++ agg-2.5+dfsg/configure.in  2007-07-21 19:58:33.595695250 -0500
+@@ -2,7 +2,7 @@
+ AC_CANONICAL_TARGET
+ AC_CONFIG_HEADERS(include/config.h)
+ AM_INIT_AUTOMAKE(agg, 2.5.0)
+-
++AM_MAINTAINER_MODE
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+
diff --git a/x11-libs/agg/files/2.5/03_pkg_config_pic.patch b/x11-libs/agg/files/2.5/03_pkg_config_pic.patch
new file mode 100644
index 000000000000..7a7b21bcd990
--- /dev/null
+++ b/x11-libs/agg/files/2.5/03_pkg_config_pic.patch
@@ -0,0 +1,19 @@
+
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_pkg_config_pic.dpatch by  <rene@zero>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad agg-2.3~/libagg.pc.in agg-2.3/libagg.pc.in
+--- agg-2.3~/libagg.pc.in	2005-02-18 03:27:48.000000000 +0100
++++ agg-2.3/libagg.pc.in	2006-03-01 18:08:26.906950512 +0100
+@@ -6,5 +6,5 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg_pic
+ Cflags: -I${includedir}
+
diff --git a/x11-libs/agg/files/2.5/04_no_rpath.patch b/x11-libs/agg/files/2.5/04_no_rpath.patch
new file mode 100644
index 000000000000..75e1936286d5
--- /dev/null
+++ b/x11-libs/agg/files/2.5/04_no_rpath.patch
@@ -0,0 +1,19 @@
+
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_no_rpath.dpatch by  <rene@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad agg-2.4~/libagg.pc.in agg-2.4/libagg.pc.in
+--- agg-2.4~/libagg.pc.in	2006-07-10 11:27:16.000000000 +0200
++++ agg-2.4/libagg.pc.in	2006-07-10 11:28:51.000000000 +0200
+@@ -6,5 +6,5 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg_pic
++Libs: -L${libdir} -lagg_pic
+ Cflags: -I${includedir}
+
diff --git a/x11-libs/agg/metadata.xml b/x11-libs/agg/metadata.xml
index 62e201f5e48b..6d444ab35207 100644
--- a/x11-libs/agg/metadata.xml
+++ b/x11-libs/agg/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-  <maintainer>
-    <email>genstef@gentoo.org</email>
-    <name>Stefan Schweizer</name>
-  </maintainer>
+<maintainer>
+	<email>genstef@gentoo.org</email>
+	<name>Stefan Schweizer</name>
+</maintainer>
+<use>
+	<flag name="gpc">Enable gpc polygon clipper library</flag>
+</use>
 </pkgmetadata>