Remove redundant version

Package-Manager: portage-2.1.2_rc4-r3

3 files changed, 4 insertions, 92 deletions

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 7ba7e84b08b9..c6953b993582 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -48,8 +48,6 @@ RMD160 b8118789927ca6de5df4b05318b039edc49908e7 files/wxWidgets-2.6.2-gcc41.patc
 SHA256 2427a07fa30b7bbe12fde4c76d2735cec3592b4b690ac86697355ae3a71fbd91 files/wxWidgets-2.6.2-gcc41.patch 559
 DIST wxGTK-2.4.2.tar.bz2 5381935 RMD160 8076d1ba31c9b23becb241cbad5a83763fee776e SHA1 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c SHA256 2b057cbd6f5573d2bac2c8af180fcd9f56ad4e27bba44abdd2cb0a6904c725b1
 DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60f3692eb783 SHA1 e55a3a8cfbd1aff394be15297ae205a8c597bed8 SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
-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
@@ -57,10 +55,6 @@ EBUILD wxGTK-2.4.2-r4.ebuild 5046 RMD160 41848e0fda7f78341b5d61241f8088e4b6c3de0
 MD5 4d588e60a52add2763e94246b5b7dfac wxGTK-2.4.2-r4.ebuild 5046
 RMD160 41848e0fda7f78341b5d61241f8088e4b6c3de06 wxGTK-2.4.2-r4.ebuild 5046
 SHA256 61d274f9178bee382622c14f30fc78b30ae215fa87e96faeae9a64be09683e15 wxGTK-2.4.2-r4.ebuild 5046
-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
-SHA256 6b3e456121ed88b0a934657361b9dbe25add4c35cb0d5f1297b2c6a0a7f67d5d wxGTK-2.6.1.ebuild 1922
 EBUILD wxGTK-2.6.2-r1.ebuild 1580 RMD160 5d6629a297426850a580b90316279766cc41f4e4 SHA1 899ab26b5efbbaebe4bf386ed3b83cdd4fb1667a SHA256 211483bf929838bbcf66dde32824f917b05d1eb14096908de0d4843ea962d5f9
 MD5 e6f33cf7afda36b1bbc3b0df873ab369 wxGTK-2.6.2-r1.ebuild 1580
 RMD160 5d6629a297426850a580b90316279766cc41f4e4 wxGTK-2.6.2-r1.ebuild 1580
@@ -69,10 +63,10 @@ EBUILD wxGTK-2.6.3.3.ebuild 5125 RMD160 e18fd0fbdf672b55a31ac47575fbc24d751c10d8
 MD5 f124227e9944f854167c185fbf464d62 wxGTK-2.6.3.3.ebuild 5125
 RMD160 e18fd0fbdf672b55a31ac47575fbc24d751c10d8 wxGTK-2.6.3.3.ebuild 5125
 SHA256 b24ecf7d4ddec8d70277d4500744a42d6a3aeff1b488f1f21fe4b411c0e67092 wxGTK-2.6.3.3.ebuild 5125
-MISC ChangeLog 20305 RMD160 68670f620546fe317205e9725e8ad4e7657eaef0 SHA1 4bdccf3e6e822010bc8e6162d497186318e3a500 SHA256 0c1f71351dab6de7ce4463122d15b6f417e706bbc5c7beded5ade5f8696712dc
-MD5 b9ec2c8ea906e69467a882d3c15bbbcf ChangeLog 20305
-RMD160 68670f620546fe317205e9725e8ad4e7657eaef0 ChangeLog 20305
-SHA256 0c1f71351dab6de7ce4463122d15b6f417e706bbc5c7beded5ade5f8696712dc ChangeLog 20305
+MISC ChangeLog 20382 RMD160 6db03ff7bd285d35f234895a46d36c6d02782553 SHA1 0033fcc96d959f85225656a5cc4015de02dd4c62 SHA256 c172371a5684f4f47691ea8473deb09353cc60c0f3fa3e551aeca2fbe23958e6
+MD5 acf56e9c262bd5649cb5206a71b3c816 ChangeLog 20382
+RMD160 6db03ff7bd285d35f234895a46d36c6d02782553 ChangeLog 20382
+SHA256 c172371a5684f4f47691ea8473deb09353cc60c0f3fa3e551aeca2fbe23958e6 ChangeLog 20382
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -80,9 +74,6 @@ SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e metadata
 MD5 d2ac24f950d63190c16e1354b629f356 files/digest-wxGTK-2.4.2-r4 241
 RMD160 b26a0e58b713a52e91ad6cdc5146cc88ebad5683 files/digest-wxGTK-2.4.2-r4 241
 SHA256 e1e8665ebe175b02943c2e1fe429725b97dac898e32d41173c2f56dfd9551200 files/digest-wxGTK-2.4.2-r4 241
-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
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.1 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.1
deleted file mode 100644
index 3e4775057ae0..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e05d64b92ba352cad4417b75082bc2be wxWidgets-2.6.1-HTML.tar.gz 1437702
-RMD160 b89efc1a99a903a71e21a6f3a888197a91916300 wxWidgets-2.6.1-HTML.tar.gz 1437702
-SHA256 763689c62e72bc04b46504ed893fe768dfb9ef03b2fa50b14c93d59261f41ad0 wxWidgets-2.6.1-HTML.tar.gz 1437702
-MD5 045f0edad0988620a4aa36096bb16e28 wxWidgets-2.6.1.tar.bz2 12649487
-RMD160 20c009754f70cd3e983aba795306838fa622eec7 wxWidgets-2.6.1.tar.bz2 12649487
-SHA256 2c745de137dbe1ad48c0ad5fe68334670f1e9baf89d59c1ed9bf178f8d75a656 wxWidgets-2.6.1.tar.bz2 12649487
diff --git a/x11-libs/wxGTK/wxGTK-2.6.1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.1.ebuild
deleted file mode 100644
index d908cdc66f98..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.6.1.ebuild
+++ /dev/null
@@ -1,73 +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.1.ebuild,v 1.12 2005/09/24 04:36:36 vapier 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_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"
-}