diff options
author | Ryan Hill <rhill@gentoo.org> | 2008-10-18 18:23:02 +0000 |
---|---|---|
committer | Ryan Hill <rhill@gentoo.org> | 2008-10-18 18:23:02 +0000 |
commit | c4dc93c6786b12455903c847274546e97baa7a6b (patch) | |
tree | 059f4806a407f098a4d3b789e3c2d1a76c126f4d /x11-libs/wxGTK | |
parent | Version bump. (diff) | |
download | historical-c4dc93c6786b12455903c847274546e97baa7a6b.tar.gz historical-c4dc93c6786b12455903c847274546e97baa7a6b.tar.bz2 historical-c4dc93c6786b12455903c847274546e97baa7a6b.zip |
Revert to EAPI 0 for stable candidate. Add new -r1 using EAPI 2.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r-- | x11-libs/wxGTK/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/wxGTK/Manifest | 15 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-2.8.9.1-r1.ebuild | 152 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-2.8.9.1.ebuild | 16 |
4 files changed, 178 insertions, 13 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index 0d071aed9eec..0cbb78a6f068 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.203 2008/10/18 15:23:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.204 2008/10/18 18:23:02 dirtyepic Exp $ + +*wxGTK-2.8.9.1-r1 (18 Oct 2008) + + 18 Oct 2008; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.9.1.ebuild, + +wxGTK-2.8.9.1-r1.ebuild: + Revert to EAPI 0 for stable candidate. Add new -r1 using EAPI 2. 18 Oct 2008; Raúl Porcel <armin76@gentoo.org> wxGTK-2.6.4.0-r4.ebuild, wxGTK-2.8.8.1.ebuild: diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 9a425fa0062c..f63f1e7d9816 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435 AUX wxGTK-2.6.4-mmedia.patch 599 RMD160 e894dacc346d7c10f9582c2885df8c0b82962bb1 SHA1 d1da9fe158c5db80f8e65395b9d2c3383133352c SHA256 0f848e5985e404d89fbcc4820ca07069845dc8219e0a8679ff5ad3bf28dbc93f @@ -21,6 +24,14 @@ EBUILD wxGTK-2.8.7.1-r1.ebuild 3348 RMD160 5c77d6f6fb8ca5f21fa5df984f1ad665227f6 EBUILD wxGTK-2.8.7.1-r2.ebuild 3445 RMD160 3236fca0101cf5b7f238b4237ce940519856b14b SHA1 ce5d2eaa426f693b187d7338e421ff3bed2acc9d SHA256 040a844f6caa603d806d5905a0fa58b0efbf5da84bc79a581be5e5c735d00aa6 EBUILD wxGTK-2.8.8.0.ebuild 3367 RMD160 77950322e6445369b79a6a63e1d44c09c9eca047 SHA1 37791ab22341705f397b83b3793665c2d5db2b25 SHA256 5614fef07998a370d33b401a805e08c07de07300b788779333557de6c72a2cc8 EBUILD wxGTK-2.8.8.1.ebuild 3359 RMD160 327314d7184892c471dc020695d8b68f87845a24 SHA1 40596a9415796b89a87d8bfd1704822c55f16862 SHA256 dc1648dd644c1fb95e6fe7cb8f232ff7a5a26852b3e3d287d9e4dc552e0153ef -EBUILD wxGTK-2.8.9.1.ebuild 3398 RMD160 62702fe4bab9bf42677180f6604665b386999d9f SHA1 7b68be1e818273a77375f599a89f01f66d6073d6 SHA256 4078871c52988b2dbf349518ced86082c9f2a01fc1aa677dc0e40b8903048074 -MISC ChangeLog 31786 RMD160 8ec2de485ff7b3ad2c52b13e4f9858fbb6c034ef SHA1 87c017c2b3541dc3c176e7c901b33123508b3d2a SHA256 9d88670e1cfcf6533c251fcb8747b7d3b40b42856f0f3ed674f2ac52453110cf +EBUILD wxGTK-2.8.9.1-r1.ebuild 3401 RMD160 d1db979a1bac78dc2dcd3764d34c414d25013422 SHA1 4b4cffac23dc09847f9fc19d25760c491e648697 SHA256 b603024f1a8e522657b2e2c5dfb459e86a9cb42c056ff71881fb8f0d4e8ddcfb +EBUILD wxGTK-2.8.9.1.ebuild 3367 RMD160 d2a352c4ed5d9ded835ea2a16c84d30051578729 SHA1 5bb90041c4e11fcc7e5d2110169dc1c5fe70ea3d SHA256 1b6b737e134391b5d95a534585c01c5ed6485ff3eb2a7e959060e7d54622a456 +MISC ChangeLog 31987 RMD160 8cf37069bfa66e4bf13cc2890495f081a81fb0b2 SHA1 bc6f27f454bc7f3ff7a5be0d2571f56218c62021 SHA256 5a393b1cae3feffb7504624d275600d1fd1173f7c692e37c19d15fd5170cc8fc MISC metadata.xml 500 RMD160 d0f05c0d915928bc4c424ca00f20621805ddc7f0 SHA1 3ba77d570e4764cf377b3e63078b21f69232a1fc SHA256 2592b31d76fd0a79aa634bcbc9697d7ee8420b89cbead01a8db562a4d66be98c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkj6KYYACgkQiqiDRvmkBmKnFwCfUisakESzykbJhLep32PL4KhB +qzEAoLtpvkkKjBJnwtrkBVbkTD/Vp8W4 +=qIFl +-----END PGP SIGNATURE----- diff --git a/x11-libs/wxGTK/wxGTK-2.8.9.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.9.1-r1.ebuild new file mode 100644 index 000000000000..fa8577ea00f4 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-2.8.9.1-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r1.ebuild,v 1.1 2008/10/18 18:23:02 dirtyepic Exp $ + +EAPI="2" + +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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="X doc debug gnome gstreamer odbc opengl pch sdl" + +RDEPEND=" + dev-libs/expat + odbc? ( dev-db/unixODBC ) + sdl? ( media-libs/libsdl ) + X? ( + >=x11-libs/gtk+-2.4 + >=dev-libs/glib-2.4 + media-libs/jpeg + media-libs/tiff + x11-libs/libSM + x11-libs/libXinerama + x11-libs/libXxf86vm + gnome? ( gnome-base/libgnomeprintui ) + gstreamer? ( >=media-libs/gstreamer-0.10 ) + opengl? ( virtual/opengl ) + )" + +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.6.3-unicode-odbc.patch + epatch "${FILESDIR}"/${PN}-2.8.8-collision.patch + epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch + epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 +} + +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 + $(use_enable debug) + $(use_enable pch precomp-headers) + $(use_with sdl) + $(use_with odbc)" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng + --with-libxpm + --with-libjpeg + --with-libtiff + $(use_enable gstreamer mediactrl) + $(use_enable opengl) + $(use_with opengl) + $(use_with gnome gnomeprint) + --without-gnomevfs" + + # wxBase options + use X || \ + myconf="${myconf} + --disable-gui" + + mkdir "${S}"/wxgtk_build + cd "${S}"/wxgtk_build + + ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed." +} + +src_compile() { + cd "${S}"/wxgtk_build + + emake || die "make failed." + + if [[ -d contrib/src ]]; then + cd contrib/src + emake || die "make contrib failed." + fi +} + +src_install() { + cd "${S}"/wxgtk_build + + emake DESTDIR="${D}" install || die "install failed." + + if [[ -d contrib/src ]]; then + cd contrib/src + emake DESTDIR="${D}" install || die "install contrib failed." + 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 + rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo +} + +pkg_postinst() { + has_version app-admin/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-admin/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-2.8.9.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.9.1.ebuild index 3f4dd5d4c2f6..719365739956 100644 --- a/x11-libs/wxGTK/wxGTK-2.8.9.1.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.8.9.1.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1.ebuild,v 1.1 2008/10/14 05:54:01 dirtyepic Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1.ebuild,v 1.2 2008/10/18 18:23:02 dirtyepic Exp $ inherit eutils versionator flag-o-matic @@ -54,14 +52,17 @@ LICENSE="wxWinLL-3 S="${WORKDIR}/wxPython-src-${PV}" -src_prepare() { +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch epatch "${FILESDIR}"/${PN}-2.8.8-collision.patch epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 } -src_configure() { +src_compile() { local myconf append-flags -fno-strict-aliasing @@ -105,11 +106,6 @@ src_configure() { cd "${S}"/wxgtk_build ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed." -} - -src_compile() { - cd "${S}"/wxgtk_build - emake || die "make failed." if [[ -d contrib/src ]]; then |