Add pkgconfig dep, bug #205757; use latest automake

(Portage version: 2.1.4)

3 files changed, 60 insertions, 16 deletions

diff --git a/media-libs/paragui/ChangeLog b/media-libs/paragui/ChangeLog
index 6422e6e38f28..ccf1ff79f55c 100644
--- a/media-libs/paragui/ChangeLog
+++ b/media-libs/paragui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/paragui
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/paragui/ChangeLog,v 1.28 2007/11/11 21:54:42 tupone Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/paragui/ChangeLog,v 1.29 2008/01/15 08:42:13 nyhm Exp $
+
+  15 Jan 2008; Tristan Heaven <nyhm@gentoo.org>
+  files/paragui-1.1.8-asneeded.patch, paragui-1.1.8.ebuild:
+  Add pkgconfig dep, bug #205757; use latest automake
 
   11 Nov 2007; Tupone Alfredo <tupone@gentoo.org> paragui-1.0.4.ebuild,
   paragui-1.1.7.ebuild, paragui-1.1.8.ebuild:
diff --git a/media-libs/paragui/files/paragui-1.1.8-asneeded.patch b/media-libs/paragui/files/paragui-1.1.8-asneeded.patch
index d114cf153bab..af29d1a5be3c 100644
--- a/media-libs/paragui/files/paragui-1.1.8-asneeded.patch
+++ b/media-libs/paragui/files/paragui-1.1.8-asneeded.patch
@@ -1,6 +1,35 @@
-diff -ur paragui-1.1.8.orig/src/Makefile.am paragui-1.1.8/src/Makefile.am
---- paragui-1.1.8.orig/src/Makefile.am	2004-09-26 21:13:42.000000000 +0300
-+++ paragui-1.1.8/src/Makefile.am	2007-02-25 14:19:14.000000000 +0200
+--- configure.in
++++ configure.in
+@@ -12,7 +12,6 @@
+ 
+ dnl we also need libSigC++ (yeah)
+ SIGC_VERSION=1.2.5
+-PKG_SIGC="sigc++-1.2"
+ 
+ dnl Set various version strings - taken gratefully from the GTk sources
+ 
+@@ -227,7 +226,7 @@
+ 
+ dnl Check for libSigC++
+ 
+-PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
++PKG_CHECK_MODULES(SIGC, sigc++-1.2 >= $SIGC_VERSION)
+ AC_SUBST(SIGC_CFLAGS)
+ AC_SUBST(SIGC_LIBS)
+ 
+--- Makefile.am
++++ Makefile.am
+@@ -59,8 +59,6 @@
+ 	mkdir $(distdir)/lib
+ 	cp $(srcdir)/lib/README.txt $(distdir)/lib
+ 
+-install-hook:
+-	-ldconfig
+ 
+ rpm: $(PACKAGE)-$(VERSION).tar.gz
+ 	cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
+--- src/Makefile.am
++++ src/Makefile.am
 @@ -11,6 +11,7 @@
  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
@@ -9,3 +38,14 @@ diff -ur paragui-1.1.8.orig/src/Makefile.am paragui-1.1.8/src/Makefile.am
  	$(SIGC_LIBS) \
  	$(SDL_LIBS) \
  	$(EXPAT_LIB) \
+--- test/Makefile.am
++++ test/Makefile.am
+@@ -28,8 +28,6 @@
+ 
+ LFLAGS=$(SDL_LIBS) -L../src ../src/libparagui.la $(FREETYPE_LIBS)
+ 
+-cairotest_SOURCES = cairotest.cpp
+-cairotest_LDADD = $(LFLAGS) -lcairo -lpixman
+ 
+ unicodetest_SOURCES = unicodetest.cpp
+ unicodetest_LDADD = $(LFLAGS)
diff --git a/media-libs/paragui/paragui-1.1.8.ebuild b/media-libs/paragui/paragui-1.1.8.ebuild
index ed8c42b65692..d70f43c718bc 100644
--- a/media-libs/paragui/paragui-1.1.8.ebuild
+++ b/media-libs/paragui/paragui-1.1.8.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/paragui/paragui-1.1.8.ebuild,v 1.9 2007/11/11 21:54:42 tupone Exp $
-
-WANT_AUTOMAKE="1.8"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/paragui/paragui-1.1.8.ebuild,v 1.10 2008/01/15 08:42:13 nyhm Exp $
 
 inherit autotools eutils
 
@@ -15,8 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2
-	>=media-libs/sdl-image-1.2
+RDEPEND="media-libs/libsdl
+	media-libs/sdl-image
 	=dev-libs/libsigc++-1.2*
 	>=media-libs/freetype-2
 	media-libs/libpng
@@ -24,18 +22,20 @@ DEPEND=">=media-libs/libsdl-1.2
 	media-libs/jpeg
 	dev-libs/expat
 	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-header.patch
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	eautomake
+	epatch \
+		"${FILESDIR}"/${P}-header.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS README* doc/{RELEASENOTES,TODO}
 	newdoc TODO ROADMAP
 }