Clean up unnecessary versions.

Package-Manager: portage-2.1.1_rc1-r2

6 files changed, 12 insertions, 198 deletions

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index a189d4e1af6f..37e20b9d322c 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -29,18 +29,14 @@ AUX wxGTK-2.4.2-pango_fix.patch 618 RMD160 699a6fde11b4feb65940b85e0afe881c93f55
 MD5 568639b28866f0c708c091d2e28f982e files/wxGTK-2.4.2-pango_fix.patch 618
 RMD160 699a6fde11b4feb65940b85e0afe881c93f55649 files/wxGTK-2.4.2-pango_fix.patch 618
 SHA256 a9f252b80d62f0e65c8ba6ce27eceb70076006ea344e9f2989d12a88e0ec4d03 files/wxGTK-2.4.2-pango_fix.patch 618
-AUX wxGTK-2.6.1-windowcpp.diff 568 RMD160 95913d69189a1778a4609f6acd50b121b446a6bb SHA1 5262165fd683e98f44b15e0d5139cc204225986a SHA256 1ceac511bcf39f208b7dbb7f2da347cf25d751289e526baf31d03e28db3b2609
-MD5 c3c62ee98a766258cba534c13104010a files/wxGTK-2.6.1-windowcpp.diff 568
-RMD160 95913d69189a1778a4609f6acd50b121b446a6bb files/wxGTK-2.6.1-windowcpp.diff 568
-SHA256 1ceac511bcf39f208b7dbb7f2da347cf25d751289e526baf31d03e28db3b2609 files/wxGTK-2.6.1-windowcpp.diff 568
 AUX wxWidgets-2.6.2-gcc41.patch 559 RMD160 b8118789927ca6de5df4b05318b039edc49908e7 SHA1 f5e31a94069a30a4844a85f07801f40dd51c9102 SHA256 2427a07fa30b7bbe12fde4c76d2735cec3592b4b690ac86697355ae3a71fbd91
 MD5 a7173de92807f66492cda98731156932 files/wxWidgets-2.6.2-gcc41.patch 559
 RMD160 b8118789927ca6de5df4b05318b039edc49908e7 files/wxWidgets-2.6.2-gcc41.patch 559
 SHA256 2427a07fa30b7bbe12fde4c76d2735cec3592b4b690ac86697355ae3a71fbd91 files/wxWidgets-2.6.2-gcc41.patch 559
 DIST wxGTK-2.4.2.tar.bz2 5381935
 DIST wxPython-src-2.6.3.2.tar.gz 18946956 RMD160 4fabaefa4c066d1cccc5301bdd31cda16a55647b SHA1 2f845459e089c615e15ac165b5135b688b9d62cf SHA256 21558bf3f306bb935b53e0ca42664ca325ec3cc4d9452b79bb5d9ff4b68aadb6
-DIST wxWidgets-2.6.1-HTML.tar.gz 1437702
-DIST wxWidgets-2.6.1.tar.bz2 12649487
+DIST wxWidgets-2.6.1-HTML.tar.gz 1437702 RMD160 b89efc1a99a903a71e21a6f3a888197a91916300 SHA1 d43a35db16472b0040fb8ebe81ece05009aa36d3 SHA256 763689c62e72bc04b46504ed893fe768dfb9ef03b2fa50b14c93d59261f41ad0
+DIST wxWidgets-2.6.1.tar.bz2 12649487 RMD160 20c009754f70cd3e983aba795306838fa622eec7 SHA1 98811470cd31de9a477c1f5e943809bfc5dbd41d SHA256 2c745de137dbe1ad48c0ad5fe68334670f1e9baf89d59c1ed9bf178f8d75a656
 DIST wxWidgets-2.6.2-HTML.tar.gz 1440455 RMD160 6ad8767efcc2d0881ce202e333d9f0f5b393866a SHA1 8f9e34d31dcb8bcd095160b65262822993de4ce7 SHA256 eeb47240ccc56a8eb14d09153e1cfaa9ad9c3f71ea67b21ac62790e59c405312
 DIST wxWidgets-2.6.2.tar.bz2 13060077 RMD160 bcbf4adbc5dab79643eeb036f94b18e24ee76217 SHA1 e77217138fa3da91c1cfd058ae6c3173def226dc SHA256 e6edc7fbf3523290d6f08767a00979785205227e7bf634eeeb6393e65bb4abd6
 DIST wxWidgets-2.6.3-HTML.tar.gz 1349870 RMD160 3be20dce033c3e14999783a959fe0804fcab3d91 SHA1 915f21d4cd2bb53403317f5b9514972111b72bdf SHA256 d564729b6e862c751dcea2487137832f9fbf95a665481c50d029fba9d4dd9cc1
@@ -48,10 +44,6 @@ EBUILD wxGTK-2.4.2-r4.ebuild 4902 RMD160 a5787e4234520dd148cf95881251f2ac8caa049
 MD5 14ad0437575fd9d0fc4a083764b96938 wxGTK-2.4.2-r4.ebuild 4902
 RMD160 a5787e4234520dd148cf95881251f2ac8caa049d wxGTK-2.4.2-r4.ebuild 4902
 SHA256 49fd46fbe1cbe79a656455692a8ad3025d30831cd4d53ab4d2ad273cd0910531 wxGTK-2.4.2-r4.ebuild 4902
-EBUILD wxGTK-2.6.1-r1.ebuild 2038 RMD160 eeb0e518e60264b44eb930aa092178984231a238 SHA1 9cd6c52c2d3911a660ad3aa66bddfe7b0ec13d63 SHA256 1996c846d9cbc70cd2206f5bfd30828441949cff8cb250c10af407ba624a98e5
-MD5 9ed1e947b2a927c1758e7bdfd68a6fe4 wxGTK-2.6.1-r1.ebuild 2038
-RMD160 eeb0e518e60264b44eb930aa092178984231a238 wxGTK-2.6.1-r1.ebuild 2038
-SHA256 1996c846d9cbc70cd2206f5bfd30828441949cff8cb250c10af407ba624a98e5 wxGTK-2.6.1-r1.ebuild 2038
 EBUILD wxGTK-2.6.1.ebuild 1922 RMD160 e2f3f5f13d3be95b7db3442f5b81bfd39048c2bb SHA1 efb3158959bff99f142d4345445017b3f56ed914 SHA256 6b3e456121ed88b0a934657361b9dbe25add4c35cb0d5f1297b2c6a0a7f67d5d
 MD5 56de842cb982e2aeb27abbfe3cb3d2ff wxGTK-2.6.1.ebuild 1922
 RMD160 e2f3f5f13d3be95b7db3442f5b81bfd39048c2bb wxGTK-2.6.1.ebuild 1922
@@ -60,18 +52,14 @@ EBUILD wxGTK-2.6.2-r1.ebuild 1582 RMD160 f92f1cb58bb9f4b072ce8efa7d43ef2e3fe9477
 MD5 2480dd44996d4d9544d0812b45dfa477 wxGTK-2.6.2-r1.ebuild 1582
 RMD160 f92f1cb58bb9f4b072ce8efa7d43ef2e3fe94771 wxGTK-2.6.2-r1.ebuild 1582
 SHA256 c33d8712e4ef1672a9ff0da28808b23e08a8288512ff33049b64d01dafbdf3c8 wxGTK-2.6.2-r1.ebuild 1582
-EBUILD wxGTK-2.6.2.ebuild 1531 RMD160 0caf5f3409224a0542e2386411ddfe6819765cb8 SHA1 b77e1ab736f51b18f11405206a32ac595024640a SHA256 c3f69c6446d36b8b1880141adac5b3f8d49365308a378a5f5fdad824e1e22ffb
-MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531
-RMD160 0caf5f3409224a0542e2386411ddfe6819765cb8 wxGTK-2.6.2.ebuild 1531
-SHA256 c3f69c6446d36b8b1880141adac5b3f8d49365308a378a5f5fdad824e1e22ffb wxGTK-2.6.2.ebuild 1531
 EBUILD wxGTK-2.6.3.2.ebuild 1902 RMD160 61593a29b0f9ba0fe817e6dedda47bc7a2c176ad SHA1 7be157fa3528a27376ed11f41ede7aeb5e1ea004 SHA256 18f7dd23f2a42e8a3cc66912b9ccfbe49b9c8af011520f83f4e79a7e0eb705ab
 MD5 72d952a769f6294346d3e71dc82f54d6 wxGTK-2.6.3.2.ebuild 1902
 RMD160 61593a29b0f9ba0fe817e6dedda47bc7a2c176ad wxGTK-2.6.3.2.ebuild 1902
 SHA256 18f7dd23f2a42e8a3cc66912b9ccfbe49b9c8af011520f83f4e79a7e0eb705ab wxGTK-2.6.3.2.ebuild 1902
-MISC ChangeLog 19004 RMD160 287ec2eb937ecff900fce7a03704d354cc45b809 SHA1 e3c5a4a15db217d4c4d365103cef08f1254dad86 SHA256 a356f0a46b53548a1286f890b5d46e4130637419d3003e44d6ad48679b5ca36e
-MD5 69adc90cb27214291b76ded1f8b96020 ChangeLog 19004
-RMD160 287ec2eb937ecff900fce7a03704d354cc45b809 ChangeLog 19004
-SHA256 a356f0a46b53548a1286f890b5d46e4130637419d3003e44d6ad48679b5ca36e ChangeLog 19004
+MISC ChangeLog 19169 RMD160 ee2a3450a81c700342083c9d86170b569ba77fae SHA1 21d269fb1f2932eea9e9475eead0501e04d151fa SHA256 2c4659b12b6474d3bc1aed5c2a22277952176cc4749b7f40a898f98df6440eb5
+MD5 ace722a96625ddfcf35090d348c20b8a ChangeLog 19169
+RMD160 ee2a3450a81c700342083c9d86170b569ba77fae ChangeLog 19169
+SHA256 2c4659b12b6474d3bc1aed5c2a22277952176cc4749b7f40a898f98df6440eb5 ChangeLog 19169
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -79,15 +67,9 @@ SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e metadata
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r4 65
 RMD160 51232262c3e1ba5b29c3772d2ee61639c2c4cfb0 files/digest-wxGTK-2.4.2-r4 65
 SHA256 562f9f2432a97bab9206c13ef4cfa04eccdfe82413d5854163a4d63a1e9893d9 files/digest-wxGTK-2.4.2-r4 65
-MD5 06af19e58230a2522d69be12f667feeb files/digest-wxGTK-2.6.1 143
-RMD160 f477ef616ec3f91238c6767ca509919aa42cf0b2 files/digest-wxGTK-2.6.1 143
-SHA256 9b9edf74677239d7ae2161b49484d2e4b32d19e81a4e6cdf4dd9625550bf5e7f files/digest-wxGTK-2.6.1 143
-MD5 06af19e58230a2522d69be12f667feeb files/digest-wxGTK-2.6.1-r1 143
-RMD160 f477ef616ec3f91238c6767ca509919aa42cf0b2 files/digest-wxGTK-2.6.1-r1 143
-SHA256 9b9edf74677239d7ae2161b49484d2e4b32d19e81a4e6cdf4dd9625550bf5e7f files/digest-wxGTK-2.6.1-r1 143
-MD5 46c640a73873e599780242d2c29cdefc files/digest-wxGTK-2.6.2 521
-RMD160 2b1487dd8ecd6c4e0789861a4bef9c35f75a1b90 files/digest-wxGTK-2.6.2 521
-SHA256 5b793e6ce19b46528f537fd7e5ec07761b282ae7b4200dc04272315a9b8c709b files/digest-wxGTK-2.6.2 521
+MD5 c70c30bfdead159a083f98430d018d51 files/digest-wxGTK-2.6.1 521
+RMD160 ca132bf59fc3314f7e56672baf40444476418ca5 files/digest-wxGTK-2.6.1 521
+SHA256 46ce4d9bb2f4e536d546e24a019f88a777d391112571bbee9db2536a18a5c9c3 files/digest-wxGTK-2.6.1 521
 MD5 46c640a73873e599780242d2c29cdefc files/digest-wxGTK-2.6.2-r1 521
 RMD160 2b1487dd8ecd6c4e0789861a4bef9c35f75a1b90 files/digest-wxGTK-2.6.2-r1 521
 SHA256 5b793e6ce19b46528f537fd7e5ec07761b282ae7b4200dc04272315a9b8c709b files/digest-wxGTK-2.6.2-r1 521
@@ -97,7 +79,7 @@ SHA256 8a14da7ff59997861984f4f8b49a96812386d9ab89f1bedafe8eeeed22e113d1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE1KbHkeYb6olFHJcRApkPAKCvM+ryJGBhqRf+Zbot5VwyviYtkACeO5pQ
-7+aQN7D4GTiFhNRPBYgXvCc=
-=aDwI
+iD8DBQFE/BCWkeYb6olFHJcRAlanAKCi22JWPkpXTRT7XWZ7T7ChYTNp0gCg3yUZ
+2xQuqRhwIUHRoawr4yJ8hts=
+=DiMR
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.1-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.1-r1
deleted file mode 100644
index d6db8b2302c3..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e05d64b92ba352cad4417b75082bc2be wxWidgets-2.6.1-HTML.tar.gz 1437702
-MD5 045f0edad0988620a4aa36096bb16e28 wxWidgets-2.6.1.tar.bz2 12649487
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2
deleted file mode 100644
index 6d8c96036644..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1e2bbd9d858c426ae667b017d8bdd4f6 wxWidgets-2.6.2-HTML.tar.gz 1440455
-RMD160 6ad8767efcc2d0881ce202e333d9f0f5b393866a wxWidgets-2.6.2-HTML.tar.gz 1440455
-SHA256 eeb47240ccc56a8eb14d09153e1cfaa9ad9c3f71ea67b21ac62790e59c405312 wxWidgets-2.6.2-HTML.tar.gz 1440455
-MD5 ee0aa211febd992c8540e6c9df749b51 wxWidgets-2.6.2.tar.bz2 13060077
-RMD160 bcbf4adbc5dab79643eeb036f94b18e24ee76217 wxWidgets-2.6.2.tar.bz2 13060077
-SHA256 e6edc7fbf3523290d6f08767a00979785205227e7bf634eeeb6393e65bb4abd6 wxWidgets-2.6.2.tar.bz2 13060077
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.1-windowcpp.diff b/x11-libs/wxGTK/files/wxGTK-2.6.1-windowcpp.diff
deleted file mode 100644
index e3c14d613041..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.1-windowcpp.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- wxWidgets-2.6.1.orig/src/gtk/window.cpp	2006-01-26 17:29:21.000000000 -0200
-+++ wxWidgets-2.6.1/src/gtk/window.cpp	2006-01-26 17:30:21.000000000 -0200
-@@ -4279,12 +4279,10 @@
-     return gtk_widget_get_pango_context( m_widget );
- }
- 
-+// MR: Returns the same as GtkGetPangoDefaultContext until the symbol can be removed in 2.7.x
- PangoContext *wxWindowGTK::GtkGetPangoX11Context()
- {
--    if (!m_x11Context)
--        m_x11Context = pango_x_get_context( gdk_display );
--
--    return m_x11Context;
-+    return gtk_widget_get_pango_context( m_widget );
- }
- #endif
-  
diff --git a/x11-libs/wxGTK/wxGTK-2.6.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.1-r1.ebuild
deleted file mode 100644
index 0b8915c29448..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.1-r1.ebuild,v 1.6 2006/01/28 19:15:43 corsair Exp $
-
-inherit wxlib gnuconfig
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and
-wxbase non-gui library"
-
-SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="gnome gtk2 joystick odbc opengl sdl wxgtk1"
-RDEPEND="${RDEPEND}
-	opengl? ( virtual/opengl )
-	gtk2? ( >=x11-libs/gtk+-2.0
-		>=dev-libs/glib-2.0 )
-	wxgtk1? ( =x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2* )
-	wxgtk1? ( gtk2? ( media-libs/libpng
-		media-libs/jpeg
-		media-libs/tiff ) )
-	odbc? ( dev-db/unixODBC )
-	!mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )"
-
-DEPEND="${RDEPEND}
-	${DEPEND}
-	gtk2? ( dev-util/pkgconfig )"
-S="${WORKDIR}/wxWidgets-${PV}"
-
-pkg_setup() {
-	einfo "To install only wxbase (non-gui libs) use -gtk2 -wxgtk1"
-	if use unicode; then
-		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# bug 105189 - upstream in 2.6.2
-	epatch "${FILESDIR}"/${P}-windowcpp.diff
-}
-
-src_compile() {
-	gnuconfig_update
-	if use wxgtk1 || use gtk2; then
-		myconf="${myconf}
-			--with-png
-			--with-jpeg
-			--with-tiff
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)
-			$(use_with sdl)
-			$(use_enable joystick)"
-	fi
-
-	use wxgtk1 && \
-		configure_build gtk1 "" "${myconf} --with-gtk=1"
-
-	use gtk2 && \
-		configure_build gtk2 unicode "${myconf} --with-gtk=2"
-
-	! use gtk2 && ! use wxgtk1 && \
-		configure_build base unicode "--disable-gui"
-}
-
-src_install() {
-	use wxgtk1 && install_build gtk1
-	use gtk2 && install_build gtk2
-	! use gtk2 && ! use wxgtk1 && install_build base
-
-	wxlib_src_install
-}
-
-pkg_postinst() {
-	einfo "dev-libs/wxbase has been removed from portage and can be"
-	einfo "installed with wxGTK by specifying the USE flags"
-	einfo "-gtk2 and -wxgtk1"
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.6.2.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2.ebuild
deleted file mode 100644
index 83d02a758ff2..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2.ebuild,v 1.3 2005/11/26 17:32:08 sekretarz Exp $
-
-inherit wxlib gnuconfig
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and
-wxbase non-gui library"
-
-SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gnome joystick odbc opengl sdl X"
-RDEPEND="${RDEPEND}
-	opengl? ( virtual/opengl )
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	media-libs/tiff
-	odbc? ( dev-db/unixODBC )
-	!mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )"
-
-DEPEND="${RDEPEND}
-	${DEPEND}
-	dev-util/pkgconfig"
-S=${WORKDIR}/wxWidgets-${PV}
-
-pkg_setup() {
-	einfo "To install only wxbase (non-gui libs) use USE=-X"
-}
-
-src_unpack() {
-		unpack ${A}
-		cd ${S}
-
-		epatch ${FILESDIR}/intl.cpp.diff
-}
-
-src_compile() {
-	gnuconfig_update
-	myconf="${myconf}
-		--with-png
-		--with-jpeg
-		--with-tiff
-		$(use_enable opengl)
-		$(use_with opengl)
-		$(use_with gnome gnomeprint)
-		$(use_with sdl)
-		$(use_enable joystick)"
-
-	use X && configure_build gtk2 unicode "${myconf} --with-gtk=2"
-	use X || configure_build base unicode "--disable-gui"
-}
-
-src_install() {
-	use X && install_build gtk2
-	use X || install_build base
-
-	wxlib_src_install
-}
-
-pkg_postinst() {
-	einfo "dev-libs/wxbase has been removed from portage and can be"
-	einfo "installed with wxGTK by specifying the USE flags"
-	einfo "-X"
-}