media-radio/gpredict: Version bump; Moved goocanvas to external DEPEND (requires patch and autotools); Added 'coverage' USE flag; Added curl DEPEND; Dropped ~x86-fbsd keyword due to goocanvas DEPEND

svn path=/sunrise/; revision=4970

4 files changed, 95 insertions, 8 deletions

diff --git a/media-radio/gpredict/ChangeLog b/media-radio/gpredict/ChangeLog
index 46f0e6a93..f7a3848f7 100644
--- a/media-radio/gpredict/ChangeLog
+++ b/media-radio/gpredict/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Nov 2007; Nathan Smith (ndansmith) <ndansmith@gmail.com>
+  +files/gpredict-0.9.0-goocanvas.patch, -gpredict-0.8.0.ebuild,
+  +gpredict-0.9.0.ebuild:
+  Version bump; Moved goocanvas to external DEPEND (requires patch and
+  autotools); Added 'coverage' USE flag; Added curl DEPEND; Dropped ~x86-fbsd
+  keyword due to goocanvas DEPEND
+
   21 Jul 2007; Nathan Smith (ndansmith) <ndansmith@gmail.com>
   -gpredict-0.7.1.ebuild, +gpredict-0.8.0.ebuild:
   Version bump
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index adb50a3e2..3885619aa 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -1,4 +1,5 @@
-DIST gpredict-0.8.0.tar.gz 2305701 RMD160 2f5c206e0c7af0512130f69350a80bfa78968c2e SHA1 fa0b5367d4a2b5f71b5a53c685f7029987673bb7 SHA256 0341c1064171cda201a9b9d132ee9de48beaf08963a6601f1888d10232071834
-EBUILD gpredict-0.8.0.ebuild 628 RMD160 028441e9978bb39ad47f2380412bffac5ba844c1 SHA1 cc1ba34cbc2562ba57f0ed41db6c94e54071ff08 SHA256 9e9bcf6655736e8a09d08b4fa5faa0bebd6495ebdd2b23a6d606894e17329499
-MISC ChangeLog 603 RMD160 87fcd5db0b835ea693711c2d5af7db42ef33437a SHA1 6b2a00c68a4c4f34ee4e3b930154facb45bfaeb8 SHA256 6baa923ad4419ce10cc460553f62e7199bee1cf381cf24367582e084233cfda8
+AUX gpredict-0.9.0-goocanvas.patch 1910 RMD160 1e6084c6a7f570b121d7a36d0f9334c8bc9f8776 SHA1 b567b7fb53569add652323e5af633c3cd881e35e SHA256 afaddc5f18ec5e333d1afe3c2b8922aa9cea3b7558a2acdd8aa466bd75a3c167
+DIST gpredict-0.9.0.tar.gz 2414711 RMD160 0cc084bfbcbeb71ce4a4088bdcab6dbac50de19f SHA1 3b0b7f45136da7a3f76ab4c0af16a4908edfd85c SHA256 8686c357c188223792a1267255565a60a2e3fe30ddeb45a816ebfe42b099ec42
+EBUILD gpredict-0.9.0.ebuild 939 RMD160 f440c11f55a8bb93a1449c89a2980e3b7ea3a687 SHA1 188b5f77beb378c4cf0d31dae0aaf080ccaee0af SHA256 019920da8dcae126f78c87ae00a7c39d18e116fe44754798082b80ba788c12d4
+MISC ChangeLog 940 RMD160 570b585a57c4cdf2f2e3f7fd96e379c63ad04ba6 SHA1 3c6aff6d75e740b6fb818721ebaaf79d8670ea5c SHA256 f675d3da7908aee8bf06c60d79f35b619ca578180b9102785dfd897d708a8a31
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-radio/gpredict/files/gpredict-0.9.0-goocanvas.patch b/media-radio/gpredict/files/gpredict-0.9.0-goocanvas.patch
new file mode 100644
index 000000000..3e45e6a46
--- /dev/null
+++ b/media-radio/gpredict/files/gpredict-0.9.0-goocanvas.patch
@@ -0,0 +1,64 @@
+--- Makefile.am.orig	2007-11-06 10:41:51.000000000 -0800
++++ Makefile.am	2007-11-06 10:42:01.000000000 -0800
+@@ -1,4 +1,4 @@
+-SUBDIRS = goocanv8 src doc pixmaps data po
++SUBDIRS = src doc pixmaps data po
+ 
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+--- configure.ac.orig	2007-11-06 10:42:13.000000000 -0800
++++ configure.ac	2007-11-06 10:44:00.000000000 -0800
+@@ -21,7 +21,7 @@
+ fi
+ 
+ dnl chack for glib and gtk libraries
+-pkg_modules="gtk+-2.0 >= 2.10.0 glib-2.0 >= 2.12.0 gthread-2.0 >= 2.12.0"
++pkg_modules="gtk+-2.0 >= 2.10.0 glib-2.0 >= 2.12.0 gthread-2.0 >= 2.12.0 goocanvas >= 0.8"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+@@ -63,6 +63,7 @@
+ GTHR_V=`pkg-config --modversion gthread-2.0`
+ GDK_V=`pkg-config --modversion gdk-2.0`
+ GTK_V=`pkg-config --modversion gtk+-2.0`
++GOO_V=`pkg-config --modversion goocanvas`
+ if test "$havecurl" = true ; then
+    CURL_V=`pkg-config --modversion libcurl`
+ fi
+@@ -71,8 +72,6 @@
+ AC_SUBST(CFLAGS)
+ AC_SUBST(LDFLAGS)
+ 
+-AC_CONFIG_SUBDIRS(goocanv8)
+-
+ AC_OUTPUT([
+ Makefile
+ doc/Makefile
+@@ -96,6 +95,7 @@
+ echo Gthread version.... : $GTHR_V
+ echo Gdk version........ : $GDK_V
+ echo Gtk+ version....... : $GTK_V
++echo Goocanvas version.. : $GOO_V
+ if test "$havecurl" = true ; then
+ echo Curl version....... : $CURL_V
+ else
+--- src/Makefile.am.orig	2007-11-06 10:44:26.000000000 -0800
++++ src/Makefile.am	2007-11-06 10:44:46.000000000 -0800
+@@ -3,7 +3,7 @@
+ SUBDIRS = sgpsdp
+ 
+ INCLUDES = \
+-	@PACKAGE_CFLAGS@ -I.. -I$(top_srcdir)/goocanv8/src \
++	@PACKAGE_CFLAGS@ -I.. \
+ 	-DDATADIR=\""$(datadir)"\" \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)/gpredict"\" \
+ 	-DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/gpredict"\" \
+@@ -103,7 +103,7 @@
+ 
+ 
+ ##gpredict_LDADD = ./sgpsdp/libsgp4sdp4.a @PACKAGE_LIBS@
+-gpredict_LDADD = @PACKAGE_LIBS@ ../goocanv8/src/.libs/libgoocanvas.a
++gpredict_LDADD = @PACKAGE_LIBS@
+ 
+ ## $(INTLLIBS)
+ 
diff --git a/media-radio/gpredict/gpredict-0.8.0.ebuild b/media-radio/gpredict/gpredict-0.9.0.ebuild
index 14355b714..1f15e7e66 100644
--- a/media-radio/gpredict/gpredict-0.8.0.ebuild
+++ b/media-radio/gpredict/gpredict-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="A tool for tracking amateur radio satellites"
 HOMEPAGE="http://groundstation.sourceforge.net/gpredict/"
@@ -10,13 +10,28 @@ SRC_URI="mirror://sourceforge/groundstation/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~x86-fbsd"
-IUSE=""
+KEYWORDS="~ppc ~x86"
+IUSE="coverage"
 
-DEPEND=">=dev-libs/glib-2.10.0
-	>=x11-libs/gtk+-2.8"
+DEPEND=">=dev-libs/glib-2.12.0
+	>=x11-libs/gtk+-2.10
+	>=x11-libs/goocanvas-0.8
+	net-misc/curl"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Patch to prevent gpredict from building goocanvas itself
+	epatch "${FILESDIR}/${P}-goocanvas.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable coverage ) || die "econf failed!"
+	emake || die "emake failed!"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	make_desktop_entry ${PN} "GPredict" "/usr/share/pixmaps/gpredict/icons/gpredict-icon.png" Science