Removed imlib dependency (bug #249077, thanks Dustin Polke), added pkg-config depend and respect cflags

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64

5 files changed, 58 insertions, 12 deletions

diff --git a/sci-visualization/g3data/ChangeLog b/sci-visualization/g3data/ChangeLog
index b0ebaf870dc1..377906169055 100644
--- a/sci-visualization/g3data/ChangeLog
+++ b/sci-visualization/g3data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/g3data
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/ChangeLog,v 1.3 2007/07/18 02:19:19 cryos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/ChangeLog,v 1.4 2008/11/27 18:25:22 bicatali Exp $
+
+  27 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/g3data-1.5.1-makefile.patch, metadata.xml, g3data-1.5.1.ebuild:
+  Removed imlib dependency (bug #249077, thanks Dustin Polke), added
+  pkg-config depend and respect cflags
 
   18 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org> -g3data-1.5.0.ebuild,
   g3data-1.5.1.ebuild:
diff --git a/sci-visualization/g3data/Manifest b/sci-visualization/g3data/Manifest
index 9cf0fb1bf8aa..ab82a3324a32 100644
--- a/sci-visualization/g3data/Manifest
+++ b/sci-visualization/g3data/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX g3data-1.5.1-makefile.patch 663 RMD160 b8eecbb73e3bdeae96615c158c53a7e8c1031401 SHA1 09e5f0b7c722afd05c2f7813efc3bbec37e10ff0 SHA256 3d644e283a5f3d2e576869918dce575a5d3aa232cb3d078ddd5af6e0ba12e5eb
 DIST g3data-1.5.1.tar.gz 47341 RMD160 7f7565a2f508344b2aed219d732fdb554a4fec90 SHA1 033184423798d1d8f192b9c211fba0ec50c47a95 SHA256 e0606bec03f6559405f6e5ddc914d315987b1465307044613b95af2d67426311
-EBUILD g3data-1.5.1.ebuild 906 RMD160 dc920c10b7e0d00b185f43618402d7218273dc1a SHA1 8aa875a34ead95d340df91223e82ebfd3ede63fb SHA256 02c7741b2ac3cd6cbba54882867b8cb82d55db28e4aa8ccb5b058ba61b08d0ea
-MISC ChangeLog 821 RMD160 f19b5fd36cf631d6556c7cbf75545862427a9c18 SHA1 d492c8877e6f134410941c31a6d678c88c104c26 SHA256 dc8c1b6e5f215c6edbbecccd135b912db8e34edd7fdbbaf414c811392f82b2a9
-MISC metadata.xml 440 RMD160 1bdad41191edaf2f58daedc8e2f3581429a31e69 SHA1 a1c58d09ce76b2dbd2f59cdc73f21992e6400d4b SHA256 582080dc96cef63e1c5dedde61459c9d8f504cc9fb49484ade682298848c64ed
+EBUILD g3data-1.5.1.ebuild 1029 RMD160 b6cf0ca9f5d431d660184c80a3b92176bb42302e SHA1 611d9188e21d5fd4167cd9ba942787b2cc496d55 SHA256 b63b44c658b0ca3bb116df989619f964712114e5ece6d0bb8659f07e407f01f9
+MISC ChangeLog 1061 RMD160 2b1aa8f7072e6ab49e119a9aa7278557d44c0241 SHA1 094628b364c48b1cc477eb40986c6e6f2fb74695 SHA256 f726e39070d1746a3d87f4f16d756421f7ad8fa99da588a72ba2aac41d27a386
+MISC metadata.xml 446 RMD160 3b25ea2b4d03bb588338bd46357415f62db8f334 SHA1 22e037d9723631c784c2db37c4b8be452a7aeee3 SHA256 761659d3d23a32e330b0cf8ae98de86e81c1d0c67e9d184b4e563755c5d80d54
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkku5hsACgkQ1ycZbhPLE2DNRACfVrJ3s/laxFY9dFPtWp1uZbzb
+V/4An1HVHvN0ygrM7ppEzU1l5OwOffbW
+=GE71
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/g3data/files/g3data-1.5.1-makefile.patch b/sci-visualization/g3data/files/g3data-1.5.1-makefile.patch
new file mode 100644
index 000000000000..f83ca596c6e6
--- /dev/null
+++ b/sci-visualization/g3data/files/g3data-1.5.1-makefile.patch
@@ -0,0 +1,21 @@
+--- Makefile.orig	2008-11-27 18:16:03.000000000 +0000
++++ Makefile	2008-11-27 18:17:05.000000000 +0000
+@@ -1,15 +1,13 @@
+-CC=gcc
+-CFLAGS=-Wall `pkg-config --cflags gtk+-2.0`
++MYCFLAGS=-Wall `pkg-config --cflags gtk+-2.0`
+ LIBS=`pkg-config --libs gtk+-2.0`
+ bindir ?= /usr/bin
+ mandir ?= /usr/share/man
+ 
+ .c.o:
+-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(MYCFLAGS) $<
+ 
+ g3data: main.o sort.o points.o drawing.o g3data.1.gz
+-	$(CC) $(CFLAGS) -o g3data main.o sort.o points.o drawing.o $(LIBS)
+-	strip g3data
++	$(CC) $(CFLAGS) $(MYCFLAGS) -o g3data main.o sort.o points.o drawing.o $(LIBS)
+ 
+ main.o: main.c main.h strings.h vardefs.h
+ 
diff --git a/sci-visualization/g3data/g3data-1.5.1.ebuild b/sci-visualization/g3data/g3data-1.5.1.ebuild
index 42891c3a1025..61ebb8667c8a 100644
--- a/sci-visualization/g3data/g3data-1.5.1.ebuild
+++ b/sci-visualization/g3data/g3data-1.5.1.ebuild
@@ -1,6 +1,8 @@
-# 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/sci-visualization/g3data/g3data-1.5.1.ebuild,v 1.2 2007/07/18 02:19:19 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/g3data-1.5.1.ebuild,v 1.3 2008/11/27 18:25:22 bicatali Exp $
+
+inherit eutils
 
 DESCRIPTION="Tool for extracting data from graphs"
 HOMEPAGE="http://www.frantz.fi/software/g3data.php"
@@ -11,11 +13,17 @@ SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
-RDEPEND=">=x11-libs/gtk+-2.6.0
-	media-libs/imlib"
+RDEPEND=">=x11-libs/gtk+-2.6.0"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	~app-text/docbook-sgml-utils-0.6.14"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
 src_compile() {
 	emake || die "emake failed"
 }
@@ -25,8 +33,9 @@ src_install() {
 	doman g3data.1.gz || die "doman failed"
 	dodoc README.SOURCE || die "README.SOURCE not found"
 	if use examples; then
+		docinto examples
 		dodoc README.TEST
-		insinto ${DESTDIR}usr/share/doc/${PF}/
+		insinto /usr/share/doc/${PF}/examples
 		doins test1.png test1.values test2.png test2.values
 	fi
 }
diff --git a/sci-visualization/g3data/metadata.xml b/sci-visualization/g3data/metadata.xml
index 51ab4ef202fb..6802aababd33 100644
--- a/sci-visualization/g3data/metadata.xml
+++ b/sci-visualization/g3data/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <longdescription>
     g3data is used for extracting data from graphs. In pubilcations graphs are
-	often included, but the actual data is not. g3data makes the extraction
-	process much easier.
+    often included, but the actual data is not. g3data makes the extraction
+    process much easier.
   </longdescription>
 </pkgmetadata>