QA fix for bug #119072

(Portage version: 2.1_pre7-r3)

4 files changed, 148 insertions, 12 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index a84c015ac27e..f23ac75ff3d0 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.115 2006/03/22 22:04:49 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.116 2006/04/01 06:09:14 antarus Exp $
+
+*wxGTK-2.6.2-r2 (01 Apr 2006)
+
+  01 Apr 2006; Alec Warner <antarus@gentoo.org> +wxGTK-2.6.2-r2.ebuild:
+  QA fix for bug #119072
 
   22 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> wxGTK-2.6.2-r1.ebuild:
   Stable on hppa wrt #105189 #120333
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 07b5a5b35378..9207804b8964 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,41 +1,99 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4e93208ac551fe2dcf885a0ff08ff840 ChangeLog 17945
+MD5 9b06e44ff9b9ada406aefc3240d6530c ChangeLog 18074
+RMD160 8fad56231367d99dcfd081c653b3df77dc2e434d ChangeLog 18074
+SHA256 af86177d5f36076ab679e8179ca297817b59b991b4dc3407b66275677398df30 ChangeLog 18074
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
+RMD160 51232262c3e1ba5b29c3772d2ee61639c2c4cfb0 files/digest-wxGTK-2.4.2-r2 65
+SHA256 562f9f2432a97bab9206c13ef4cfa04eccdfe82413d5854163a4d63a1e9893d9 files/digest-wxGTK-2.4.2-r2 65
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65
+RMD160 51232262c3e1ba5b29c3772d2ee61639c2c4cfb0 files/digest-wxGTK-2.4.2-r3 65
+SHA256 562f9f2432a97bab9206c13ef4cfa04eccdfe82413d5854163a4d63a1e9893d9 files/digest-wxGTK-2.4.2-r3 65
 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 d3163f84f4f7dbabab06613667542f9b files/digest-wxGTK-2.5.3 65
+RMD160 7602a8a6e5f62a12e61e9269755b0c3d78376c43 files/digest-wxGTK-2.5.3 65
+SHA256 f546374ada8757b9c0ac845227c33f04a7841373260d6f928ddd2feff4c7adcc files/digest-wxGTK-2.5.3 65
 MD5 c8ab55f4ce498e00d800d420ba86ea08 files/digest-wxGTK-2.6.0-r1 143
+RMD160 ae4e9f437362bba8dcd0809ff3b5f30dfd0eb997 files/digest-wxGTK-2.6.0-r1 143
+SHA256 9d4deb3968abbbcfefaaf6df977134ba8dc2c42f326dfdeba88705faf2892201 files/digest-wxGTK-2.6.0-r1 143
 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 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2 143
+RMD160 64252847ab4ea5d4c525e8d275687c41d5294537 files/digest-wxGTK-2.6.2 143
+SHA256 3aa67760b842361b5e821998c67105521bfd9f8d23faf0c74784a229ff3a7a3f files/digest-wxGTK-2.6.2 143
 MD5 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2-r1 143
+RMD160 64252847ab4ea5d4c525e8d275687c41d5294537 files/digest-wxGTK-2.6.2-r1 143
+SHA256 3aa67760b842361b5e821998c67105521bfd9f8d23faf0c74784a229ff3a7a3f files/digest-wxGTK-2.6.2-r1 143
+MD5 46c640a73873e599780242d2c29cdefc files/digest-wxGTK-2.6.2-r2 521
+RMD160 2b1487dd8ecd6c4e0789861a4bef9c35f75a1b90 files/digest-wxGTK-2.6.2-r2 521
+SHA256 5b793e6ce19b46528f537fd7e5ec07761b282ae7b4200dc04272315a9b8c709b files/digest-wxGTK-2.6.2-r2 521
 MD5 b0a51d86a603a6aa6b8447cd7ad8cc9b files/intl.cpp.diff 581
+RMD160 75ac177252f70210f10e6cec937d1c3782fff861 files/intl.cpp.diff 581
+SHA256 c70d00558c976c51fb00e6b487c811cefae0abef5005384b3674998e9d730217 files/intl.cpp.diff 581
 MD5 574b30817d120dcaf7e94832c64b003a files/wxGTK-2.4.1-contrib.patch 572
+RMD160 a06af13c56335a95089b3b072f9420ea03cd2bcd files/wxGTK-2.4.1-contrib.patch 572
+SHA256 3eb997db331f34be26cceded8158bb4b0ad3a64dec36c159d1a2f3a0bc2d3160 files/wxGTK-2.4.1-contrib.patch 572
 MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
+RMD160 8aed51bc27a12bc55e3fdd962d497d984323b657 files/wxGTK-2.4.1-wxpython1.patch 1102
+SHA256 d20d687d676162dbe9622a217775f2403a9e235edfbd934e619974d574d4d236 files/wxGTK-2.4.1-wxpython1.patch 1102
 MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
+RMD160 b0c00666270c8e6b15c77e941bfd6943c98c0c46 files/wxGTK-2.4.1-wxpython2.patch 8459
+SHA256 317feb37132386dbca94cebb129f8d718c5f39dcc849b9bc443058c0899cc8aa files/wxGTK-2.4.1-wxpython2.patch 8459
 MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
+RMD160 a735c2f19c3c03660cc923c6f081d2fa54536da2 files/wxGTK-2.4.2-cleanup.patch 18162
+SHA256 de6fdf92f166a3a49afbd4104377fdf06001001910ecbf51db0f6c5d7f8535d1 files/wxGTK-2.4.2-cleanup.patch 18162
 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
+RMD160 5c500bc5e115bb45160e78e7a6ac244df27e4689 files/wxGTK-2.4.2-contrib_animate.patch 442
+SHA256 108c0b5336ee5a7777a19e9ed44a4c5ccc43c2c958bb0bb5517a52f497eaaf77 files/wxGTK-2.4.2-contrib_animate.patch 442
 MD5 86aaa65d3b583aa23086e1f2e76e5344 files/wxGTK-2.4.2-gcc4.patch 10122
+RMD160 aab7c430a6971f5795071fc780add0e23be58e97 files/wxGTK-2.4.2-gcc4.patch 10122
+SHA256 53827409fa518ae8580b583536465985838c0e7c5d9fb7e96716884b3a69bf2f files/wxGTK-2.4.2-gcc4.patch 10122
 MD5 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253
+RMD160 250f50903c51642b62d318f78728ea3d065b850b files/wxGTK-2.4.2-menu.cpp.patch 2253
+SHA256 d24b8498ef3558b31cd5103955c2e3e2842cb453d1370c23986d78c7cfe35369 files/wxGTK-2.4.2-menu.cpp.patch 2253
 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
 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
 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
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
+RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
+SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e metadata.xml 162
 MD5 62be82618a657fca19a51e0825e5e4e9 wxGTK-2.4.2-r2.ebuild 4249
+RMD160 1dd954b731ef71f55d7e48e081aa937e97a13c75 wxGTK-2.4.2-r2.ebuild 4249
+SHA256 e5d40364cfe22634a05436c746661e8a9db891b13e91db2d683bfcf95092cbea wxGTK-2.4.2-r2.ebuild 4249
 MD5 58a128b966a8c93bd4b1fbef17e044ed wxGTK-2.4.2-r3.ebuild 4733
+RMD160 315645c7aff67269ba536c3415a82f49ad55bc22 wxGTK-2.4.2-r3.ebuild 4733
+SHA256 c131aca8db215f656c2927f130547b0e8271dd3223e5a0dd5de4827101054153 wxGTK-2.4.2-r3.ebuild 4733
 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
 MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812
+RMD160 22519dd5c53cb60795bb4aab53950bdc5d5ba366 wxGTK-2.5.3.ebuild 4812
+SHA256 f7b472ab7d9418103a48da351ce1cd14ee6151a1bd8d2459bf0a5f2ffb443eea wxGTK-2.5.3.ebuild 4812
 MD5 b2544e112108097113205b4559e87ce7 wxGTK-2.6.0-r1.ebuild 2273
+RMD160 398dec41a00b92493e35ec3e2b7104f595b871e2 wxGTK-2.6.0-r1.ebuild 2273
+SHA256 5bce57115e750924126c1b80438c3e7ac35732d49216c45cc17b6266c4255a95 wxGTK-2.6.0-r1.ebuild 2273
 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
 MD5 56de842cb982e2aeb27abbfe3cb3d2ff wxGTK-2.6.1.ebuild 1922
+RMD160 e2f3f5f13d3be95b7db3442f5b81bfd39048c2bb wxGTK-2.6.1.ebuild 1922
+SHA256 6b3e456121ed88b0a934657361b9dbe25add4c35cb0d5f1297b2c6a0a7f67d5d wxGTK-2.6.1.ebuild 1922
 MD5 13eac5b6f714eff0fa3ab59b59faaf3e wxGTK-2.6.2-r1.ebuild 1571
+RMD160 ba541b95a6ef74a8a8e667ef79003d9e17c99bc5 wxGTK-2.6.2-r1.ebuild 1571
+SHA256 b487121b03a3a4a9a93b6f337539aa9d98747568da54f6029e352f8b3c81215b wxGTK-2.6.2-r1.ebuild 1571
+MD5 b9ffbe6dd5ccbd930e7ebb331a09602a wxGTK-2.6.2-r2.ebuild 1583
+RMD160 f1187554bb66b557c8af03c993d2ba6c813b05c3 wxGTK-2.6.2-r2.ebuild 1583
+SHA256 cb73eeee473b719a3fa7a2c6c215954461fe36d9a66a240aeef73ba7a558cccf wxGTK-2.6.2-r2.ebuild 1583
 MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEIcoPKRy60XGEcJIRAvc/AJ90s0TYrRbALD6JX2tEPhmyjU89BgCeLi3N
-ssyxUbhyOqx8e8ZUK+98jq4=
-=HfGQ
------END PGP SIGNATURE-----
+RMD160 0caf5f3409224a0542e2386411ddfe6819765cb8 wxGTK-2.6.2.ebuild 1531
+SHA256 c3f69c6446d36b8b1880141adac5b3f8d49365308a378a5f5fdad824e1e22ffb wxGTK-2.6.2.ebuild 1531
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r2 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r2
new file mode 100644
index 000000000000..6d8c96036644
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r2
@@ -0,0 +1,6 @@
+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/wxGTK-2.6.2-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2-r2.ebuild
new file mode 100644
index 000000000000..51cac65bf74e
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.2-r2.ebuild
@@ -0,0 +1,67 @@
+# 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.2-r2.ebuild,v 1.1 2006/04/01 06:09:14 antarus 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 )
+	x86? ( sdl? ( media-libs/sdl-sound ) )
+	amd64? ( sdl? ( media-libs/sdl-sound ) )
+	ppc? ( 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}/wxWidgets-2.6.2-gcc41.patch
+	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"
+}