media-radio/gpredict: Version bump

svn path=/sunrise/; revision=7553

5 files changed, 54 insertions, 19 deletions

diff --git a/media-radio/gpredict/ChangeLog b/media-radio/gpredict/ChangeLog
index 87347e0db..2495b4d28 100644
--- a/media-radio/gpredict/ChangeLog
+++ b/media-radio/gpredict/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Dec 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  -gpredict-0.9.0.ebuild, -files/gpredict-0.9.0-goocanvas.patch,
+  +gpredict-1.0_beta1.ebuild, +files/gpredict-1.0_beta1-doc.patch,
+  +files/gpredict-1.0_beta1-goocanvas.patch:
+  Version bump
+
   22 Aug 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de> metadata.xml:
   Added USE flag description wrt GLEP 56
 
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index 331d7ff67..d6ff7f7b0 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -1,5 +1,6 @@
-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 b618f3636a607e45e10006dba017252203f5e81a SHA1 d98ff0ed9a3cca8584ea1643bd33608bbc6d854e SHA256 cad193c9fae75903fc720d0c9534746c56659020fdd4669b4922fdedd970d7ee
-MISC ChangeLog 1054 RMD160 add79884dfdd9f543dca461fc5185f4fa2e54c1d SHA1 5eaab25f447e12c58d148641c581a74c548118c3 SHA256 57c9c60ce85a678dbd5d33dc25ca996ae41781c28d7715b507aedb03533bc498
+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 1117 RMD160 3b329050d986dc66f3cc16b0d131edc881675f16 SHA1 7b71f934ddbcc8e63ac543ded8f060cd9986aabb SHA256 289e9441bc4b6c13d40aa0c3f36b80097230c2ee6839623b4e023b0ac38a67ad
+MISC ChangeLog 1305 RMD160 bdf71aeb528c321b3ba8cd7f306e26f84cee202c SHA1 c6c46bb487837506a37cb724eed2f6db6f94e9fe SHA256 f9fba4f9d2cc8a4ee39fc26610359c581f2b8dfde58fc4ecc1a3c4e8f2a79209
 MISC metadata.xml 241 RMD160 4cf13a804ddc59df9006e6e52f81f3b8d500f478 SHA1 9c862cf022f13dbc7346e78c95e39c344fc82253 SHA256 1df2279c0132a0c968b258b7319a74aab48bb721af2577b125e435a8c7f92a0a
diff --git a/media-radio/gpredict/files/gpredict-1.0_beta1-doc.patch b/media-radio/gpredict/files/gpredict-1.0_beta1-doc.patch
new file mode 100644
index 000000000..58177a5fd
--- /dev/null
+++ b/media-radio/gpredict/files/gpredict-1.0_beta1-doc.patch
@@ -0,0 +1,15 @@
+--- 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 @@
+ 
+ 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)/README $(DESTDIR)$(pkgdatadir)
+ 	$(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_DATA) $(top_srcdir)/TODO $(DESTDIR)$(pkgdatadir)
+ 
+ EXTRA_DIST = \
+ 	autogen.sh            \
diff --git a/media-radio/gpredict/files/gpredict-0.9.0-goocanvas.patch b/media-radio/gpredict/files/gpredict-1.0_beta1-goocanvas.patch
index 3e45e6a46..8f304382a 100644
--- a/media-radio/gpredict/files/gpredict-0.9.0-goocanvas.patch
+++ b/media-radio/gpredict/files/gpredict-1.0_beta1-goocanvas.patch
@@ -12,20 +12,20 @@
  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_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)
-@@ -63,6 +63,7 @@
+@@ -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`
- fi
-@@ -71,8 +72,6 @@
+@@ -88,8 +88,6 @@
  AC_SUBST(CFLAGS)
  AC_SUBST(LDFLAGS)
  
@@ -34,14 +34,14 @@
  AC_OUTPUT([
  Makefile
  doc/Makefile
-@@ -96,6 +95,7 @@
+@@ -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
- 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 @@
diff --git a/media-radio/gpredict/gpredict-0.9.0.ebuild b/media-radio/gpredict/gpredict-1.0_beta1.ebuild
index 67b8a6a8a..eaba918d9 100644
--- a/media-radio/gpredict/gpredict-0.9.0.ebuild
+++ b/media-radio/gpredict/gpredict-1.0_beta1.ebuild
@@ -4,35 +4,48 @@
 
 inherit autotools eutils
 
+MY_PV=${PV/_beta/b}
+
 DESCRIPTION="A tool for tracking amateur radio satellites"
-HOMEPAGE="http://groundstation.sourceforge.net/gpredict/"
-SRC_URI="mirror://sourceforge/groundstation/${P}.tar.gz"
+HOMEPAGE="http://gpredict.oz9aec.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="coverage"
+IUSE=""
 
-DEPEND=">=dev-libs/glib-2.12.0
-	>=x11-libs/gtk+-2.10
+RDEPEND=">=dev-libs/glib-2.14.0
+	>=x11-libs/gtk+-2.12
 	>=x11-libs/goocanvas-0.8
 	net-misc/curl"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# Patch to prevent gpredict from building goocanvas itself
+
+	# 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 $(use_enable coverage ) || die "econf failed!"
+	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
+	dodoc AUTHORS ChangeLog NEWS README TODO  || die "dodoc died"
 }