Lock wxpython dependency. Fix quoting. Remove old.

Package-Manager: portage-2.1.3.11

5 files changed, 17 insertions, 67 deletions

diff --git a/dev-util/wxglade/ChangeLog b/dev-util/wxglade/ChangeLog
index 605a26b004c6..fa55c482a62d 100644
--- a/dev-util/wxglade/ChangeLog
+++ b/dev-util/wxglade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/wxglade
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/ChangeLog,v 1.36 2007/09/24 04:14:07 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/ChangeLog,v 1.37 2007/10/03 04:17:18 dirtyepic Exp $
+
+  03 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> wxglade-0.4.1.ebuild,
+  -wxglade-0.5.ebuild:
+  Lock wxpython dependency.  Fix quoting.  Remove old.
 
   24 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> wxglade-0.6.ebuild:
   Use get_libdir everywhere.
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index 1cdd344ff8d7..d249c0191d77 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -1,22 +1,17 @@
 DIST wxGlade-0.4.1.tar.gz 521274 RMD160 e439f4a88ce0cde0da11e5950c20f1df40511129 SHA1 5955872b1d868a92733afc1f8bc328d81ba3c2e5 SHA256 213282a771d33eb9ffa14d36112058d02e478c565da606d1ec48f914675afe13
-DIST wxGlade-0.5.tar.gz 536399 RMD160 ba2243ddc1e9568aa9b5a128b7fef76721e31a3d SHA1 57f86ef72946a4fb174f8e45636d472c94c0b9fe SHA256 b5e5eec0296354e131ee4686cb010b2e67231359d3707d75ef9edc8f88c4f753
 DIST wxGlade-0.6.tar.gz 562519 RMD160 0c338ad258776a3482aff48a8be15d69cedd783c SHA1 12475c998cb0da162a94b2a6e24cfa346c20fbd6 SHA256 35dfad6f21894115811d9e7a4f08e1bcebb2fbef7c1dbb46cf22b40c472c7923
-EBUILD wxglade-0.4.1.ebuild 1074 RMD160 1856e10aa2b1679674005e8593d8622b2186c30e SHA1 f7823260ec6e35ffbf054edd91490d0762b2da2d SHA256 890b2e9d099f0e0280eaff8f0b960fd548fc42247819d71a7d9e8b6dda86a243
-MD5 02d8ca9b0c656d8e8453ab7758ad8f11 wxglade-0.4.1.ebuild 1074
-RMD160 1856e10aa2b1679674005e8593d8622b2186c30e wxglade-0.4.1.ebuild 1074
-SHA256 890b2e9d099f0e0280eaff8f0b960fd548fc42247819d71a7d9e8b6dda86a243 wxglade-0.4.1.ebuild 1074
-EBUILD wxglade-0.5.ebuild 1453 RMD160 1f11cbe3c946013a51cb4c419d9ef183aac67156 SHA1 da5b16d43a89a57214445919c0f1bea799c29a46 SHA256 568473afff14ebec8305427554ec99012658b6dddb42b51375ae147a0812e383
-MD5 734ad51501b7242e1f808053a896ac16 wxglade-0.5.ebuild 1453
-RMD160 1f11cbe3c946013a51cb4c419d9ef183aac67156 wxglade-0.5.ebuild 1453
-SHA256 568473afff14ebec8305427554ec99012658b6dddb42b51375ae147a0812e383 wxglade-0.5.ebuild 1453
+EBUILD wxglade-0.4.1.ebuild 1083 RMD160 0de8dea5ef948a582e168df70db54da993e02b8a SHA1 2ddd89e8906e31c691d0609ff8b7894f565c87f2 SHA256 645e964d900037c6378f7161e4fe9f13f20daa7d28e6b1db0e2db70b30f59310
+MD5 f55604bc0f848ac513105c1697ae7f19 wxglade-0.4.1.ebuild 1083
+RMD160 0de8dea5ef948a582e168df70db54da993e02b8a wxglade-0.4.1.ebuild 1083
+SHA256 645e964d900037c6378f7161e4fe9f13f20daa7d28e6b1db0e2db70b30f59310 wxglade-0.4.1.ebuild 1083
 EBUILD wxglade-0.6.ebuild 1516 RMD160 0c00a9bbe02d645d6a7a82ab14031cb9dc9bc409 SHA1 ff3e510b941f92eea5228160a7fc43af4be80118 SHA256 334cee552317c9e4a22f450c0fdc8237cfc42aadd537f3281a2496dddb297b65
 MD5 dc27d4061d43b92a33e70d1127c58fb1 wxglade-0.6.ebuild 1516
 RMD160 0c00a9bbe02d645d6a7a82ab14031cb9dc9bc409 wxglade-0.6.ebuild 1516
 SHA256 334cee552317c9e4a22f450c0fdc8237cfc42aadd537f3281a2496dddb297b65 wxglade-0.6.ebuild 1516
-MISC ChangeLog 4830 RMD160 1e03073dcfcb66dd2638f48b536a01166c8f408f SHA1 4ea48437af253eb4fcdb8806055a29b821b8b7a8 SHA256 e21a0358bc742a3857ef679e8b467f842d2505bd7136f5184dbff7f1c3b3a930
-MD5 f8ebb261a4cfa34eec62e0c9bd1a8c55 ChangeLog 4830
-RMD160 1e03073dcfcb66dd2638f48b536a01166c8f408f ChangeLog 4830
-SHA256 e21a0358bc742a3857ef679e8b467f842d2505bd7136f5184dbff7f1c3b3a930 ChangeLog 4830
+MISC ChangeLog 4979 RMD160 5aa7a738d231c2b2476fa41ec02a893bc409a86f SHA1 92d02e4dee7e3d04eff900f578c9f8ba0d57c2cb SHA256 1c94318a59fdd503f74b43257edbe80ee416ed3c68f2c8544a105fd38eb2826a
+MD5 22d14f9bf80caa14494a083d207711ed ChangeLog 4979
+RMD160 5aa7a738d231c2b2476fa41ec02a893bc409a86f ChangeLog 4979
+SHA256 1c94318a59fdd503f74b43257edbe80ee416ed3c68f2c8544a105fd38eb2826a ChangeLog 4979
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -24,9 +19,6 @@ SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e metadata
 MD5 5d30373e9423789a2ff56bf0cbc4d8f2 files/digest-wxglade-0.4.1 241
 RMD160 fa24123b9b25ec507386bd92ccb5ad45797d76df files/digest-wxglade-0.4.1 241
 SHA256 01998b51bc254a565a6f1528ab83e09d61c6b64143ccd2d39cb880487f3c27f2 files/digest-wxglade-0.4.1 241
-MD5 996dbd30cb3945106bb2dd96c6aba33f files/digest-wxglade-0.5 235
-RMD160 a63845346f6b9cdce8297b013f3d66632ab2abe9 files/digest-wxglade-0.5 235
-SHA256 7d6d1ea3a95c49e4389577bf38df3d6bd22419711e16f6362f8f5adb8619de16 files/digest-wxglade-0.5 235
 MD5 13935ae3bb3979bde7f6575e61db5651 files/digest-wxglade-0.6 235
 RMD160 fcaa022eacdc0a7848d9d70adc29641d007a04a1 files/digest-wxglade-0.6 235
 SHA256 a879b4d3fcdbb9723ac3451434b7e9f8894d8ae267d0a2346858f10d2885f2fb files/digest-wxglade-0.6 235
diff --git a/dev-util/wxglade/files/digest-wxglade-0.5 b/dev-util/wxglade/files/digest-wxglade-0.5
deleted file mode 100644
index 1321915ee043..000000000000
--- a/dev-util/wxglade/files/digest-wxglade-0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 705855ef251053bd6b032bc5667cea19 wxGlade-0.5.tar.gz 536399
-RMD160 ba2243ddc1e9568aa9b5a128b7fef76721e31a3d wxGlade-0.5.tar.gz 536399
-SHA256 b5e5eec0296354e131ee4686cb010b2e67231359d3707d75ef9edc8f88c4f753 wxGlade-0.5.tar.gz 536399
diff --git a/dev-util/wxglade/wxglade-0.4.1.ebuild b/dev-util/wxglade/wxglade-0.4.1.ebuild
index e4682a6d1dfc..0b7fa977e7ec 100644
--- a/dev-util/wxglade/wxglade-0.4.1.ebuild
+++ b/dev-util/wxglade/wxglade-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.4.1.ebuild,v 1.5 2007/05/19 18:35:17 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.4.1.ebuild,v 1.6 2007/10/03 04:17:18 dirtyepic Exp $
 
 inherit python
 
@@ -14,16 +14,16 @@ KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 S="${WORKDIR}/${MY_P}"
 DEPEND=">=dev-lang/python-2.2
-	>=dev-python/wxpython-2.6"
+	=dev-python/wxpython-2.6*"
 
 src_install() {
 	python_version
 	dodir /usr/lib/python${PYVER}/site-packages/${PN}
 	dodoc *txt
-	cp credits.txt ${D}/usr/lib/python${PYVER}/site-packages/${PN}/
+	cp credits.txt "${D}"/usr/lib/python${PYVER}/site-packages/${PN}/
 	dohtml -r docs/*
 	rm -rf docs *txt
-	cp -R * ${D}/usr/lib/python${PYVER}/site-packages/${PN}/
+	cp -R * "${D}"/usr/lib/python${PYVER}/site-packages/${PN}/
 	dosym /usr/share/doc/${PF}/html /usr/lib/python${PYVER}/site-packages/${PN}/docs
 	echo "#!/bin/bash" > wxglade
 	echo "exec python /usr/lib/python${PYVER}/site-packages/${PN}/wxglade.py \$*" >> wxglade
diff --git a/dev-util/wxglade/wxglade-0.5.ebuild b/dev-util/wxglade/wxglade-0.5.ebuild
deleted file mode 100644
index 7b3b5105adc8..000000000000
--- a/dev-util/wxglade/wxglade-0.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.5.ebuild,v 1.1 2007/05/13 21:35:35 leio Exp $
-
-inherit python multilib eutils
-
-MY_P="wxGlade-${PV}"
-DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
-HOMEPAGE="http://wxglade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxglade/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-S="${WORKDIR}/${MY_P}"
-DEPEND=">=dev-lang/python-2.3
-	>=dev-python/wxpython-2.6"
-
-src_install() {
-	python_version
-	dodir /usr/lib/python${PYVER}/site-packages/${PN}
-	dodoc CHANGES.txt README.txt TODO.txt credits.txt
-	cp credits.txt ${D}/usr/lib/python${PYVER}/site-packages/${PN}/
-	dohtml -r docs/*
-	rm -rf docs *txt
-	cp -R * ${D}/usr/lib/python${PYVER}/site-packages/${PN}/
-	dosym /usr/share/doc/${PF}/html /usr/lib/python${PYVER}/site-packages/${PN}/docs
-	echo "#!/bin/bash" > wxglade
-	echo "exec python /usr/lib/python${PYVER}/site-packages/${PN}/wxglade.py \$*" >> wxglade
-	exeinto /usr/bin
-	doexe wxglade
-	insinto /usr/share/pixmaps
-	newins icons/icon.xpm wxglade.xpm
-	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
-
-pkg_postinst() {
-	python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/wxglade
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${ROOT}usr/$(get_libdir)/python*/site-packages/wxglade
-}