[gentoo-commits] gentoo-x86 commit in app-misc/gramps: ChangeLog gramps-3.0.4.ebuild

[Christian Faulhammer (fauli)]

fauli       09/01/06 00:39:29

  Modified:             ChangeLog gramps-3.0.4.ebuild
  Log:
  make use of EAPI2 features to check for USE=sqlite or USE=berkdb on dev-lang/python, thus makes the built_with_use check obsolete
  (Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r7 i686)

Revision  Changes    Path
1.89                 app-misc/gramps/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/ChangeLog?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/ChangeLog?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/ChangeLog?r1=1.88&r2=1.89

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ChangeLog	4 Jan 2009 12:06:04 -0000	1.88
+++ ChangeLog	6 Jan 2009 00:39:29 -0000	1.89
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/gramps
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.88 2009/01/04 12:06:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.89 2009/01/06 00:39:29 fauli Exp $
+
+  06 Jan 2009; Christian Faulhammer <fauli@g.o> gramps-3.0.4.ebuild:
+  make use of EAPI2 features to check for USE=sqlite or USE=berkdb on
+  dev-lang/python, thus makes the built_with_use check obsolete
 
   04 Jan 2009; Christian Faulhammer <fauli@g.o>
   -files/gramps-3.0.1-no_scrollkeeper.patch, -gramps-3.0.1-r1.ebuild:



1.3                  app-misc/gramps/gramps-3.0.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/gramps-3.0.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/gramps-3.0.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/gramps-3.0.4.ebuild?r1=1.2&r2=1.3

Index: gramps-3.0.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gramps-3.0.4.ebuild	22 Dec 2008 19:23:17 -0000	1.2
+++ gramps-3.0.4.ebuild	6 Jan 2009 00:39:29 -0000	1.3
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.4.ebuild,v 1.2 2008/12/22 19:23:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.4.ebuild,v 1.3 2009/01/06 00:39:29 fauli Exp $
 
+EAPI=2
 NEED_PYTHON="2.5"
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -23,6 +24,7 @@
 		>=dev-python/gnome-python-desktop-2.6 )
 	reports? ( media-gfx/graphviz )"
 DEPEND="${RDEPEND}
+	|| ( dev-lang/python[sqlite] dev-lang/python[berkdb] )
 	sys-devel/gettext
 	virtual/libiconv
 	dev-util/pkgconfig
@@ -31,13 +33,6 @@
 DOCS="NEWS README TODO"
 
 pkg_setup() {
-	if ! built_with_use -a 'dev-lang/python' sqlite berkdb ; then
-		eerror "You need to install python with Berkeley Database support."
-		eerror "Add 'dev-lang/python berkdb sqlite' to /etc/portage/package.use "
-		eerror "and then re-emerge python."
-		die "berkdb or sqlite support missing from Python"
-	fi
-
 	G2CONF="${G2CONF} --disable-mime-install"
 }