From 26d477b5955ee3f93e53ad7c3204a0e9c4e66fb8 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 22 Apr 2007 21:58:30 +0000 Subject: [PATCH] Fix wxwidgets handling for bug #151417. Package-Manager: portage-2.1.2.4 --- .../Alien-wxWidgets-0.20-r1.ebuild | 21 ++++++++++++----- .../Alien-wxWidgets-0.21.ebuild | 23 +++++++++++++------ .../Alien-wxWidgets-0.30.ebuild | 21 ++++++++++++----- dev-perl/Alien-wxWidgets/ChangeLog | 7 +++++- dev-perl/wxperl/ChangeLog | 6 ++++- dev-perl/wxperl/wxperl-0.27.ebuild | 4 ++-- dev-perl/wxperl/wxperl-0.57.ebuild | 20 ++++------------ dev-perl/wxperl/wxperl-0.69.ebuild | 20 ++++------------ 8 files changed, 68 insertions(+), 54 deletions(-) diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.20-r1.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.20-r1.ebuild index 875afd26588b..95415c7bb860 100644 --- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.20-r1.ebuild +++ b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.20-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.20-r1.ebuild,v 1.1 2006/08/20 15:48:41 yuval Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.20-r1.ebuild,v 1.2 2007/04/22 21:57:43 dirtyepic Exp $ -inherit perl-module +inherit perl-module wxwidgets MY_P=Alien-wxWidgets-${PV} S=${WORKDIR}/${MY_P} @@ -18,13 +18,22 @@ IUSE="" SRC_TEST="do" DEPEND="dev-lang/perl - >=x11-libs/wxGTK-2.6.2-r1 + =x11-libs/wxGTK-2.6* >=dev-perl/module-build-0.26 >=dev-perl/Module-Pluggable-3.1-r1" perl-module_src_prep() { perlinfo + + WX_GTK_VER="2.6" + + if use unicode; then + need-wxwidgets unicode + else + need-wxwidgets gtk2 + fi + echo no | perl Build.PL --installdirs=vendor \ - --destdir=${D} \ - --libdoc= || die "perl Build.PL has failed!" + --destdir=${D} \ + --libdoc= || die "perl Build.PL has failed!" } diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.21.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.21.ebuild index bb4049f94fb8..ab3f699b76c2 100644 --- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.21.ebuild +++ b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.21.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.21.ebuild,v 1.3 2006/10/15 01:23:10 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.21.ebuild,v 1.4 2007/04/22 21:57:43 dirtyepic Exp $ -inherit perl-module +inherit perl-module wxwidgets MY_P=Alien-wxWidgets-${PV} S=${WORKDIR}/${MY_P} @@ -13,18 +13,27 @@ HOMEPAGE="http://search.cpan.org/~mbarbon/${P}/" SLOT="0" LICENSE="|| ( Artistic GPL-2 )" KEYWORDS="amd64 ~ia64 ~x86" -IUSE="" +IUSE="unicode" SRC_TEST="do" DEPEND="dev-lang/perl - x11-libs/wxGTK + =x11-libs/wxGTK-2.6* >=dev-perl/module-build-0.26 >=dev-perl/Module-Pluggable-3.1-r1" perl-module_src_prep() { perlinfo + + WX_GTK_VER="2.6" + + if use unicode; then + need-wxwidgets unicode + else + need-wxwidgets gtk2 + fi + echo no | perl Build.PL --installdirs=vendor \ - --destdir=${D} \ - --libdoc= || die "perl Build.PL has failed!" + --destdir=${D} \ + --libdoc= || die "perl Build.PL has failed!" } diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.30.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.30.ebuild index ad9e150ed843..a3d472df9ac4 100644 --- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.30.ebuild +++ b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.30.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.30.ebuild,v 1.1 2007/03/19 14:52:29 yuval Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.30.ebuild,v 1.2 2007/04/22 21:57:43 dirtyepic Exp $ -inherit perl-module +inherit perl-module wxwidgets MY_P=Alien-wxWidgets-${PV} S=${WORKDIR}/${MY_P} @@ -13,18 +13,27 @@ HOMEPAGE="http://search.cpan.org/~mbarbon/${P}/" SLOT="0" LICENSE="|| ( Artistic GPL-2 )" KEYWORDS="~amd64 ~ia64 ~x86" -IUSE="" +IUSE="unicode" SRC_TEST="do" DEPEND="dev-lang/perl - x11-libs/wxGTK + =x11-libs/wxGTK-2.6* >=dev-perl/module-build-0.26 >=dev-perl/Module-Pluggable-3.1-r1" perl-module_src_prep() { perlinfo + + WX_GTK_VER="2.6" + + if use unicode; then + need-wxwidgets unicode + else + need-wxwidgets gtk2 + fi + echo no | perl Build.PL --installdirs=vendor \ - --destdir=${D} \ - --libdoc= || die "perl Build.PL has failed!" + --destdir=${D} \ + --libdoc= || die "perl Build.PL has failed!" } diff --git a/dev-perl/Alien-wxWidgets/ChangeLog b/dev-perl/Alien-wxWidgets/ChangeLog index 0f54a3dff242..d18c71564b9f 100644 --- a/dev-perl/Alien-wxWidgets/ChangeLog +++ b/dev-perl/Alien-wxWidgets/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-perl/Alien-wxWidgets # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/ChangeLog,v 1.8 2007/03/19 14:52:29 yuval Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/ChangeLog,v 1.9 2007/04/22 21:57:43 dirtyepic Exp $ + + 22 Apr 2007; Ryan Hill + Alien-wxWidgets-0.20-r1.ebuild, Alien-wxWidgets-0.21.ebuild, + Alien-wxWidgets-0.30.ebuild: + Fix wxwidgets handling for bug #151417. *Alien-wxWidgets-0.30 (19 Mar 2007) diff --git a/dev-perl/wxperl/ChangeLog b/dev-perl/wxperl/ChangeLog index a5b97149d0c5..66195598b21f 100644 --- a/dev-perl/wxperl/ChangeLog +++ b/dev-perl/wxperl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-perl/wxperl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/ChangeLog,v 1.15 2007/04/02 14:32:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/ChangeLog,v 1.16 2007/04/22 21:58:30 dirtyepic Exp $ + + 22 Apr 2007; Ryan Hill wxperl-0.27.ebuild, + wxperl-0.57.ebuild, wxperl-0.69.ebuild: + Fix wxwidgets handling for bug #151417. 02 Apr 2007; Raúl Porcel wxperl-0.69.ebuild: Add ~ia64 wrt bug 144122 diff --git a/dev-perl/wxperl/wxperl-0.27.ebuild b/dev-perl/wxperl/wxperl-0.27.ebuild index daa537fbd430..113c10ef1c65 100644 --- a/dev-perl/wxperl/wxperl-0.27.ebuild +++ b/dev-perl/wxperl/wxperl-0.27.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.27.ebuild,v 1.7 2007/01/28 03:06:39 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.27.ebuild,v 1.8 2007/04/22 21:58:30 dirtyepic Exp $ -inherit perl-module eutils wxwidgets +inherit perl-module wxwidgets MY_P="Wx-${PV}" S=${WORKDIR}/${MY_P} diff --git a/dev-perl/wxperl/wxperl-0.57.ebuild b/dev-perl/wxperl/wxperl-0.57.ebuild index e6a40fcef527..d862b1e3dd54 100644 --- a/dev-perl/wxperl/wxperl-0.57.ebuild +++ b/dev-perl/wxperl/wxperl-0.57.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.57.ebuild,v 1.2 2006/10/20 18:06:11 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.57.ebuild,v 1.3 2007/04/22 21:58:30 dirtyepic Exp $ -inherit perl-module eutils wxwidgets +inherit perl-module MY_P="Wx-${PV}" S=${WORKDIR}/${MY_P} @@ -13,19 +13,9 @@ SRC_URI="mirror://cpan/authors/id/M/MB/MBARBON/${MY_P}.tar.gz" LICENSE="|| ( Artistic GPL-2 )" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="unicode" +IUSE="" -DEPEND=">=x11-libs/wxGTK-2.6.2-r1 +DEPEND="=x11-libs/wxGTK-2.6* dev-perl/Alien-wxWidgets >=dev-lang/perl-5.8.4 >=virtual/perl-File-Spec-0.82" - -src_compile() { - WX_GTK_VER="2.6" - if use unicode; then - need-wxwidgets unicode - else - need-wxwidgets gtk2 - fi - perl-module_src_compile -} diff --git a/dev-perl/wxperl/wxperl-0.69.ebuild b/dev-perl/wxperl/wxperl-0.69.ebuild index 8f86a64f584a..772428df99e9 100644 --- a/dev-perl/wxperl/wxperl-0.69.ebuild +++ b/dev-perl/wxperl/wxperl-0.69.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.69.ebuild,v 1.2 2007/04/02 14:32:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.69.ebuild,v 1.3 2007/04/22 21:58:30 dirtyepic Exp $ -inherit perl-module eutils wxwidgets +inherit perl-module MY_P="Wx-${PV}" S=${WORKDIR}/${MY_P} @@ -13,22 +13,10 @@ SRC_URI="mirror://cpan/authors/id/M/MB/MBARBON/${MY_P}.tar.gz" LICENSE="|| ( Artistic GPL-2 )" SLOT="0" KEYWORDS="~amd64 ~ia64 ~x86" -IUSE="unicode" +IUSE="" -SRC_TEST="do" - -DEPEND=">=x11-libs/wxGTK-2.6.2-r1 +DEPEND="=x11-libs/wxGTK-2.6* >=dev-perl/Alien-wxWidgets-0.25 >=dev-lang/perl-5.8.4 virtual/perl-Test-Harness >=virtual/perl-File-Spec-0.82" - -src_compile() { - WX_GTK_VER="2.6" - if use unicode; then - need-wxwidgets unicode - else - need-wxwidgets gtk2 - fi - perl-module_src_compile -} -- 2.26.2