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

(Portage version: 2.1.4.4)

3 files changed, 13 insertions, 66 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/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
 }