Version bump.

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

3 files changed, 187 insertions, 5 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index f4b32209e009..f140a413b19c 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.278 2011/12/09 04:32:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.279 2011/12/09 04:40:06 dirtyepic Exp $
+
+*wxGTK-2.8.12.1 (09 Dec 2011)
+
+  09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> +wxGTK-2.8.12.1.ebuild:
+  Version bump.
 
   09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.12.0.ebuild:
   Prefix should pay more attention when they ignore metadata.xml (bug
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 1850a6b07e7d..d7359d5fd961 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -18,18 +18,20 @@ AUX wxGTK-2.9.1.1-collision.patch 5953 RMD160 a80b62e8a6c099d27ff7df6e63a0c55078
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
 DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd
+DIST wxPython-src-2.8.12.1.tar.bz2 31311482 RMD160 94eae06087bdd930e21bf90cc6672f93a1f5a17a SHA1 05688dc03d61631750f5904273122bb40a2115f5 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
 EBUILD wxGTK-2.6.4.0-r6.ebuild 5079 RMD160 355f1a2077d296254dfd172d914555407d460be5 SHA1 f14398400cf3673516a2b7118c75e37002994771 SHA256 8110dd38ac23024b58d3d58259c4e1ee5a668d6e842626e3b74019c8032225e7
 EBUILD wxGTK-2.8.11.0.ebuild 3607 RMD160 6c432fdde32ef01a5ea96101e78e4b0df950b260 SHA1 8d982b93d53c1829048d857b38fe6cdd4aa0bdec SHA256 468ea1693f80687de7cabf75f93a1a2b6c8588cf8d012be1489b8ada9e58a424
 EBUILD wxGTK-2.8.12.0.ebuild 3984 RMD160 cf1b21bd2ea5a0ba3cc330838cbdfc87f66e4776 SHA1 ac568f6fedfde0eead02752bac21af4f65a1942e SHA256 e8888ae59d6f2ccf87d4aad6a65ef768ff2b9e374d0946fa46cac56b25da4d32
+EBUILD wxGTK-2.8.12.1.ebuild 3920 RMD160 44d5991d83308bf4a656f33144f28f46725f4708 SHA1 eded7d061201c7a4188315ac8b22253e25ec1677 SHA256 e586dd1ed0028de25b9822c32be6cef089a04b2dc77b55ecb363fa415b0600fb
 EBUILD wxGTK-2.9.1.1.ebuild 4173 RMD160 146b9a46d5f274e048d17620aadcf278c85ff2cd SHA1 aaa2dc23d443ebaadedfba1e5fe7859309e169b8 SHA256 1a37870888dcff024271330dfd4d2251a82c6a61211ebd390c04c5281e4e18c2
-MISC ChangeLog 43670 RMD160 f3a8bbb6e5e17df309103a9911675986f4e18650 SHA1 2f355f71472ad43d8246cfb3cf1494b8a8b10afb SHA256 90eade8d8188757952b59741855ff9b942fb4a3a31494c37a1b3f5206e5d1929
+MISC ChangeLog 43790 RMD160 57baf4f263e211b6f23c2d550985a87d15310fd6 SHA1 57ec2f0fc15828cb98e405cb3c8cf59868066ef9 SHA256 576ddd62a2c8be1c89ace1e3a469ca0e826a71ca4640da721f4270c072965ceb
 MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7hkbIACgkQiqiDRvmkBmJFAgCdFXaIMO7yY5bzd1omf6fY/tkd
-D0EAn1xUOk4QFo/wUbRDKGYlYMpIXzzS
-=XaiX
+iEYEARECAAYFAk7hk4UACgkQiqiDRvmkBmJ2UQCeIvZSDwQlvWHfdvReNVBl/ORJ
+wrMAoI1pdzEMdv5UmZQieHFK+EsD/1g/
+=4ig4
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
new file mode 100644
index 000000000000..66ed051eb176
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.1 2011/12/09 04:40:06 dirtyepic Exp $
+
+EAPI="4"
+
+inherit eutils versionator flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# 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"
+
+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 odbc opengl pch sdl tiff"
+
+RDEPEND="
+	dev-libs/expat
+	odbc?   ( dev-db/unixODBC )
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		dev-libs/glib:2
+		media-libs/libpng:0
+		sys-libs/zlib
+		virtual/jpeg
+		x11-libs/gtk+: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}
+		dev-util/pkgconfig
+		X?  (
+			x11-proto/xproto
+			x11-proto/xineramaproto
+			x11-proto/xf86vidmodeproto
+			)"
+
+PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
+
+SLOT="2.8"
+LICENSE="wxWinLL-3
+		GPL-2
+		odbc?	( LGPL-2 )
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
+	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
+	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--enable-shared
+			--enable-unicode
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable debug)
+			$(use_enable pch precomp-headers)
+			$(use_with odbc odbc sys)
+			$(use_with sdl)
+			$(use_with tiff libtiff sys)"
+
+	# 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
+			$(use_enable gstreamer mediactrl)
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			--without-gnomevfs"
+
+	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
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake DESTDIR="${D}" install
+	fi
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt todo30.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/html/*
+	fi
+
+	# We don't want this
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}