Add pkgconfig dep, bug #205757; use latest automake

Package-Manager: portage-2.1.4

4 files changed, 76 insertions, 32 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/Manifest b/media-libs/paragui/Manifest
index 56cee5b8fd58..8f124ff9e2b3 100644
--- a/media-libs/paragui/Manifest
+++ b/media-libs/paragui/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX paragui-1.1.8-asneeded.patch 391 RMD160 256bd526ce2b9f0ccb0d6f84b23eaef9f80655b6 SHA1 f50df221d00c2175db44ef4faab3fe6d0597f674 SHA256 23edffb8923a49444d3d0cb559e58015dd2884717db5cbeee8f7d937db5d5208
-MD5 40b412c989db60413910036a671e208c files/paragui-1.1.8-asneeded.patch 391
-RMD160 256bd526ce2b9f0ccb0d6f84b23eaef9f80655b6 files/paragui-1.1.8-asneeded.patch 391
-SHA256 23edffb8923a49444d3d0cb559e58015dd2884717db5cbeee8f7d937db5d5208 files/paragui-1.1.8-asneeded.patch 391
+AUX paragui-1.1.8-asneeded.patch 1137 RMD160 291c3ea223fc11a3b6eef92bd1189767042819d6 SHA1 dcb99b86777d4dc05155cdf0228675a3d7e7761c SHA256 82b74dbec2b95a5a6eece5f72f40d4418ab4a8d823dac24ea709667fb65d96da
+MD5 5f1498c78b322261e9acf8a52b3d782f files/paragui-1.1.8-asneeded.patch 1137
+RMD160 291c3ea223fc11a3b6eef92bd1189767042819d6 files/paragui-1.1.8-asneeded.patch 1137
+SHA256 82b74dbec2b95a5a6eece5f72f40d4418ab4a8d823dac24ea709667fb65d96da files/paragui-1.1.8-asneeded.patch 1137
 AUX paragui-1.1.8-header.patch 297 RMD160 4a940c2952d993f736efdeb302d7f5433587e454 SHA1 a41213175c3be7f910369a48434870a3374763ca SHA256 258f0e3869b5bbaf8f3ed7f0c74e44521dd41217ab5c399c5c0e1bd3c17f6379
 MD5 2d8694d2a1bd2020763d9fbb18624810 files/paragui-1.1.8-header.patch 297
 RMD160 4a940c2952d993f736efdeb302d7f5433587e454 files/paragui-1.1.8-header.patch 297
@@ -20,14 +20,14 @@ EBUILD paragui-1.1.7.ebuild 917 RMD160 45f2901fbabb89e9bba6f4390bafd936b005cf4c
 MD5 42eaf98f816d0b8791de8583beac60d0 paragui-1.1.7.ebuild 917
 RMD160 45f2901fbabb89e9bba6f4390bafd936b005cf4c paragui-1.1.7.ebuild 917
 SHA256 30ebd43e61dea3e0c576a2dcc8cc371d889773cdd7517ac5cdfb18812cf87bdc paragui-1.1.7.ebuild 917
-EBUILD paragui-1.1.8.ebuild 1003 RMD160 21a5b4056f04ce588eb8638848cf953110bfbd2c SHA1 526831a4c2150086df546b8496c4fd8696a331ed SHA256 b17ce43407e8bcfe6746debc9bf80bbe3424ab86800365c7a3a289bdca02f42e
-MD5 e9c891bdb3d2f2edfd06de19055bc2bf paragui-1.1.8.ebuild 1003
-RMD160 21a5b4056f04ce588eb8638848cf953110bfbd2c paragui-1.1.8.ebuild 1003
-SHA256 b17ce43407e8bcfe6746debc9bf80bbe3424ab86800365c7a3a289bdca02f42e paragui-1.1.8.ebuild 1003
-MISC ChangeLog 3880 RMD160 72678246cd7df140965e8e5e04002720544bb14e SHA1 737c209a2935a98d4538cc0223946ba455e947fb SHA256 e0863c8ed8fb31b987d210eb075a94729e2a46718d4bbd441b12fc784bb4910c
-MD5 b41943e13d4221412e26e0fcddae7714 ChangeLog 3880
-RMD160 72678246cd7df140965e8e5e04002720544bb14e ChangeLog 3880
-SHA256 e0863c8ed8fb31b987d210eb075a94729e2a46718d4bbd441b12fc784bb4910c ChangeLog 3880
+EBUILD paragui-1.1.8.ebuild 1013 RMD160 2ef04f42998027177b95ecc4f4f50c2d526c7b1c SHA1 16df611adaa0c6ef624723940ec5dda46ce048a0 SHA256 703208f69e6c529191e684457a14ff58d36a42280dca0694b35704b2a0af9f64
+MD5 f0ac25040c7bebc7fc64e0158499c744 paragui-1.1.8.ebuild 1013
+RMD160 2ef04f42998027177b95ecc4f4f50c2d526c7b1c paragui-1.1.8.ebuild 1013
+SHA256 703208f69e6c529191e684457a14ff58d36a42280dca0694b35704b2a0af9f64 paragui-1.1.8.ebuild 1013
+MISC ChangeLog 4041 RMD160 0fe7750a002f18e4cd93d5cab69254fce71a1877 SHA1 0c201f3bd1b485fa417c90f8e7f07629a0f94079 SHA256 9a3916ee04ee64f0aa686f615028b40a62862170e6b20c4308fddf5a4a580699
+MD5 2ce460c7ae7c7da33e89e05faa341f7e ChangeLog 4041
+RMD160 0fe7750a002f18e4cd93d5cab69254fce71a1877 ChangeLog 4041
+SHA256 9a3916ee04ee64f0aa686f615028b40a62862170e6b20c4308fddf5a4a580699 ChangeLog 4041
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -42,9 +42,9 @@ MD5 2252cda5b4b113299d0ee7dd92ffc91f files/digest-paragui-1.1.8 244
 RMD160 1cab4cc185e51188979abf806c7bb369b3a0f5a4 files/digest-paragui-1.1.8 244
 SHA256 e7abe2680f433e12ccc2f3ff70cae0e4b6426177a438c87d7294f94b0306dc81 files/digest-paragui-1.1.8 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHN3op8qKy9+b2Hl0RAtv9AKDr8Un4YM8H1CfWQ18GXfUz7Dw5JQCglrcc
-pU7jxEbZsNVxmkcWWb6K02c=
-=49CD
+iD8DBQFHjHHrdz7hIScOURERAi9nAJ9o65TtVTIUd4jfmkPsW5wT7L8TggCg8qVh
+Pzh5agcTk9qzcS0GoOIaj6k=
+=8Gip
 -----END PGP SIGNATURE-----
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
 }