clean up

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 9 insertions, 177 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index bbf9ce821f40..ebfe559ce405 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/gramps
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.113 2009/12/25 00:01:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.114 2009/12/25 00:07:00 fauli Exp $
+
+  25 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  -gramps-3.1.1-r1.ebuild, -gramps-3.1.2.ebuild:
+  clean up
 
 *gramps-3.1.3 (24 Dec 2009)
 
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 28e380f8e1c4..38e2ada43a48 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -5,17 +5,15 @@ AUX gramps-3.1.2-use_bsddb3.patch 2042 RMD160 28b4068768b3837b276457acd5fde417ed
 DIST gramps-3.1.1.tar.gz 6794185 RMD160 56cd774a5145a629d136988d76b9571113729b42 SHA1 1cfd0ffcec6507a0cb2ec4a703b7e8253ca38871 SHA256 cbd6b657dc3e1f79008b14cfa117862b0211f7418114de1d528df2818e5ee8bd
 DIST gramps-3.1.2.tar.gz 7298882 RMD160 a4b4869b72db4672793522152210094b4178a761 SHA1 0f44bb1da675122013b2a362297f2830e86b8a6a SHA256 8a61d443074313186023f90d54bf61d6b6eba66463def42b2b17ee07fefddef5
 DIST gramps-3.1.3.tar.gz 7136101 RMD160 98f63d652b96daf932021c8d3c66161e4362d0a6 SHA1 4798d433eaaf1680d539350c631ad6d50a0bbffb SHA256 222904836d7e947dd42c89ad32161c139e1c01a5ce069b42ded193dad3cf26cc
-EBUILD gramps-3.1.1-r1.ebuild 2117 RMD160 65061401d77b3b8c97704fe75d1ac974f78acede SHA1 1638422e7ae053cfed44951863d46454181f7784 SHA256 ea74cf2b08d48b5cfc646764ea0ebb03695e5afccdc894a8c8f25be46ebbcfc0
 EBUILD gramps-3.1.1.ebuild 2167 RMD160 b0721ff8dafb873b8a0edaf90b4e20580aa03417 SHA1 69d994d429aa96a4e8bf2282e8a48cea37320964 SHA256 6ec5de018110e3003dc128ae19b44a81a8b882f178529d32cf964bd0ffae47b3
 EBUILD gramps-3.1.2-r1.ebuild 2173 RMD160 38c89db9c0dbb68e28ebe413e056f5be0e583f79 SHA1 c8ff177b761b5938ad6783eddfc550cb76cc6818 SHA256 db8d5af99f5e9c45cbc4fb24dd3e249ea5d36d645fab7be1633b5f48f359d286
-EBUILD gramps-3.1.2.ebuild 2114 RMD160 77181250eaf0bc00cbd66b84967c1647153dd607 SHA1 9f31b55e95e7cda20c9f9a0523b039e0cf5bbdf4 SHA256 ea3a13bf7ee3395213b0d930a94ecc53b4d77dcde1941d5b7105820efe14b26d
 EBUILD gramps-3.1.3.ebuild 2177 RMD160 a530fa1effadd1c12f9674bf0b97092347dce330 SHA1 50a9bfa974bdd5bd98c73ee57253183410e6b46f SHA256 f67745aa1aaad44e4c6799da669b3a99174d01b4917f4ebf5a60da41399c0c09
-MISC ChangeLog 16241 RMD160 6e7d4b84f78c021d9e21269bb4d95f7ea0c118f5 SHA1 1c992cf5a56beedcd6a43b1ee6818765b8aee131 SHA256 ba5231e25a2093a18eba1aadd94bf792a20c6152a77bd508880443c19ae9b427
+MISC ChangeLog 16357 RMD160 3107d654693287f32879b730c4971a8c83055a20 SHA1 4b7bcfe6a5dc6b2ec5e4082fbc5ca6778eb994fa SHA256 595f06b4d73dd847c2a4e4e8756c34ca5c3530d3d0d7d1f04ea4d3134ab1df6a
 MISC metadata.xml 5391 RMD160 6b000acb76bc6562c214c0078c58874f72cf839a SHA1 4a32ff9f7ca6549f951445dfa6309aea5b5d031c SHA256 bf3d518f68f9f0c58915b821f767d9d407390f0f971a8d0dfdd6f64cad5c74c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAks0AQIACgkQNQqtfCuFneNx3ACfWHyBDh6qQR6UqZavbNOZj1h3
-KsoAoIoXCJoeHIojQIGr16/8UtbK5T7v
-=bszr
+iEYEARECAAYFAks0AjUACgkQNQqtfCuFnePFYwCdE18eBBqz1CpkPe/ifbbbTlDh
+DQ0AmwWkoR73M+EWDtO+V1AmDzZDmx4v
+=O6M8
 -----END PGP SIGNATURE-----
diff --git a/app-misc/gramps/gramps-3.1.1-r1.ebuild b/app-misc/gramps/gramps-3.1.1-r1.ebuild
deleted file mode 100644
index a39950d87312..000000000000
--- a/app-misc/gramps/gramps-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.1.1-r1.ebuild,v 1.2 2009/10/07 14:45:38 volkmar Exp $
-
-EAPI=2
-
-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="gnome mozembed reports spell webkit"
-
-RDEPEND=">=dev-lang/python-2.5[berkdb]
-	>=dev-python/pygtk-2.10.0
-	x11-misc/xdg-utils
-	gnome-base/librsvg:2
-	gnome? ( dev-python/libgnome-python
-		dev-python/gconf-python )
-	mozembed? ( dev-python/gtkmozembed-python )
-	spell? ( dev-python/gtkspell-python
-		dev-python/pyenchant )
-	reports? ( media-gfx/graphviz )
-	webkit? ( dev-python/pywebkitgtk )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libiconv
-	dev-util/pkgconfig"
-
-DOCS="NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-mime-install"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	eautoreconf
-	# This is for bug 215944, so .pyo/.pyc files don't get into the
-	# file system
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-
-	python_version
-
-	# Fix install path.
-	einfo "Fix installation path"
-	find . -iname 'Makefile.in' | xargs \
-		sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
-		|| die
-
-	sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-		-i src/Makefile.in || die
-
-	sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-	-i src/docgen/Makefile.in || die
-
-	einfo "Fix wrapper script"
-	sed "s;@datadir@;$(python_get_sitedir);" \
-		-i gramps.sh.in || die
-
-	einfo "Fix icon location"
-	sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
-}
-
-src_install() {
-	python_need_rebuild
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize $(python_get_sitedir)/${PN}
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}
diff --git a/app-misc/gramps/gramps-3.1.2.ebuild b/app-misc/gramps/gramps-3.1.2.ebuild
deleted file mode 100644
index a0321c5974ba..000000000000
--- a/app-misc/gramps/gramps-3.1.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.1.2.ebuild,v 1.2 2009/10/07 14:45:38 volkmar Exp $
-
-EAPI=2
-
-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="gnome mozembed reports spell webkit"
-
-RDEPEND=">=dev-lang/python-2.5[berkdb]
-	>=dev-python/pygtk-2.10.0
-	x11-misc/xdg-utils
-	gnome-base/librsvg:2
-	gnome? ( dev-python/libgnome-python
-		dev-python/gconf-python )
-	mozembed? ( dev-python/gtkmozembed-python )
-	spell? ( dev-python/gtkspell-python
-		dev-python/pyenchant )
-	reports? ( media-gfx/graphviz )
-	webkit? ( dev-python/pywebkitgtk )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libiconv
-	dev-util/pkgconfig"
-
-DOCS="NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-mime-install"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	eautoreconf
-	# This is for bug 215944, so .pyo/.pyc files don't get into the
-	# file system
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-
-	python_version
-
-	# Fix install path.
-	einfo "Fix installation path"
-	find . -iname 'Makefile.in' | xargs \
-		sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
-		|| die
-
-	sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-		-i src/Makefile.in || die
-
-	sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-	-i src/docgen/Makefile.in || die
-
-	einfo "Fix wrapper script"
-	sed "s;@datadir@;$(python_get_sitedir);" \
-		-i gramps.sh.in || die
-
-	einfo "Fix icon location"
-	sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
-}
-
-src_install() {
-	python_need_rebuild
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize $(python_get_sitedir)/${PN}
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}