Clean up old revision. Bump to EAPI 3 for dependencies slot restrictions.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 28 insertions, 66 deletions

diff --git a/x11-libs/gtkmathview/ChangeLog b/x11-libs/gtkmathview/ChangeLog
index 6429950d0ac9..2484484c2064 100644
--- a/x11-libs/gtkmathview/ChangeLog
+++ b/x11-libs/gtkmathview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtkmathview
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/ChangeLog,v 1.34 2009/05/10 15:53:42 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/ChangeLog,v 1.35 2011/01/24 18:55:40 eva Exp $
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtkmathview-0.7.6.ebuild, gtkmathview-0.8.0.ebuild:
+  Clean up old revision. Bump to EAPI 3 for dependencies slot restrictions.
 
   10 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   gtkmathview-0.8.0.ebuild, +files/gtkmathview-0.8.0-gcc44.patch:
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index cbba7ba1404f..d03ff07333b2 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtkmathview-0.8.0-cond-t1.patch 1270 RMD160 3a3cbeaa1882162116cb3e5b0ccb57f23341c6a8 SHA1 ef2e8ade3890fa682c47318483482fc3971261e5 SHA256 731894b852a8f692a3a1778bf6666a43e6afaa38e30b73d90272ae56d65bf709
 AUX gtkmathview-0.8.0-gcc43.patch 2006 RMD160 bef4b3a2d9f93aa302b445c7a3157e3c1c786860 SHA1 6818e6d50d6bb739e0bcb9c89c879aebb730bee5 SHA256 3915f9f0d58e4eb5294b817bb5323cd9954676ff1044db3683fbaee94200688b
 AUX gtkmathview-0.8.0-gcc44.patch 259 RMD160 280e790b97442bee1c0f31d24961ebb5cea91762 SHA1 ea57cf665803d3bc901677d0a4df581a5676d433 SHA256 5972d8a65f1dc4253f83d082d3afc5d9dc36aa1d365bd66a0114834200d5adf5
-DIST gtkmathview-0.7.6.tar.gz 953213 RMD160 16efce39168d84ae5145d8d607e6c413978e6e87 SHA1 3eef065f062e0eeee67bffabdb662ad28cff8351 SHA256 4b104ab94774ca429aa639a1a6f0adec1ca1443bfd444f2100c063e3cf70e6bb
 DIST gtkmathview-0.8.0.tar.gz 987328 RMD160 6ed60ee9253fd0fdd9bc595a9178ede5100e1644 SHA1 dc6db75a64b8dcde05185c3c54eec310dd7b14d6 SHA256 1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43
-EBUILD gtkmathview-0.7.6.ebuild 1432 RMD160 68727b2b2c855897be6e068ec7e6bfb85977ac6a SHA1 bf699647f6e2a0a674a4d2c0be6119c750958595 SHA256 268afc42b0912fc81b2c8b50af09fb9b141db4718b914e7e7c9b4a51a2f14c8b
-EBUILD gtkmathview-0.8.0.ebuild 1552 RMD160 fd74d2c2fd922f47149171e4c50fb686bf0e04dc SHA1 a7d06ad3ca1b603eb43ea515e02eabb4e7cfe8ce SHA256 10eebe8a23f67e18f59e9e48843fc436b5b629acfbcde2ce2083d8321e083e73
-MISC ChangeLog 4724 RMD160 003ca10f81fad74a2a558b0378fc85e2f25a3420 SHA1 b781e1a09519c389051f90e9e1e1bdd46bb17865 SHA256 8f1247914a4359c9c45784862fd937514d233474e8364be6188eaa1f8d5029a8
+EBUILD gtkmathview-0.8.0.ebuild 1537 RMD160 cfdce303535db021c5cc5cdec98d0e600a65e697 SHA1 4fd8b85605e3e30f207e89c3ec48a72da7ed7f1e SHA256 a05b0cc13ad7eaa7638ea3409b2604f61b32f76d5ab9c5cf30011581339afa3b
+MISC ChangeLog 4904 RMD160 0b89c77345408b55d11e2e65bc55542baef7f213 SHA1 bb8c5338af125353788ebc58c773c0cda38b6197 SHA256 e191911a2ab1bd6f71144698ecb0cbfa5a0b947b50c2f9f210d67a825ca5ac21
 MISC metadata.xml 241 RMD160 37757f5473c54f97048aac57c0bfe4f8e1555d6d SHA1 4400f5a824a5c38938bef3ed4564d3104fdd95df SHA256 a9a41982682ff446305e2d5b63c8082f0bb596511bfda2cd4ee8b8dea6dfa700
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk09zBoACgkQ1fmVwcYIWAYytACdGHGsrq4pqLHDHYPyrxlR5hfA
+RbYAnj5pk9HwmtcABbOr7fjYm963PLdK
+=e8gQ
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtkmathview/gtkmathview-0.7.6.ebuild b/x11-libs/gtkmathview/gtkmathview-0.7.6.ebuild
deleted file mode 100644
index 287fe134b4ad..000000000000
--- a/x11-libs/gtkmathview/gtkmathview-0.7.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/gtkmathview-0.7.6.ebuild,v 1.11 2006/10/14 16:37:36 kloeri Exp $
-
-DESCRIPTION="Rendering engine for MathML documents"
-HOMEPAGE="http://helm.cs.unibo.it/mml-widget/"
-SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="gtk svg t1lib"
-
-RDEPEND=">=dev-libs/glib-2.2.1
-		 >=dev-libs/popt-1.7
-		 >=dev-libs/libxml2-2.6.7
-		 gtk?	(
-		 			>=x11-libs/gtk+-2.2.1
-					>=media-libs/t1lib-5
-		 			>=dev-libs/gmetadom-0.1.8
-					  x11-libs/pango
-				)
-		 t1lib?	( >=media-libs/t1lib-5 )"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-src_compile() {
-	# --disable-popt will build only the library and not the frontend
-	local myconf="--enable-popt --enable-libxml2 --enable-libxml2-reader"
-
-	if use gtk ; then
-		myconf="${myconf} --enable-gmetadom"
-	fi
-
-	# other options
-	myconf="${myconf} --enable-builder-cache --enable-breaks --enable-boxml"
-
-	econf $(use_enable debug) \
-		  $(use_enable gtk) $(use_enable gtk gmetadom) \
-		  $(use_enable svg) \
-		  $(use_with t1lib) \
-		  ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	dodoc ANNOUNCEMENT AUTHORS BUGS CONTRIBUTORS ChangeLog HISTORY NEWS TODO
-}
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild
index a244e8105933..35e37eb3bbe0 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild,v 1.10 2009/05/10 15:53:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild,v 1.11 2011/01/24 18:55:40 eva Exp $
+
+EAPI="3"
 
 inherit eutils
 
@@ -14,11 +16,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="gtk svg t1lib"
 
-RDEPEND=">=dev-libs/glib-2.2.1
+RDEPEND=">=dev-libs/glib-2.2.1:2
 		 >=dev-libs/popt-1.7
 		 >=dev-libs/libxml2-2.6.7
 		 gtk?	(
-		 			>=x11-libs/gtk+-2.2.1
+		 			>=x11-libs/gtk+-2.2.1:2
 					>=media-libs/t1lib-5
 		 			>=dev-libs/gmetadom-0.1.8
 					  x11-libs/pango
@@ -27,16 +29,13 @@ RDEPEND=">=dev-libs/glib-2.2.1
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-cond-t1.patch
 }
 
-src_compile() {
+src_configure() {
 	# --disable-popt will build only the library and not the frontend
 	# TFM is needed for SVG, default value is 2
 	econf $(use_enable gtk) $(use_enable gtk gmetadom) \
@@ -51,10 +50,10 @@ src_compile() {
 		--enable-breaks \
 		--enable-boxml \
 		|| die "configure failed"
-	emake || die "make failed"
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die "install failed"
-	dodoc ANNOUNCEMENT AUTHORS BUGS CONTRIBUTORS ChangeLog HISTORY NEWS TODO
+	dodoc ANNOUNCEMENT AUTHORS BUGS CONTRIBUTORS ChangeLog HISTORY NEWS TODO \
+		|| die "dodoc failed"
 }