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

(Portage version: 2.2_rc28/cvs/Linux x86_64)

4 files changed, 14 insertions, 35 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/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}