Fix pkg-config file wrt #298245, thanks to Ronan Arraes Jardim Chagas for reporting.

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

3 files changed, 27 insertions, 11 deletions

diff --git a/media-libs/libpgf/ChangeLog b/media-libs/libpgf/ChangeLog
index 05d8ce3058d5..10f5b0ee694d 100644
--- a/media-libs/libpgf/ChangeLog
+++ b/media-libs/libpgf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libpgf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpgf/ChangeLog,v 1.1 2009/12/22 17:53:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpgf/ChangeLog,v 1.2 2009/12/29 19:19:52 ssuominen Exp $
+
+*libpgf-6.09.44-r1 (29 Dec 2009)
+
+  29 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +libpgf-6.09.44-r1.ebuild, +files/libpgf-6.09.44-pkg.patch:
+  Fix pkg-config file wrt #298245, thanks to Ronan Arraes Jardim Chagas for
+  reporting.
 
 *libpgf-6.09.44 (22 Dec 2009)
 
diff --git a/media-libs/libpgf/files/libpgf-6.09.44-pkg.patch b/media-libs/libpgf/files/libpgf-6.09.44-pkg.patch
new file mode 100644
index 000000000000..7249e0207a93
--- /dev/null
+++ b/media-libs/libpgf/files/libpgf-6.09.44-pkg.patch
@@ -0,0 +1,14 @@
+diff -ur libpgf.orig/libpgf.pc.in libpgf/libpgf.pc.in
+--- libpgf.orig/libpgf.pc.in	2009-09-28 14:53:22.000000000 +0300
++++ libpgf/libpgf.pc.in	2009-12-29 21:18:28.000000000 +0200
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@prefix@
+-libdir=@prefix@/lib
+-includedir=@prefix@/include
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@prefix@/include/@PACKAGE@
+ 
+ Name: @PACKAGE@
+ Description: libpgf - Progressive Graphics File (PGF) library
diff --git a/media-libs/libpgf/libpgf-6.09.44.ebuild b/media-libs/libpgf/libpgf-6.09.44-r1.ebuild
index 9457b542f925..5309ce057672 100644
--- a/media-libs/libpgf/libpgf-6.09.44.ebuild
+++ b/media-libs/libpgf/libpgf-6.09.44-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpgf/libpgf-6.09.44.ebuild,v 1.1 2009/12/22 17:53:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpgf/libpgf-6.09.44-r1.ebuild,v 1.1 2009/12/29 19:19:52 ssuominen Exp $
 
 EAPI=2
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="Library to load, handle and manipulate images in the PGF format"
 HOMEPAGE="http://www.libpgf.org/"
@@ -21,16 +21,11 @@ DEPEND="doc? ( app-doc/doxygen )
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	if use ! doc; then
-		sed -i \
-			-e "s/\(SUBDIRS = src include\) doc/\1/g" Makefile.am || die
+	if ! use doc; then
+		sed -i -e "s/\(SUBDIRS = src include\) doc/\1/g" Makefile.am || die
 	fi
 
-	sed -i \
-		-e "s/exec_prefix=@prefix@/exec_prefix=@exec_prefix@/" \
-		-e "s/libdir=@prefix@\/lib/libdir=@libdir@/" \
-		-e "s/includedir=@prefix@\/include/includedir=@includedir@/" \
-			libpgf.pc.in || die
+	epatch "${FILESDIR}"/${P}-pkg.patch
 
 	eautoreconf
 }