revamp dependencies, as reported by Zsolt Foldvari <zsolt DOT foldvari AT gmail DOT com>, extend a comment and introduce reports USE flag to pull in graphviz; clean up

Package-Manager: portage-2.1.4.4

4 files changed, 18 insertions, 73 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index f77a1d7f2d69..f08aabf4b55b 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/gramps
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.62 2008/05/20 17:06:20 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.63 2008/05/21 15:34:54 opfer Exp $
+
+*gramps-3.0.1-r1 (21 May 2008)
+
+  21 May 2008; Christian Faulhammer <opfer@gentoo.org>
+  -gramps-3.0.0-r1.ebuild, -gramps-3.0.1.ebuild, +gramps-3.0.1-r1.ebuild:
+  revamp dependencies, as reported by Zsolt Foldvari <zsolt DOT foldvari AT
+  gmail DOT com>, extend a comment and introduce reports USE flag to pull in
+  graphviz; clean up
 
   20 May 2008; Christian Faulhammer <opfer@gentoo.org>
   gramps-3.0.0-r1.ebuild, gramps-3.0.1.ebuild:
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 956bb36356a3..f50523573abe 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -3,17 +3,15 @@ Hash: SHA1
 
 AUX gramps-2.2.2-desktop-entry-icon.patch 536 RMD160 2b687847b8bd7f0be4188e9db5ea1f84b00224c7 SHA1 5e5c1deb2504a1a4fba1fe5dc4c01253bf53d345 SHA256 6d85936122637d251169522c1319c88dfd408f9f23b82ff8367f2986192d4e3b
 DIST gramps-2.2.10.tar.gz 17230239 RMD160 90e9a04e4842972a319cf90c3cdbb171a05edd3c SHA1 e05691b31d81235b23aea78600d388e351b1a39e SHA256 152ccf9e29b888c7cb78354953664a941f73e18e5023e7ace9f1c0044c212448
-DIST gramps-3.0.0.tar.gz 5539471 RMD160 ccc2def3d93717f013e80d49d8c29531b34ef037 SHA1 3223443bd67106e9ec741acae086f94311e8b6ce SHA256 9a693e7ed310e48ccc9fdef2874198ef1c41f23934ef78ab5b06142fbd0aa452
 DIST gramps-3.0.1.tar.gz 5932971 RMD160 a76e88bc51e50ae52440cde0779e5b04657a8524 SHA1 371ffba136fe596a3a1a853cd63fd8cd68d0d02b SHA256 5492e8766ef17286ca23ac60bc6c262a07c0669646d1b7c103bf28f4f2032605
 EBUILD gramps-2.2.10.ebuild 1355 RMD160 bbe190719ffb13b1139c8d0cd0e4ff2ff5c25f47 SHA1 261ed5643386e22d87781183080a9e405be820db SHA256 f4f17c3ae2ca54c5da4ad658cd6177139cd5e7f86da9be52165473bdaf5ba4d0
-EBUILD gramps-3.0.0-r1.ebuild 1502 RMD160 7946a3a04bce1714491f2e9faaf9b072c8364c24 SHA1 3f5fa71f65af34a7e21414e252efe3430a8b9b61 SHA256 70b94d6d115cbe28c98e915c357950a785ad957c9d41c606a87407c4233ee8b2
-EBUILD gramps-3.0.1.ebuild 1499 RMD160 52fcacb0ce14c2ac56b0a89d6ba9cc222447f980 SHA1 91c478281a7d9c5fcfe1242dafb7e674342ab50d SHA256 1636dc43e324961bde02085cfe5f8c1aba0f9ad31d14dfe66d1fb6ee815fa20b
-MISC ChangeLog 8390 RMD160 6d0c176b7c032ee1e472e1d0ac2e70ec0ba78a11 SHA1 b89c2d4d7dba6c7b7be76efe419349e0bbe4f853 SHA256 6824abef7746057f20e93681e124582986977dd8dee1477773d333e932dfd2bd
+EBUILD gramps-3.0.1-r1.ebuild 1472 RMD160 c3439dc90cb32162254ced3ae99e9cc8357a2983 SHA1 6fb466d9616b616129f165a006d630773dbc34dd SHA256 a9b47a6307f6e7d7b1589e9aa8df89e9565b9a23816fb543341ce57306e1630a
+MISC ChangeLog 8726 RMD160 6c547f5a3eb73933fbd5f2a9e950cc49c3dbfd40 SHA1 733664d2e65f64b47c600c84ab2fbf80c59dcb42 SHA256 2a5a7ddcee18a922685b7450de79263cd69cca8cfd74a2bed2af7891e2f1a40a
 MISC metadata.xml 975 RMD160 619775633a2d5d1ef7192435199fb8c07b5ec922 SHA1 05f8c085d277d5e2388dac7e76e34a7c56e07b29 SHA256 e939d2ecc59d4f36cb4864de083d984aa3a3c069d854749981d39c07988da777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgzBRIACgkQNQqtfCuFneN98QCglOLIo2Tip6JwgicuVFo8vrpw
-YR4Anj/CuDcw3YTv5FAxZda20iP7JwbI
-=zc9X
+iEYEARECAAYFAkg0QSQACgkQNQqtfCuFneOCvACff6N2Tjn7Ls8jXAAuknDHfnNF
+iCoAn1p34B2n0AcqBpbDdbaeD4t2uYGE
+=vkzK
 -----END PGP SIGNATURE-----
diff --git a/app-misc/gramps/gramps-3.0.0-r1.ebuild b/app-misc/gramps/gramps-3.0.0-r1.ebuild
deleted file mode 100644
index 497064e89756..000000000000
--- a/app-misc/gramps/gramps-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.0-r1.ebuild,v 1.4 2008/05/20 17:06:20 opfer Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="http://www.gramps-project.org/"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.5
-	>=dev-python/pygtk-2.10.0
-	>=dev-python/gnome-python-2.6
-	>=app-text/gnome-doc-utils-0.6.1
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/scrollkeeper
-	virtual/libiconv
-	dev-util/pkgconfig"
-
-DOCS="NEWS README TODO"
-
-pkg_setup() {
-	if ! built_with_use 'dev-lang/python' berkdb ; then
-		eerror "You need to install python with Berkely Database support."
-		eerror "Add 'dev-lang/python berkdb' to /etc/portage/package.use "
-		eerror "and then re-emerge python."
-		die "berkdb support missing from gnome"
-	fi
-
-	G2CONF="${G2CONF} --disable-mime-install"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# This is for bug 215944, so .pyo/.pyc files don't get into the
-	# tree
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-misc/gramps/gramps-3.0.1.ebuild b/app-misc/gramps/gramps-3.0.1-r1.ebuild
index 46d98ef6a31a..b2a093335bfc 100644
--- a/app-misc/gramps/gramps-3.0.1.ebuild
+++ b/app-misc/gramps/gramps-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.1.ebuild,v 1.3 2008/05/20 17:06:20 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.1-r1.ebuild,v 1.1 2008/05/21 15:34:54 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -14,16 +14,14 @@ SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="reports"
 
 RDEPEND=">=dev-lang/python-2.5
 	>=dev-python/pygtk-2.10.0
 	>=dev-python/gnome-python-2.6
-	>=app-text/gnome-doc-utils-0.6.1
-	media-gfx/graphviz"
+	reports? ( media-gfx/graphviz )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	app-text/scrollkeeper
 	virtual/libiconv
 	dev-util/pkgconfig"
 
@@ -43,7 +41,7 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 	# This is for bug 215944, so .pyo/.pyc files don't get into the
-	# tree
+	# file system
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile
 }