Restore.

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

3 files changed, 180 insertions, 5 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index a4dfbe40d60f..4be35700a14c 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.293 2012/09/16 02:54:05 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.294 2012/09/16 17:04:31 dirtyepic Exp $
+
+  17 Sep 2012; Ryan Hill <dirtyepic@gentoo.org> +wxGTK-2.9.3.1.ebuild:
+  Restore.
 
   16 Sep 2012; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.12.1.ebuild,
   -wxGTK-2.9.3.1.ebuild, wxGTK-2.9.4.1.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 2c660b3d1dc2..8eb37f135dff 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -7,18 +7,21 @@ AUX wxGTK-2.8.11-unicode-odbc.patch 624 SHA256 2e2cbeb2240770497611bf845127f737e
 AUX wxGTK-2.8.7-mmedia.patch 585 SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85 SHA512 b17b49f0c61d3b6f36dfc6835d4e116c9b4e5da79cc7940384313b6f541a389cc82a3d0dd807b45a9ec427601390162fbac0ba5cbcff6a5f8f05987fc8947de9 WHIRLPOOL 362503988879cc536671788df023339b5cf10bbda48cf4af957c12d2dcd232772235ec0c461d26a83b1b4243a8023bf3cee32d9486027373f8e9dbda44271c02
 AUX wxGTK-2.9.3.1-collision.patch 6082 SHA256 a98df8ef1266c52ab72a9b03aeddda8c1d8a7c79287e0fd71cd7fec7fcb2bb88 SHA512 320886e56f4e98fe487c3f39570321663a1fe96d48e29f2c43a131be8a3e0f7bb5d5c315772bad1269a5a70cdcaabd1e4f87c28e2cbc7123ab787fd57bbe221d WHIRLPOOL 5dfc5fb13271a739c59e2261a50d8c82f451749993bc01b502dfee087f96b358cb81c13bd852139d6983001a44f18b916c193a8e2e8168132003898427aa3b6d
 AUX wxGTK-2.9.4.1-collision.patch 6099 SHA256 bdef409ca229c6c28f65fbd6a177a55aeaddd580d628721fcd4a5f9f756fe7b4 SHA512 5f8f67129d75b9c2e5f22e671300e7bfa5a65b19216ce81def7cc64ebc9af64685532abefda956eee2005b159aeb163103490d60893032ea428bca6ce4a4161e WHIRLPOOL a8586438764b6595331356475d91bb67406e2d633ca86a910c0b15b176513bad22a9cfdd94ef8a0e167acba8563f59e8f72f15c85090ec485d79ac44d0de731d
+DIST wxPython-docs-2.9.3.1.tar.bz2 14913825 SHA256 64c6b07c8fa0277b281fb1e6210087e57fb072ce8cabe86d251c3208040cd945 SHA512 23d39a28532d686b06f410596f108a97b377e0250f2ae90b681053197c7e0bcbb98374aaeea0d343359b28ebff482d668de5b7a3d07362cc8e35c61a7d50cbb6 WHIRLPOOL 43ba589c44c70b9423639e2535e30d4a1ea0ad729964abcc48c92ae59929a9e95ea02dfd704b87b16adddb9327916832d24fe516c8a4780362a1bca718742bcd
 DIST wxPython-docs-2.9.4.0.tar.bz2 15477636 SHA256 42a1683f253aa36ae9ee20b8d511d8704b4e45ba124fec256a7dfce38da9f75f SHA512 f996e69f24baaa8d35bf94ef77f31f6beda5dd4ddd65d6b71558e8dbe33098c951f995172b4ccd93ad08c81df07a9b529813eac5d39ffa06290f2a9ccc87620c WHIRLPOOL b6f6d65d319683f44b1eb4708077abaecd1a972a0d79fb6293b055099a0720d36e83506df6d075243f9e8b180849ae0d44badc8a22d5c764c956d5ecfe0cc6da
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
+DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
 EBUILD wxGTK-2.8.12.1.ebuild 4001 SHA256 0974eb8593353c307d622108f700e440e9e0731e5efe4b9ad5dedd76e9e64dc7 SHA512 d15241b99ba93626f17bdf4809c63b3da5b08aecf42dd3f2e798dc82b17590b0edd548e5f243dec24d62c23b3d773f114dc449d34370cfaddfef430482b74803 WHIRLPOOL 1002e24127eab8ecd3be63bdb45d23e39af564f5269afc58041c724e53ae67dbb57e43d6f7f721868d82b552004ab8102b5539d5237e03d9591aadf34b42cd14
+EBUILD wxGTK-2.9.3.1.ebuild 4125 SHA256 98dd0c09befc32ee4acc2857ec22a7407970a69b78001e186a9187b688dd45f7 SHA512 ff90f1fb1bf6523b8d8be44b7de41ad800426261b50b17490aae99258bf17c5a149d5952155b7d4018345fb9ddd03b1c8fc5585a49b9657137f8b8af8926d668 WHIRLPOOL 4ca9fd9d6ce2c0737db65b5de59517262ac4a5a948cbb73e2b055daa59848936ceb7390d5528213844fa0354618fee7db3383ab425c630cdb572da999329a4ed
 EBUILD wxGTK-2.9.4.1.ebuild 4170 SHA256 d04ce9ad777525f42081af4310343b9b7800294c4dbc219a7f2cd6dc9f8181ec SHA512 6657d9d677bcff171540a2450de13183430bce0af54c192e826836dc0ee19a3b04e99271836dc0a7b88988417e5925d1967fc207d23b4945c6936dbc9012abd0 WHIRLPOOL db117ab6d7414af7b46aa69dcfefe024be490e3be602a7b61dfc61e3527fb7fdcb0751bafa71c80e30365330ee14f58de97483ec98c90e7effa704d4e017c621
-MISC ChangeLog 46103 SHA256 fbd333e843996c2cad6137c68747762082856d52a80c81322b8f549d0e7a9405 SHA512 c18182d29f99f1f1cf658d59cc3055eb626e7ab1f3a11aa09d52f768c08ba377230231e7f068dc92c72947652d39beca2a1fb960033737ddd60c53a024969e4f WHIRLPOOL 6fa6be07d4af8ef641d8c7e414622184c00cc97e0b6a0984e3336b683e33b2c046f640d5f5ec0d89e9101a1080472ae64da0b33c28163ceb3988d006b0aa918d
+MISC ChangeLog 46186 SHA256 0593810e362329e6ca2c70f6efaf0c2623960084b96395945ccf057c1d484629 SHA512 8c6ed8455470544a5036c60d83b3ddc194fa43208fd1c5599024086e2e5c87b5ace010c2051fccac181ba9522328846c715929f5ef804ece11cc0e3fb3878dd0 WHIRLPOOL 1e9c82208cb9befcd5899f24dec600992f77732554ff75de70f88b2bf1d6eafa49a462a961efeb1c92bf0fb6f6f89f35af445bee40b106ad54cdefff2a1a4312
 MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBWPuwACgkQiqiDRvmkBmJ7swCfdlCVM3qDShG36x5Qk3Jrj3+6
-eNIAmwbhLZOJyml5IiPEfDe4I8haOSjw
-=KlFl
+iEYEAREIAAYFAlBXBj8ACgkQiqiDRvmkBmIdLQCeNn+Lsy/rgrxZIRdVP8Ryp5qs
+6UQAoKrqOmg3XrE8ES8s9cqXTl0Yqt4s
+=NwjK
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
new file mode 100644
index 000000000000..7483d78c2704
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild,v 1.4 2012/09/16 17:04:32 dirtyepic Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="X aqua doc debug gnome gstreamer opengl pch sdl tiff"
+
+RDEPEND="
+	dev-libs/expat
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0
+		sys-libs/zlib
+		virtual/jpeg
+		>=x11-libs/gtk+-2.18:2
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		gnome? ( gnome-base/libgnomeprintui:2.2 )
+		gstreamer? (
+			gnome-base/gconf:2
+			>=media-libs/gstreamer-0.10
+			>=media-libs/gst-plugins-base-0.10 )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff:0 )
+		)
+	aqua? (
+		>=x11-libs/gtk+-2.4[aqua=]
+		virtual/jpeg
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X?  (
+		x11-proto/xproto
+		x11-proto/xineramaproto
+		x11-proto/xf86vidmodeproto
+		)"
+#		test? ( dev-util/cppunit )
+
+PDEPEND=">=app-admin/eselect-wxwidgets-1.4"
+
+SLOT="2.9"
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-collision.patch
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable pch precomp-headers)
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	#   if USE="debug" set max debug level (wxDEBUG_LEVEL=2)
+	#   if USE="-debug" use the default (wxDEBUG_LEVEL=1)
+	#   do not use --disable-debug
+	# this means we always build debugging features into the library, and
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# http://docs.wxwidgets.org/2.9/overview_debugging.html
+	# http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with !gnome gtkprint)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+	emake || die "make failed."
+}
+
+# Currently fails - need to investigate
+#src_test() {
+#	cd "${S}"/wxgtk_build/tests
+#	emake || die "failed building testsuite"
+#	./test -d || ewarn "failed running testsuite"
+#}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install || die "install failed."
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/doxygen/out/html/*
+	fi
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}