unpeg adns-python depends and cleanup

7 files changed, 11 insertions, 104 deletions

diff --git a/net-www/straw/ChangeLog b/net-www/straw/ChangeLog
index 6c35bbf6d1f4..4d7ac9a1e03d 100644
--- a/net-www/straw/ChangeLog
+++ b/net-www/straw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/straw
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/ChangeLog,v 1.17 2003/11/27 14:06:38 liquidx Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/straw/ChangeLog,v 1.18 2004/02/14 12:43:35 liquidx Exp $
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> straw-0.19.1.ebuild,
+  straw-0.21.1.ebuild, straw-0.21.2.ebuild:
+  unpeg adns-python depends
 
   27 Nov 2003; Alastair Tse <liquidx@gentoo.org> straw-0.21.2.ebuild:
   added fix for first time conversion from <0.21.x
diff --git a/net-www/straw/Manifest b/net-www/straw/Manifest
index 5a69e32959e9..634277f5dbc3 100644
--- a/net-www/straw/Manifest
+++ b/net-www/straw/Manifest
@@ -1,11 +1,7 @@
-MD5 4447a050b64f7ff557168ebe617adedd ChangeLog 2249
+MD5 5d9705ab75c4b4cf69368cfb8b0d38f8 ChangeLog 2392
 MD5 f7653644adcb8aac56753e12ab304f51 metadata.xml 235
-MD5 ef382a30e7fb91a5d9a762384916bcdd straw-0.19.1.ebuild 1028
 MD5 a13e1fc2994a2c3a10caed8379031e35 straw-0.19.2.ebuild 1380
-MD5 fc4a7f2349d527854fd6f3853fe659fe straw-0.21.1.ebuild 1359
-MD5 f71c4fc8c84a8abd8e6962c55d2fc627 straw-0.21.2.ebuild 2157
-MD5 be19a4f8ca22508621e2712473605449 files/digest-straw-0.19.1 64
+MD5 7899952579b472344a9432c274d7bacc straw-0.21.2.ebuild 2158
 MD5 4de4ce496f2607dd3a9b38d2f30a856e files/digest-straw-0.19.2 64
-MD5 1d6b864e5be04d7349ca14f558f74613 files/digest-straw-0.21.1 65
 MD5 02c585d463b5069559098bf5946589d7 files/digest-straw-0.21.2 65
 MD5 cf7bbdcb4ed714aba68c16b229b9fc8c files/straw-0.21.2-convert_config.patch 407
diff --git a/net-www/straw/files/digest-straw-0.19.1 b/net-www/straw/files/digest-straw-0.19.1
deleted file mode 100644
index cbeb602e6c49..000000000000
--- a/net-www/straw/files/digest-straw-0.19.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f616b6c2d684f8508f896fd9f9c7e1a straw-0.19.1.tar.bz2 99134
diff --git a/net-www/straw/files/digest-straw-0.21.1 b/net-www/straw/files/digest-straw-0.21.1
deleted file mode 100644
index 0f88835b1003..000000000000
--- a/net-www/straw/files/digest-straw-0.21.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 504c2614d0a09ae8d484ad1568881b32 straw-0.21.1.tar.bz2 108009
diff --git a/net-www/straw/straw-0.19.1.ebuild b/net-www/straw/straw-0.19.1.ebuild
deleted file mode 100644
index 7c10997a099a..000000000000
--- a/net-www/straw/straw-0.19.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.19.1.ebuild,v 1.4 2003/09/06 02:05:10 msterret Exp $
-
-DESCRIPTION="rss news aggregator"
-HOMEPAGE="http://www.nongnu.org/straw/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-DEPEND="virtual/python
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.1
-	>=dev-python/gnome-python-1.99.13
-	>=dev-python/pygtk-1.99.13-r1
-	>=dev-python/bsddb3-3.4.0
-	>=dev-python/pyxml-0.8.1
-	>=dev-python/egenix-mx-base-2
-	=dev-python/adns-python-1.0.0"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:-d \$(BINDIR) \$(LIBDIR) \$(DATADIR):-d \$(BINDIR) \$(LIBDIR) \$(DATADIR) \$(APPLICATIONSDIR) \$(ICONDIR):" Makefile.orig > Makefile || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake PREFIX=${D}/usr install || die
-
-	dodoc NEWS README TODO
-}
diff --git a/net-www/straw/straw-0.21.1.ebuild b/net-www/straw/straw-0.21.1.ebuild
deleted file mode 100644
index 232631c87682..000000000000
--- a/net-www/straw/straw-0.21.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.21.1.ebuild,v 1.1 2003/11/15 18:02:16 foser Exp $
-
-inherit python distutils
-
-DESCRIPTION="RSS/RDF News Aggregator"
-HOMEPAGE="http://www.nongnu.org/straw/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-RDEPEND=">=dev-lang/python-2.2.3-r3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.1
-	>=dev-python/gnome-python-1.99.13
-	>=dev-python/pygtk-1.99.13-r1
-	>=dev-python/bsddb3-3.4.0
-	>=dev-python/egenix-mx-base-2
-	=dev-python/adns-python-1.0.0"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	python_version
-	sed -e "s:-d \$(BINDIR) \$(LIBDIR) \$(DATADIR):-d \$(BINDIR) \$(LIBDIR) \$(DATADIR) \$(APPLICATIONSDIR) \$(ICONDIR):" \
-		-e "s:^\(PYTHON.*\)python2.2:\1python${PYVER}:" \
-		-e "s:^\(LIBDIR.*\)python2.2\(.*\):\1python${PYVER}\2:" \
-		-e "s:py\[co\]:py:" \
-		-i ${S}/Makefile || die "sed failed"
-	sed -e "s:/usr/bin/env python2.2:/usr/bin/env python${PYVER}:" \
-		-i ${S}/src/straw
-}
-
-src_compile() {
-
-	export LC_ALL="C"
-	emake || die
-
-}
-
-src_install() {
-
-	make PREFIX=${D}/usr install || die "install failed"
-	dodoc NEWS README TODO
-
-}
-
diff --git a/net-www/straw/straw-0.21.2.ebuild b/net-www/straw/straw-0.21.2.ebuild
index c6705ddc1b81..cff9e782cbf7 100644
--- a/net-www/straw/straw-0.21.2.ebuild
+++ b/net-www/straw/straw-0.21.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.21.2.ebuild,v 1.2 2003/11/27 14:06:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.21.2.ebuild,v 1.3 2004/02/14 12:43:35 liquidx Exp $
 
 inherit gnome2 python distutils
 
@@ -18,7 +18,7 @@ RDEPEND=">=dev-lang/python-2.2.3-r3
 	>=dev-python/pygtk-1.99.13-r1
 	>=dev-python/bsddb3-3.4.0
 	>=dev-python/egenix-mx-base-2
-	=dev-python/adns-python-1.0.0"
+	>=dev-python/adns-python-1.0.0"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"