media-radio/gpredict: Version bump

svn path=/sunrise/; revision=8347

5 files changed, 18 insertions, 85 deletions

diff --git a/media-radio/gpredict/ChangeLog b/media-radio/gpredict/ChangeLog
index 9ccfa1a63..53785f36d 100644
--- a/media-radio/gpredict/ChangeLog
+++ b/media-radio/gpredict/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Apr 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  -gpredict-1.0_beta1.ebuild, +gpredict-1.0_beta2.ebuild,
+  -files/gpredict-1.0_beta1-doc.patch,
+  -files/gpredict-1.0_beta1-goocanvas.patch,
+  +files/gpredict-1.0_beta2-doc.patch:
+  Version bump
+
   16 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> metadata.xml:
   Drop unused useflag from metadata.xml
 
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index ed99059cc..5bdacb1bf 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -1,6 +1,5 @@
-AUX gpredict-1.0_beta1-doc.patch 593 RMD160 d40dfdb99c0a11b289ddae655341544528521b10 SHA1 cdd79bc7bb168ef5605b6e98020a89f8aab09c35 SHA256 02a02e01090c78dc292ac301aec47dc854270ad28f634f520bc351a31c993b29
-AUX gpredict-1.0_beta1-goocanvas.patch 1986 RMD160 ac0d0f3798c1f38a6809c745820359f58cd0043b SHA1 9d1df97f5d2ca305715b71a1ebe81ac6d13c87c0 SHA256 9134de5e7ecd402e0cde6c4965495ce405dc01c71020be8e1ee52b53dec0c058
-DIST gpredict-1.0b1.tar.gz 2438035 RMD160 1b077815eaaabb469c1ac15e25663521273e8f56 SHA1 5c1b95f5982e222feef770f6e855352a5cf066b3 SHA256 69ca50d1f780e78c08fd819f35cad6913370b3929f4f0f1194cd42d5deda0a76
-EBUILD gpredict-1.0_beta1.ebuild 1115 RMD160 576807002d74877bb458752629cfd6669904a87f SHA1 12ff483e84de1ec23e3c5a3437e2f6be07945dfc SHA256 4a4e59294a41d04a5713008d12b962e672abe19f32ca8550c9c026f895212c62
-MISC ChangeLog 1536 RMD160 3b4155b8d6c0bf91dc39bdb9fb2086638d155434 SHA1 ecd649db572dac6e7c05b9bf2487813916567f00 SHA256 20239774551eaa23b7056f97c1345a3f68095dd1eb88502ddde97b064952de77
+AUX gpredict-1.0_beta2-doc.patch 593 RMD160 bdb1d6da7784544801f245e7b43af87caf954b1e SHA1 0d01917aeac88522d73cce7b7fe206e7470eef0e SHA256 9ed3b16d457f244079242f378395d23481e2e4dbffb6fb4cee203355756b13fb
+DIST gpredict-1.0b2.tar.gz 1966020 RMD160 84fc52313d51165a4a56488817c4a2fa02c5362f SHA1 6e25e06ac0944bcc7bebf5e3658cfe586b298964 SHA256 1cc81d9117d69ed2b2973ff8d4cbf51fa1bf6f78c4ffdd07d65e19352d56d177
+EBUILD gpredict-1.0_beta2.ebuild 928 RMD160 c0eb3a11b70c7ca20767b429fa825a582f15c875 SHA1 73c5366537006e3c983ee200c846bca8a64b843d SHA256 44e545fd16211acd3b82abd733f590a3b727d3eb11f2828b7546012c4af83786
+MISC ChangeLog 1791 RMD160 4a928fca5bfb10db2373eece09deaa398e871313 SHA1 11340ebb3d3cd15ac927a7a0d4892007dbd4c696 SHA256 2386281b6e24cb2da28df24e9536af339990c6dd6a960d316f1bc647ad985876
 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf
diff --git a/media-radio/gpredict/files/gpredict-1.0_beta1-goocanvas.patch b/media-radio/gpredict/files/gpredict-1.0_beta1-goocanvas.patch
deleted file mode 100644
index 8f304382a..000000000
--- a/media-radio/gpredict/files/gpredict-1.0_beta1-goocanvas.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0"
-+pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.8"
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
-@@ -76,6 +76,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`
- dnl SQL_V=`pkg-config --modversion sqlite3`
- if test "$havecurl" = true ; then
-    CURL_V=`pkg-config --modversion libcurl`
-@@ -88,8 +88,6 @@
- AC_SUBST(CFLAGS)
- AC_SUBST(LDFLAGS)
- 
--AC_CONFIG_SUBDIRS(goocanv8)
--
- AC_OUTPUT([
- Makefile
- doc/Makefile
-@@ -112,6 +112,7 @@
- echo Gthread version.... : $GTHR_V
- echo Gdk version........ : $GDK_V
- echo Gtk+ version....... : $GTK_V
-+echo Goocanvas version.. : $GOO_V
- dnl echo SQLite version..... : $SQL_V
- if test "$havecurl" = true ; then
- echo Curl version....... : $CURL_V
---- 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/files/gpredict-1.0_beta1-doc.patch b/media-radio/gpredict/files/gpredict-1.0_beta2-doc.patch
index 58177a5fd..788306838 100644
--- a/media-radio/gpredict/files/gpredict-1.0_beta1-doc.patch
+++ b/media-radio/gpredict/files/gpredict-1.0_beta2-doc.patch
@@ -1,14 +1,14 @@
---- Makefile.am.orig	2008-12-30 15:08:30.000000000 +0100
-+++ Makefile.am	2008-12-30 15:08:54.000000000 +0100
-@@ -2,12 +2,8 @@
+--- Makefile.am.orig	2009-04-19 10:32:33.000000000 +0200
++++ Makefile.am	2009-04-19 10:32:46.000000000 +0200
+@@ -2,12 +2,6 @@
  
  install-data-local:
  	@$(NORMAL_INSTALL)
 -	$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DESTDIR)$(pkgdatadir)
 -	$(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir)
- 	$(INSTALL_DATA) $(top_srcdir)/NEWS $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_DATA) $(top_srcdir)/NEWS $(DESTDIR)$(pkgdatadir)
 -	$(INSTALL_DATA) $(top_srcdir)/README $(DESTDIR)$(pkgdatadir)
- 	$(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(pkgdatadir)
 -	$(INSTALL_DATA) $(top_srcdir)/TODO $(DESTDIR)$(pkgdatadir)
  
  EXTRA_DIST = \
diff --git a/media-radio/gpredict/gpredict-1.0_beta1.ebuild b/media-radio/gpredict/gpredict-1.0_beta2.ebuild
index 28036ede4..105b52ec7 100644
--- a/media-radio/gpredict/gpredict-1.0_beta1.ebuild
+++ b/media-radio/gpredict/gpredict-1.0_beta2.ebuild
@@ -15,9 +15,9 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.14.0
+RDEPEND=">=dev-libs/glib-2.16.0
 	>=x11-libs/gtk+-2.12
-	>=x11-libs/goocanvas-0.8
+	>=x11-libs/goocanvas-0.9
 	net-misc/curl"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -29,21 +29,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# prevent gpredict from building goocanvas itself
-	epatch "${FILESDIR}/${P}-goocanvas.patch"
-	rm -rf goocanv8
-
 	# remove wrong doc location
 	epatch "${FILESDIR}/${P}-doc.patch"
 
 	eautoreconf
 }
 
-src_compile() {
-	econf --disable-coverage
-	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