new release 'n ebuild cleanup

9 files changed, 27 insertions, 138 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 2de683daf9c7..78c16298d95f 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.56 2003/10/22 11:56:28 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.57 2003/10/29 17:44:01 foser Exp $
+
+*libxml2-2.6.1 (29 Oct 2003)
+
+  29 Oct 2003; foser <foser@gentoo.org> libxml2-2.6.1.ebuild :
+  New version, readded ia64 keyword that seems to have vanished
+  esthetic ebuild cleanups
 
   22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> libxml2-2.5.11.ebuild:
   set ppc in keywords
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index dd0ba5236fbf..6f12b2cf1540 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,21 +1,14 @@
 MD5 20af0a03d2853b1e4271f46c2589f836 libxml2-2.5.7.ebuild 1686
-MD5 4402f5fb2868bfaea954c3044a42d237 libxml2-2.5.10.ebuild 1561
 MD5 baa2676aae2eccc9f5b80248ff0164a0 libxml2-2.5.9.ebuild 1807
-MD5 d6e3d197694805e94cb094f7ab9b08fa libxml2-2.5.4.ebuild 1679
-MD5 82e1d16f095d6d7fb6d257113812b028 libxml2-2.4.30.ebuild 1477
 MD5 c783dc9ef1cba91cae2d3a360b5156a4 libxml2-2.5.8.ebuild 1905
-MD5 c0000a19b6efd81778e533cb675250c2 libxml2-2.6.1.ebuild 1716
+MD5 f7f8614e70324bfadfaf9f2a95d326d5 libxml2-2.6.1.ebuild 1684
 MD5 b4bb706186650d45259e237ccf866e64 libxml2-2.5.11.ebuild 1691
-MD5 b41ca06bf8073e48fd1acebca165b905 ChangeLog 7114
+MD5 77eaf4b3b6effbbb81bb004b2fa4b568 ChangeLog 7293
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 49743757cf83cdff77f25886c42592e2 files/digest-libxml2-2.5.4 67
 MD5 46b436e9d358547dbee7e9101d5eed45 files/digest-libxml2-2.5.7 67
 MD5 3faad335ba4bb6c8e06311d4a694106b files/digest-libxml2-2.5.8 67
 MD5 b7955770c4b6abe981595c3ed70bde03 files/digest-libxml2-2.5.9 67
-MD5 da99285ba63c4d11fff0d949ab870a28 files/digest-libxml2-2.6.0 67
 MD5 83ab7b0fcf04d88eee2d92f69c2ebc67 files/digest-libxml2-2.6.1 67
 MD5 eb759e6bb67654c71d0d53cb8a1c6633 files/libxml2-2.5.4-dec-alpha-compiler.diff 1283
 MD5 eb759e6bb67654c71d0d53cb8a1c6633 files/libxml2-2.5.7-dec-alpha-compiler.diff 1283
-MD5 9cfd17e057e09b2880060eb051e4dfcb files/digest-libxml2-2.4.30 68
-MD5 083bdfb9fa6e6d9a790843ff209b513d files/digest-libxml2-2.5.10 68
 MD5 49c1f27964b18c317f1b5c06c7bb2aeb files/digest-libxml2-2.5.11 68
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.4.30 b/dev-libs/libxml2/files/digest-libxml2-2.4.30
deleted file mode 100644
index c8db87c7335f..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.4.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d40d3ead987c858805b70d2fe84a6c4 libxml2-2.4.30.tar.bz2 1974050
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.5.10 b/dev-libs/libxml2/files/digest-libxml2-2.5.10
deleted file mode 100644
index fc0fb3da9720..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.5.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb2934ee74ff4349b0005d8fa29a7532 libxml2-2.5.10.tar.bz2 2438042
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.5.4 b/dev-libs/libxml2/files/digest-libxml2-2.5.4
deleted file mode 100644
index 75077ba51599..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8005f55dafe87c286536601f758ab29c libxml2-2.5.4.tar.bz2 2243759
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.6.1 b/dev-libs/libxml2/files/digest-libxml2-2.6.1
new file mode 100644
index 000000000000..1ea301f33744
--- /dev/null
+++ b/dev-libs/libxml2/files/digest-libxml2-2.6.1
@@ -0,0 +1 @@
+MD5 bf559e9a181bfce56814055d6265a257 libxml2-2.6.1.tar.bz2 2560936
diff --git a/dev-libs/libxml2/libxml2-2.4.30.ebuild b/dev-libs/libxml2/libxml2-2.4.30.ebuild
deleted file mode 100644
index b61000947642..000000000000
--- a/dev-libs/libxml2/libxml2-2.4.30.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.4.30.ebuild,v 1.7 2003/09/06 22:29:24 msterret Exp $
-
-inherit eutils libtool gnome.org flag-o-matic
-
-IUSE="python readline"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="sys-libs/zlib
-	python? ( dev-lang/python )
-	readline? ( sys-libs/readline )"
-
-SLOT="2"
-LICENSE="MIT"
-KEYWORDS="x86 ~sparc ~ppc alpha ~hppa amd64"
-
-src_compile() {
-	# Fix .la files of python site packages
-	elibtoolize
-
-	# fix bug 14265
-	strip-flags
-
-	local myconf=""
-
-	# This breaks gnome2 (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-	#use zlib && myconf="--with-zlib" || myconf="--without-zlib"
-
-	use python && myconf="${myconf} --with-python" \
-		|| myconf="${myconf} --without-python"
-	use readline && myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	econf --with-zlib ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/example \
-		BASE_DIR=/usr/share/doc \
-		DOC_MODULE=${PF} \
-		EXAMPLES_DIR=/usr/share/doc/${PF}/example \
-		TARGET_DIR=/usr/share/doc/${PF}/html \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
diff --git a/dev-libs/libxml2/libxml2-2.5.4.ebuild b/dev-libs/libxml2/libxml2-2.5.4.ebuild
deleted file mode 100644
index 8b11925e57c0..000000000000
--- a/dev-libs/libxml2/libxml2-2.5.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.5.4.ebuild,v 1.8 2003/09/11 01:10:01 msterret Exp $
-
-inherit eutils libtool gnome.org flag-o-matic
-
-IUSE="python readline"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="sys-libs/zlib
-	python? ( dev-lang/python )
-	readline? ( sys-libs/readline )"
-
-SLOT="2"
-LICENSE="MIT"
-KEYWORDS="x86 ppc ~sparc alpha hppa"
-
-src_compile() {
-	# Fix .la files of python site packages
-	elibtoolize
-
-	local myconf=""
-	if [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ]; then
-		# i think the author assumes __DECC is defined only on Tru64.
-		# quick fix in this patch. -taviso.
-		append-flags -ieee
-		epatch ${FILESDIR}/libxml2-${PV}-dec-alpha-compiler.diff
-	fi
-
-
-	# This breaks gnome2 (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-	#use zlib && myconf="--with-zlib" || myconf="--without-zlib"
-
-	use python && myconf="${myconf} --with-python" \
-		|| myconf="${myconf} --without-python"
-	use readline && myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	econf --with-zlib ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/example \
-		BASE_DIR=/usr/share/doc \
-		DOC_MODULE=${PF} \
-		EXAMPLES_DIR=/usr/share/doc/${PF}/example \
-		TARGET_DIR=/usr/share/doc/${PF}/html \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
diff --git a/dev-libs/libxml2/libxml2-2.5.10.ebuild b/dev-libs/libxml2/libxml2-2.6.1.ebuild
index 5ba046c98868..97d129be130d 100644
--- a/dev-libs/libxml2/libxml2-2.5.10.ebuild
+++ b/dev-libs/libxml2/libxml2-2.6.1.ebuild
@@ -1,36 +1,41 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.5.10.ebuild,v 1.3 2003/09/06 22:29:24 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.1.ebuild,v 1.1 2003/10/29 17:44:01 foser Exp $
 
-inherit eutils libtool gnome.org
-
-IUSE="python readline ipv6"
+inherit eutils libtool gnome.org flag-o-matic
 
 DESCRIPTION="Version 2 of the library to manipulate XML files"
 HOMEPAGE="http://www.xmlsoft.org/"
+LICENSE="MIT"
+
+IUSE="python readline ipv6"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 
 DEPEND="sys-libs/zlib
 	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )"
 
-SLOT="2"
-LICENSE="MIT"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-
 src_compile() {
-	elibtoolize
 
-	# USE zlib support breaks gnome2 (libgnomeprint for instance fails to compile with
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
 	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
 
 	econf --with-zlib \
 		`use_with python` \
 		`use_with readline` \
 		`use_enable ipv6` || die
+
 	emake || die
+
 }
 
 src_install() {
+
 	make \
 		DESTDIR=${D} \
 		DOCS_DIR=/usr/share/doc/${PF}/python \
@@ -41,7 +46,8 @@ src_install() {
 		TARGET_DIR=/usr/share/doc/${PF}/html \
 		install || die
 
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
+	dodoc AUTHORS Copyright ChangeLog INSTALL NEWS README TODO
+
 }
 
 pkg_postinst() {