Version bumped.

12 files changed, 27 insertions, 93 deletions

diff --git a/dev-libs/gmetadom/ChangeLog b/dev-libs/gmetadom/ChangeLog
index 6f6b55297bd3..32849721ef31 100644
--- a/dev-libs/gmetadom/ChangeLog
+++ b/dev-libs/gmetadom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmetadom
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.10 2004/09/30 00:13:47 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.11 2005/01/03 07:27:39 matsuu Exp $
+
+  03 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> -gmetadom-0.2.0.ebuild,
+  -gmetadom-0.2.1-r1.ebuild, -gmetadom-0.2.1.ebuild:
+  Version bumped.
+  Removed old versions.
 
 *gmetadom-0.2.1-r2 (30 Aug 2004)
 
diff --git a/dev-libs/gmetadom/Manifest b/dev-libs/gmetadom/Manifest
index 1d0a2219032c..30e6ecae3aa1 100644
--- a/dev-libs/gmetadom/Manifest
+++ b/dev-libs/gmetadom/Manifest
@@ -1,26 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8b7c0f18aaca345532495a4e8cdd5cbf ChangeLog 1461
 MD5 47dd4a6a91133344e4588beb75080d49 gmetadom-0.0.3-r3.ebuild 1471
 MD5 0d85948245811ee6e2829f30eb86ea18 gmetadom-0.1.8.ebuild 734
-MD5 4b01e7566ffd7faffa34e61e84b90467 gmetadom-0.2.0.ebuild 734
-MD5 d6f33f08b07a2acf50ed841f439dff2b gmetadom-0.2.1-r1.ebuild 1164
-MD5 e781dbc70b628b213c55c56dfdd8bfa3 gmetadom-0.2.1.ebuild 750
-MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
 MD5 c8cf022cb78ffcfe6c239afa714338be gmetadom-0.2.1-r2.ebuild 1186
-MD5 7192830dc2daf239e593ee9d302af67e files/digest-gmetadom-0.0.3-r3 66
+MD5 8b7c0f18aaca345532495a4e8cdd5cbf ChangeLog 1461
+MD5 94b2d82fb218d57847a39cc9f60b06d5 gmetadom-0.2.2.ebuild 1201
+MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
 MD5 61a42bb68511dea925d7f7860eb7027c files/digest-gmetadom-0.1.8 66
-MD5 350b9753c53fe68919fe89a53c77736a files/digest-gmetadom-0.2.0 66
-MD5 51735b8a4a855394319affc43667b6de files/digest-gmetadom-0.2.1 66
-MD5 51735b8a4a855394319affc43667b6de files/digest-gmetadom-0.2.1-r1 66
-MD5 07657f960b260c0ab18b3022b6c115a4 files/gmetadom-0.0.3-gcc3.diff 863
+MD5 8d971df6e209b8eee4244293fca7b04b files/digest-gmetadom-0.2.2 66
 MD5 326c113f108983dcacee65c42b42b766 files/gmetadom-0.2.1-gentoo.patch 2344
+MD5 7192830dc2daf239e593ee9d302af67e files/digest-gmetadom-0.0.3-r3 66
 MD5 51735b8a4a855394319affc43667b6de files/digest-gmetadom-0.2.1-r2 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBW0/DI1lqEGTUzyQRAoK/AJ9v0EOSjNlidpvZ+AyzO5JDTAfVZgCgqYT6
-yL+fU84TA12pgNfoGvrtb/4=
-=VGFk
------END PGP SIGNATURE-----
+MD5 07657f960b260c0ab18b3022b6c115a4 files/gmetadom-0.0.3-gcc3.diff 863
diff --git a/dev-libs/gmetadom/files/digest-gmetadom-0.2.0 b/dev-libs/gmetadom/files/digest-gmetadom-0.2.0
deleted file mode 100644
index af74463898da..000000000000
--- a/dev-libs/gmetadom/files/digest-gmetadom-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ffe2647ac693754f08a061d49372712 gmetadom-0.2.0.tar.gz 387581
diff --git a/dev-libs/gmetadom/files/digest-gmetadom-0.2.1 b/dev-libs/gmetadom/files/digest-gmetadom-0.2.1
deleted file mode 100644
index 8a061964eb93..000000000000
--- a/dev-libs/gmetadom/files/digest-gmetadom-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d49465d563d83e99ea1c4f7816d1ac9a gmetadom-0.2.1.tar.gz 476454
diff --git a/dev-libs/gmetadom/files/digest-gmetadom-0.2.1-r1 b/dev-libs/gmetadom/files/digest-gmetadom-0.2.1-r1
deleted file mode 100644
index 8a061964eb93..000000000000
--- a/dev-libs/gmetadom/files/digest-gmetadom-0.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d49465d563d83e99ea1c4f7816d1ac9a gmetadom-0.2.1.tar.gz 476454
diff --git a/dev-libs/gmetadom/files/digest-gmetadom-0.2.2 b/dev-libs/gmetadom/files/digest-gmetadom-0.2.2
new file mode 100644
index 000000000000..97df1a9a35f0
--- /dev/null
+++ b/dev-libs/gmetadom/files/digest-gmetadom-0.2.2
@@ -0,0 +1 @@
+MD5 9fe1ee842bcbbe53ac013e9001c05c08 gmetadom-0.2.2.tar.gz 478558
diff --git a/dev-libs/gmetadom/gmetadom-0.0.3-r3.ebuild b/dev-libs/gmetadom/gmetadom-0.0.3-r3.ebuild
index a3fd1e3b1cb2..d5fe0c100399 100644
--- a/dev-libs/gmetadom/gmetadom-0.0.3-r3.ebuild
+++ b/dev-libs/gmetadom/gmetadom-0.0.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.0.3-r3.ebuild,v 1.6 2004/06/24 23:11:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.0.3-r3.ebuild,v 1.7 2005/01/03 07:27:40 matsuu Exp $
 
 inherit eutils
 
diff --git a/dev-libs/gmetadom/gmetadom-0.1.8.ebuild b/dev-libs/gmetadom/gmetadom-0.1.8.ebuild
index 5b9064642c9b..59a265744b23 100644
--- a/dev-libs/gmetadom/gmetadom-0.1.8.ebuild
+++ b/dev-libs/gmetadom/gmetadom-0.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.1.8.ebuild,v 1.2 2004/06/24 23:11:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.1.8.ebuild,v 1.3 2005/01/03 07:27:40 matsuu Exp $
 
 DESCRIPTION="A library providing bindings for multiple languages of multiple C DOM implementations"
 HOMEPAGE="http://gmetadom.sourceforge.net/"
diff --git a/dev-libs/gmetadom/gmetadom-0.2.0.ebuild b/dev-libs/gmetadom/gmetadom-0.2.0.ebuild
deleted file mode 100644
index 5d9292a78a37..000000000000
--- a/dev-libs/gmetadom/gmetadom-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.0.ebuild,v 1.2 2004/06/24 23:11:28 agriffis Exp $
-
-DESCRIPTION="A library providing bindings for multiple languages of multiple C DOM implementations"
-HOMEPAGE="http://gmetadom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gmetadom/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/gdome2-0.8.0"
-DEPEND="${RDEPEND}
-	>=dev-ml/findlib-0.8
-	>=dev-libs/libxslt-1.0.0"
-
-src_compile() {
-	econf || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS BUGS ChangeLog HISTORY LICENSE NEWS README
-}
diff --git a/dev-libs/gmetadom/gmetadom-0.2.1-r2.ebuild b/dev-libs/gmetadom/gmetadom-0.2.1-r2.ebuild
index fbf7bd99b889..f23994e018c7 100644
--- a/dev-libs/gmetadom/gmetadom-0.2.1-r2.ebuild
+++ b/dev-libs/gmetadom/gmetadom-0.2.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.1-r2.ebuild,v 1.2 2004/09/03 15:31:49 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.1-r2.ebuild,v 1.3 2005/01/03 07:27:40 matsuu Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/dev-libs/gmetadom/gmetadom-0.2.1.ebuild b/dev-libs/gmetadom/gmetadom-0.2.1.ebuild
deleted file mode 100644
index ce9777b1f5da..000000000000
--- a/dev-libs/gmetadom/gmetadom-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.1.ebuild,v 1.2 2004/06/24 23:11:28 agriffis Exp $
-
-DESCRIPTION="A library providing bindings for multiple languages of multiple C DOM implementations"
-HOMEPAGE="http://gmetadom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gmetadom/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ocaml"
-
-RDEPEND=">=dev-libs/gdome2-0.8.0"
-DEPEND="${RDEPEND}
-	>=dev-libs/libxslt-1.0.0
-	ocaml? ( >=dev-ml/findlib-0.8 )"
-
-src_compile() {
-	econf || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS BUGS ChangeLog HISTORY LICENSE NEWS README
-}
diff --git a/dev-libs/gmetadom/gmetadom-0.2.1-r1.ebuild b/dev-libs/gmetadom/gmetadom-0.2.2.ebuild
index cb905e84e0b8..159bdce4b5c9 100644
--- a/dev-libs/gmetadom/gmetadom-0.2.1-r1.ebuild
+++ b/dev-libs/gmetadom/gmetadom-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.1-r1.ebuild,v 1.3 2004/09/03 15:31:49 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.2.ebuild,v 1.1 2005/01/03 07:27:40 matsuu Exp $
 
-inherit 64-bit flag-o-matic eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="A library providing bindings for multiple languages of multiple C DOM implementations"
 HOMEPAGE="http://gmetadom.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gmetadom/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="ocaml"
 
 RDEPEND=">=dev-libs/gdome2-0.8.0"
@@ -22,13 +22,14 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${PN}-0.2.1-gentoo.patch
 }
 
 src_compile() {
 	local mymod="gdome_cpp_smart"
 
-	64-bit && append-flags -fPIC
+	# Unconditonal use of -fPIC (#55238).
+	append-flags -fPIC
 	use ocaml && mymod="${mymod} gdome_caml"
 
 	econf --with-modules="${mymod}" || die