Fixed pkgconfig file using libagg instead of libagg_pic which was debian specific

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

5 files changed, 27 insertions, 39 deletions

diff --git a/x11-libs/agg/ChangeLog b/x11-libs/agg/ChangeLog
index c09239b3dd42..e1c7d7fc21ad 100644
--- a/x11-libs/agg/ChangeLog
+++ b/x11-libs/agg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/agg
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/agg/ChangeLog,v 1.17 2009/04/07 10:34:58 bicatali Exp $
+
+*agg-2.5-r2 (07 Apr 2009)
+
+  07 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/2.5/03_pkg_config_pic.patch, files/2.5/04_no_rpath.patch,
+  -agg-2.5-r1.ebuild, +agg-2.5-r2.ebuild:
+  Fixed pkgconfig file using libagg instead of libagg_pic which was debian
+  specific
 
 *agg-2.5-r1 (26 Mar 2009)
 
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index 2897ccc38485..fc17f70b7b77 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+AUX 2.5/04_no_rpath.patch 359 RMD160 3bd48c9324323b0a824ca063fc4c2e32f288c6cd SHA1 74120227f82d26e58efe7e248fffc88d05aa1d05 SHA256 f38e5aab003ccbb9e67c69618e154f51b8698e28b3f74f2b414931af9da032df
 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-r2.ebuild 1403 RMD160 45ae293c8b5590feb343da0b9111097003960e0c SHA1 a5a62033fa0c7b097a86473e256b3cba7ddf1e76 SHA256 01fb5bdafbca4b6238a845d24b7a913b9906fa63d42134d0d689d7f81bf09414
 EBUILD agg-2.5.ebuild 1224 RMD160 2948804bb4647d3bb2f82eb4831846bfd04567fb SHA1 f566c6829e20bf11bca809c6a849c0bf3a424e7f SHA256 92f1aec82f345cd182ca8896d247ecd55c5427bfb77afa37f7eea6efb369a773
-MISC ChangeLog 2735 RMD160 7c3414e2c426ea399a62ee8b39d31b123ab340eb SHA1 078835d4b6874be59ed33df30a9a7bbbfca543e2 SHA256 26cb1c6984102a8ae85e4721bf5356ee305f438c7c1a59db6962fd8b1f051ec0
+MISC ChangeLog 3012 RMD160 672320353a0d0fbeb7ddb99be5d6fb1be03cf4f6 SHA1 5b083b8120814786fec874f11cb1582e108c84b2 SHA256 04f32b256b57a25f4c497cc563256b0f17afd956ee65ee3f236db7d9946cd806
 MISC metadata.xml 326 RMD160 37b1669f22e846884252e4a31e469d1516b7dab7 SHA1 4ceda2ada3d73fe75680ed201aea7c512a648a6c SHA256 a30895a8fcb32de52ca3d98d25127e31c9661e2fe0aaf52b4d93966f031a435c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknbLFsACgkQ1ycZbhPLE2B/RwCgsmIaCBtAMqZPxoEkMazhc1bW
+j/IAn2OhBnv5PEQZj95tUYe8wlG6a7N/
+=Qba6
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/agg/agg-2.5-r1.ebuild b/x11-libs/agg/agg-2.5-r2.ebuild
index d25cb69deb7b..9561d123480f 100644
--- a/x11-libs/agg/agg-2.5-r1.ebuild
+++ b/x11-libs/agg/agg-2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/agg/agg-2.5-r2.ebuild,v 1.1 2009/04/07 10:34:58 bicatali Exp $
 
 EAPI="2"
 
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 # taken from debian
 PATCHES=(
 	"${FILESDIR}/${PV}/02_maintainer_mode.patch"
-	"${FILESDIR}/${PV}/03_pkg_config_pic.patch"
 	"${FILESDIR}/${PV}/04_no_rpath.patch"
 )
 
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
deleted file mode 100644
index 7a7b21bcd990..000000000000
--- a/x11-libs/agg/files/2.5/03_pkg_config_pic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#! /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
index 75e1936286d5..76582e332738 100644
--- a/x11-libs/agg/files/2.5/04_no_rpath.patch
+++ b/x11-libs/agg/files/2.5/04_no_rpath.patch
@@ -1,19 +1,10 @@
-
-#! /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
+--- agg-2.5.orig/libagg.pc.in	2006-07-10 11:27:16.000000000 +0200
++++ agg-2.5/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
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Libs: -L${libdir} -lagg
  Cflags: -I${includedir}