Removed conditional inheritance, see QA on bug #68913, and cleaned out oldest versions

12 files changed, 29 insertions, 111 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 16d5905e5ac8..04661e39b311 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.81 2004/09/19 08:07:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.82 2004/11/05 03:09:29 obz Exp $
+
+  05 Nov 2004; Mike Gardiner <obz@gentoo.org> -libxslt-1.0.33.ebuild,
+  -libxslt-1.1.3.ebuild, libxslt-1.1.4.ebuild, libxslt-1.1.6.ebuild,
+  libxslt-1.1.8-r1.ebuild, libxslt-1.1.8.ebuild, libxslt-1.1.9-r1.ebuild,
+  libxslt-1.1.9.ebuild:
+  Removed conditional inheritance, see QA on bug #68913, and cleaned out
+  oldest versions
 
   19 Sep 2004; Joshua Kinard <kumba@gentoo.org> libxslt-1.1.8-r1.ebuild:
   Marked stable on mips.
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 7fffba7763ec..5bc092d3daf0 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,19 +1,15 @@
-MD5 50b35ca6adb93c84c57d49b7ac357aaf ChangeLog 9616
-MD5 a9e39803fce8598bbd5a96f845ed663b libxslt-1.0.33.ebuild 896
-MD5 fc2230cb8994e98ee4ad3c6592cdc6e4 libxslt-1.1.3.ebuild 980
-MD5 677861f1992c387ad9c4511ecda409e9 libxslt-1.1.4.ebuild 968
-MD5 68815aaab27ee507ef94a25e59d09f71 libxslt-1.1.6.ebuild 1021
-MD5 022bf9fc3916ef8cadedf2d564fd9126 libxslt-1.1.8-r1.ebuild 819
-MD5 3ab22fa6163d94e4133814a5a1d1e227 libxslt-1.1.8.ebuild 724
-MD5 e5ff749e0cbe2a75b98c0b20a99a8392 libxslt-1.1.9-r1.ebuild 1004
-MD5 bbe4e64c1a4c8a8f2a2ba70eb3ab9f6d libxslt-1.1.9.ebuild 930
+MD5 bb93e64843d471414058856b7c584fd5 libxslt-1.1.9.ebuild 908
+MD5 f03cdee0ac69a6a4e9a68038f25cd627 libxslt-1.1.4.ebuild 943
+MD5 499e743a5bf716ec82bef4b30df33ea5 libxslt-1.1.6.ebuild 1002
+MD5 07cbb1ab5ea231f5d4500f9049511618 libxslt-1.1.9-r1.ebuild 982
+MD5 e9eb1d10e58f0afcff14177708b33890 libxslt-1.1.8.ebuild 703
+MD5 ad9b4664c600d2f5042692d44da3a4ba libxslt-1.1.8-r1.ebuild 803
+MD5 75c5c83213396f8c2f6a62718db3d099 ChangeLog 9943
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 7df3a663aea20b47a3f25fa11a416505 files/digest-libxslt-1.0.33 68
-MD5 acd43c53c783addb328c53f5232cc2c3 files/digest-libxslt-1.1.3 67
+MD5 0ce8eead3660b25b1eea94f24fe2450a files/digest-libxslt-1.1.8-r1 67
+MD5 f7a67da65c2cf6f2a4979ff10bb3987c files/digest-libxslt-1.1.9-r1 67
 MD5 a56c5b8551a48fd53a0542b4562ba0e2 files/digest-libxslt-1.1.4 67
 MD5 119f25b7ef082d3e7d32396885432652 files/digest-libxslt-1.1.6 67
 MD5 0ce8eead3660b25b1eea94f24fe2450a files/digest-libxslt-1.1.8 67
-MD5 0ce8eead3660b25b1eea94f24fe2450a files/digest-libxslt-1.1.8-r1 67
 MD5 f7a67da65c2cf6f2a4979ff10bb3987c files/digest-libxslt-1.1.9 67
-MD5 f7a67da65c2cf6f2a4979ff10bb3987c files/digest-libxslt-1.1.9-r1 67
 MD5 a772cd7aafe8f9e0fd59de02b2ea2e85 files/libxslt.m4-libxslt-1.1.8.patch 1292
diff --git a/dev-libs/libxslt/files/digest-libxslt-1.0.33 b/dev-libs/libxslt/files/digest-libxslt-1.0.33
deleted file mode 100644
index bb9fde8021c2..000000000000
--- a/dev-libs/libxslt/files/digest-libxslt-1.0.33
+++ /dev/null
@@ -1 +0,0 @@
-MD5 699e52b3eb862224d5f5b84c03f08676 libxslt-1.0.33.tar.bz2 1610718
diff --git a/dev-libs/libxslt/files/digest-libxslt-1.1.3 b/dev-libs/libxslt/files/digest-libxslt-1.1.3
deleted file mode 100644
index 4c001353e3d9..000000000000
--- a/dev-libs/libxslt/files/digest-libxslt-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1eb31a7c0933f438365ce6bf99e95234 libxslt-1.1.3.tar.bz2 1717022
diff --git a/dev-libs/libxslt/libxslt-1.0.33.ebuild b/dev-libs/libxslt/libxslt-1.0.33.ebuild
deleted file mode 100644
index 3a651e23745c..000000000000
--- a/dev-libs/libxslt/libxslt-1.0.33.ebuild
+++ /dev/null
@@ -1,36 +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/libxslt/libxslt-1.0.33.ebuild,v 1.11 2004/06/24 23:26:11 agriffis Exp $
-
-inherit libtool gnome.org
-
-IUSE="python"
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="ia64 x86 ppc sparc alpha hppa amd64 mips"
-
-DEPEND=">=dev-libs/libxml2-2.5.6
-	python? ( dev-lang/python )"
-
-src_compile() {
-	elibtoolize
-
-	econf `use_with python` || 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 README NEWS TODO
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.3.ebuild b/dev-libs/libxslt/libxslt-1.1.3.ebuild
deleted file mode 100644
index 97ce31c4e6c0..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.3.ebuild
+++ /dev/null
@@ -1,41 +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/libxslt/libxslt-1.1.3.ebuild,v 1.10 2004/06/24 23:26:11 agriffis Exp $
-
-inherit libtool gnome.org
-use python && inherit python
-
-IUSE="python"
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ia64 s390"
-
-DEPEND=">=dev-libs/libxml2-2.6.5
-	python? ( dev-lang/python )"
-
-src_compile() {
-
-	elibtoolize
-
-	econf $(use_with python) || die "configure failed"
-
-	emake || die "make failed"
-
-}
-
-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 "install failed"
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS TODO
-
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.4.ebuild b/dev-libs/libxslt/libxslt-1.1.4.ebuild
index 8e9144fed9fc..1092b9f1fd2d 100644
--- a/dev-libs/libxslt/libxslt-1.1.4.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.4.ebuild,v 1.11 2004/07/04 19:15:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.4.ebuild,v 1.12 2004/11/05 03:09:29 obz Exp $
 
-inherit libtool gnome.org
-use python && inherit python
+inherit libtool gnome.org python
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
diff --git a/dev-libs/libxslt/libxslt-1.1.6.ebuild b/dev-libs/libxslt/libxslt-1.1.6.ebuild
index e90309de3384..20aa4242a89a 100644
--- a/dev-libs/libxslt/libxslt-1.1.6.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.6.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.6.ebuild,v 1.5 2004/06/24 23:26:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.6.ebuild,v 1.6 2004/11/05 03:09:29 obz Exp $
 
-inherit libtool gnome.org
-use python && inherit python
+inherit libtool gnome.org inherit python
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
diff --git a/dev-libs/libxslt/libxslt-1.1.8-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.8-r1.ebuild
index 513f385d403e..d3a396da49be 100644
--- a/dev-libs/libxslt/libxslt-1.1.8-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.8-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.8-r1.ebuild,v 1.4 2004/09/19 08:07:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.8-r1.ebuild,v 1.5 2004/11/05 03:09:29 obz Exp $
 
-inherit libtool gnome.org eutils
-use python && inherit python
+inherit libtool gnome.org eutils inherit python
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
diff --git a/dev-libs/libxslt/libxslt-1.1.8.ebuild b/dev-libs/libxslt/libxslt-1.1.8.ebuild
index d45c25b68a62..be8ddf32a528 100644
--- a/dev-libs/libxslt/libxslt-1.1.8.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.8.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.8.ebuild,v 1.4 2004/08/07 23:02:21 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.8.ebuild,v 1.5 2004/11/05 03:09:30 obz Exp $
 
-inherit libtool gnome.org
-use python && inherit python
+inherit libtool gnome.org python
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
diff --git a/dev-libs/libxslt/libxslt-1.1.9-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.9-r1.ebuild
index 98a27227f7f1..62d1705a1061 100644
--- a/dev-libs/libxslt/libxslt-1.1.9-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.9-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.9-r1.ebuild,v 1.1 2004/09/12 17:26:39 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.9-r1.ebuild,v 1.2 2004/11/05 03:09:30 obz Exp $
 
-inherit libtool gnome.org eutils
-use python && inherit python
+inherit libtool gnome.org eutils python
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
diff --git a/dev-libs/libxslt/libxslt-1.1.9.ebuild b/dev-libs/libxslt/libxslt-1.1.9.ebuild
index fe263d9569db..505032e12b93 100644
--- a/dev-libs/libxslt/libxslt-1.1.9.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.9.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.9.ebuild,v 1.1 2004/08/22 17:42:43 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.9.ebuild,v 1.2 2004/11/05 03:09:30 obz Exp $
 
-inherit libtool gnome.org eutils
-use python && inherit python
+inherit libtool gnome.org eutils python
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"