diff options
author | Mikle Kolyada <zlogene@gentoo.org> | 2014-03-25 19:00:34 +0000 |
---|---|---|
committer | Mikle Kolyada <zlogene@gentoo.org> | 2014-03-25 19:00:34 +0000 |
commit | 8a0f91be1659b6522fb46a509b6ce19e41c32243 (patch) | |
tree | 8bd9bee77aa5f25c13e5e905c131f0bc8d7d67aa /dev-lang/parrot | |
parent | Version bump wrt bug #505524 (diff) | |
download | gentoo-2-8a0f91be1659b6522fb46a509b6ce19e41c32243.tar.gz gentoo-2-8a0f91be1659b6522fb46a509b6ce19e41c32243.tar.bz2 gentoo-2-8a0f91be1659b6522fb46a509b6ce19e41c32243.zip |
Drop old.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)
Diffstat (limited to 'dev-lang/parrot')
-rw-r--r-- | dev-lang/parrot/ChangeLog | 7 | ||||
-rw-r--r-- | dev-lang/parrot/files/perldoc-5.10.patch | 146 | ||||
-rw-r--r-- | dev-lang/parrot/files/perldoc.patch | 33 | ||||
-rw-r--r-- | dev-lang/parrot/parrot-5.10.0.ebuild | 87 | ||||
-rw-r--r-- | dev-lang/parrot/parrot-5.7.0.ebuild | 85 | ||||
-rw-r--r-- | dev-lang/parrot/parrot-6.0.0.ebuild | 87 |
6 files changed, 6 insertions, 439 deletions
diff --git a/dev-lang/parrot/ChangeLog b/dev-lang/parrot/ChangeLog index b36af96c9f17..da431b203691 100644 --- a/dev-lang/parrot/ChangeLog +++ b/dev-lang/parrot/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/parrot # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.78 2014/03/02 21:34:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.79 2014/03/25 19:00:33 zlogene Exp $ + + 25 Mar 2014; Mikle Kolyada <zlogene@gentoo.org> -files/perldoc-5.10.patch, + -files/perldoc.patch, -parrot-5.10.0.ebuild, -parrot-5.7.0.ebuild, + -parrot-6.0.0.ebuild: + Drop old. 02 Mar 2014; Andreas K. Huettel <dilfridge@gentoo.org> parrot-6.1.0.ebuild: Add subslot dependency on dev-libs/icu diff --git a/dev-lang/parrot/files/perldoc-5.10.patch b/dev-lang/parrot/files/perldoc-5.10.patch deleted file mode 100644 index 43a7fddee142..000000000000 --- a/dev-lang/parrot/files/perldoc-5.10.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff --git a/config/auto/perldoc.pm b/config/auto/perldoc.pm -index 4d87aca..7e54156 100644 ---- a/config/auto/perldoc.pm -+++ b/config/auto/perldoc.pm -@@ -66,24 +66,12 @@ E_NOTE - foreach my $ops (@ops) { - my $pod = $ops; - $pod =~ s/\.ops$/.pod/; -- if ( $new_perldoc ) { -- $TEMP_pod_build .= <<"END"; -+ $TEMP_pod_build .= <<"END"; - ops/$pod: ../src/ops/$ops --\t\$(PERLDOC) -ud ops/$pod ../src/ops/$ops -+\t\$(PODEXTRACT) ../src/ops/$ops ops/$pod - \t\$(CHMOD) 0644 ops/$pod - \t\$(ADDGENERATED) "docs/\$\@" "[doc]" -- --END -- } -- else { -- $TEMP_pod_build .= <<"END"; --ops/$pod: ../src/ops/$ops --\t\$(PERLDOC) -u ../ops/$ops > ops/$pod --\t\$(CHMOD) 0644 ../ops/$pod --\t\$(ADDGENERATED) "docs/\$\@" "[doc]" -- - END -- } - } - - $conf->data->set( -diff --git a/config/gen/makefiles/docs.in b/config/gen/makefiles/docs.in -index 3e8c74b..4e8f35d 100644 ---- a/config/gen/makefiles/docs.in -+++ b/config/gen/makefiles/docs.in -@@ -11,6 +11,7 @@ RM_RF = @rm_rf@ - PERLDOC = @perldoc@ - POD2MAN = @pod2man@ - VERSION = @VERSION@@DEVEL@ -+PODEXTRACT = $(PERL) ../tools/build/podextract.pl - ADDGENERATED = $(PERL) ../tools/build/addgenerated.pl - OPS_SUMMARY = ../tools/docs/ops_summary.pl - -@@ -63,8 +64,7 @@ doc-prep: - $(TOUCH) doc-prep - - packfile-c.pod: ../src/packfile/api.c --#IF(new_perldoc): $(PERLDOC) -ud packfile-c.pod ../src/packfile/api.c --#ELSE: $(PERLDOC) -u ../src/packfile/api.c > packfile-c.pod -+ $(PODEXTRACT) ../src/packfile/api.c packfile-c.pod - $(ADDGENERATED) "docs/$@" "[doc]" - - .pod.1 : # suffix rule (limited support) -diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in -index c1f0c19..36e853a 100644 ---- a/config/gen/makefiles/root.in -+++ b/config/gen/makefiles/root.in -@@ -115,6 +115,7 @@ LDFLAGS = @ldflags@ @ld_debug@ - INNO_SETUP = iscc - TEMPDIR = @tempdir@ - RPATH_BLIB = @rpath_blib@ -+PODEXTRACT = $(PERL) $(BUILD_TOOLS_DIR)/podextract.pl - ADDGENERATED = $(PERL) $(BUILD_TOOLS_DIR)/addgenerated.pl - #IF(darwin):export MACOSX_DEPLOYMENT_TARGET = @osx_version@ - -diff --git a/tools/build/podextract.pl b/tools/build/podextract.pl -new file mode 100644 -index 0000000..0979b6b ---- /dev/null -+++ b/tools/build/podextract.pl -@@ -0,0 +1,75 @@ -+#! perl -+ -+=head1 NAME -+ -+tools/build/podextract.pl -+ -+=head1 DESCRIPTION -+ -+Simple POD Extraction -+ -+=head1 SYNOPSIS -+ -+Previously: -+ -+ perldoc -ud $target $source -+ -+or -+ -+ perldoc -u $source > $target -+ -+Now: -+ -+ perl podextract.pl $source $target -+ -+=head1 RATIONALE -+ -+C<perldoc> does many things, and is somewhat complex. -+ -+For instance, normally, -+ -+ perldoc perldoc -+ -+Inspects various paths, and paths that are controlled by C<%ENV> to find relevant documentation for "perldoc". -+ -+And because of this, it is a little security concious, and pre-emptively drops root to UID=nobody -+ -+But Parrot is not using this feature of C<perldoc> -+ -+Parrot is simply using C<perldoc> as a content filter to extract C<POD> from source files. -+ -+And as such, it only needs the alternative function -+ -+ perldoc $PATH -+ -+To work, which doesn't require C<%ENV>, and additionally, dropping root to C<UID=nobody> makes it impossible -+for some parrot to invoke C<perldoc -ud $target $source> on some systems, because it drops privelages and can then no longer read C<$source>, and can no longer write C<$target>. -+ -+However, some means vendor tooling that B<MUST> execute C<make install> as root, by proxy, C<MUST> invoke C<perldoc> as root, and as such, invokes the security problem, which is impossible to work around. -+ -+Given a simple C<chmod> is not enough, because parent directories also are not readable or writeable by C<UID=nobody>, and additionally, vendor tooling causes fatal access violations when a process running as C<UID=nobody> even attempts to do directory lookaround ( which C<perldoc> does much of as part of C<%ENV> handling ) -+ -+So this tool is simple: -+ -+It takes the very core utility in C<PerlDoc> that parrot needed to utilize, and calls it directly. -+ -+And this avoids the misguided attempts of increasing security, which simply does nothing useful. -+ -+=cut -+ -+use strict; -+use warnings; -+ -+if ( not $ARGV[1] ) { -+ die "pod_extract <src> <target>"; -+} -+if ( not -e $ARGV[0] ) { -+ die "<src> $ARGV[0] does not exist"; -+} -+require Pod::Perldoc::ToPod; -+my $parser = Pod::Perldoc::ToPod->new(); -+open my $output, '>', $ARGV[1] or die "Cant write to $ARGV[1] $! $?"; -+$parser->parse_from_file( $ARGV[0], $output ); -+ -+1 -+ diff --git a/dev-lang/parrot/files/perldoc.patch b/dev-lang/parrot/files/perldoc.patch deleted file mode 100644 index 710148949435..000000000000 --- a/dev-lang/parrot/files/perldoc.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur parrot-5.5.0/config/auto/perldoc.pm parrot-5.5.0/config/auto/perldoc.pm ---- parrot-5.5.0/config/auto/perldoc.pm 2013-04-30 19:11:28.000000000 +0000 -+++ parrot-5.5.0/config/auto/perldoc.pm 2013-06-26 15:44:31.031675583 +0000 -@@ -38,7 +38,7 @@ - - my $cmd = File::Spec->catfile($conf->data->get('scriptdirexp_provisional'), q{perldoc}); - my ( $fh, $filename ) = tempfile( UNLINK => 1 ); -- my $content = capture_output("$cmd -ud $filename perldoc") || undef; -+ my $content = capture_output("$cmd -u perldoc > $filename") || undef; - - return 1 unless defined( $self->_initial_content_check($conf, $content) ); - -@@ -67,7 +67,7 @@ - if ( $new_perldoc ) { - $TEMP_pod_build .= <<"END"; - ops/$pod: ../src/ops/$ops --\t\$(PERLDOC) -ud ops/$pod ../src/ops/$ops -+\t\$(PERLDOC) -u ../src/ops/$ops > ops/$pod - \t\$(CHMOD) 0644 ops/$pod - \t\$(ADDGENERATED) "docs/\$\@" "[doc]" - -diff -Naur parrot-5.5.0/config/gen/makefiles/docs.in parrot-5.5.0/config/gen/makefiles/docs.in ---- parrot-5.5.0/config/gen/makefiles/docs.in 2013-06-15 17:36:41.000000000 +0000 -+++ parrot-5.5.0/config/gen/makefiles/docs.in 2013-06-26 15:39:41.109881123 +0000 -@@ -63,7 +63,7 @@ - $(TOUCH) doc-prep - - packfile-c.pod: ../src/packfile/api.c --#IF(new_perldoc): $(PERLDOC) -ud packfile-c.pod ../src/packfile/api.c -+#IF(new_perldoc): $(PERLDOC) -u ../src/packfile/api.c > packfile-c.pod - #ELSE: $(PERLDOC) -u ../src/packfile/api.c > packfile-c.pod - $(ADDGENERATED) "docs/$@" "[doc]" - diff --git a/dev-lang/parrot/parrot-5.10.0.ebuild b/dev-lang/parrot/parrot-5.10.0.ebuild deleted file mode 100644 index ca57b057ee29..000000000000 --- a/dev-lang/parrot/parrot-5.10.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-5.10.0.ebuild,v 1.2 2013/12/11 02:50:25 patrick Exp $ - -EAPI=3 - -inherit eutils multilib - -# weird failures -RESTRICT="test" - -DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages" -HOMEPAGE="http://www.parrot.org/" -SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/devel/${PV}/${P}.tar.gz" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre" - -RDEPEND="sys-libs/readline - opengl? ( media-libs/freeglut ) - nls? ( sys-devel/gettext ) - unicode? ( >=dev-libs/icu-2.6 ) - gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) - gmp? ( >=dev-libs/gmp-4.1.4 ) - ssl? ( dev-libs/openssl ) - pcre? ( dev-libs/libpcre ) - doc? ( dev-perl/JSON )" - -DEPEND="dev-lang/perl[doc?] - ${RDEPEND}" - -src_prepare() { - # Fix perldoc sandbox madness - epatch "${FILESDIR}/perldoc-5.10.patch" || die -} - -src_configure() { - myconf="--disable-rpath" - use unicode || myconf+=" --without-icu" - use ssl || myconf+=" --without-crypto" - use gdbm || myconf+=" --without-gdbm" - use nls || myconf+=" --without-gettext" - use gmp || myconf+=" --without-gmp" - use opengl || myconf+=" --without-opengl" - use pcre || myconf+=" --without-pcre" - - perl Configure.pl \ - --ccflags="${CFLAGS}" \ - --linkflags="${LDFLAGS}" \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --sysconfdir="${EPREFIX}"/etc \ - --sharedstatedir="${EPREFIX}"/var/lib/parrot \ - $myconf || die -} - -src_compile() { - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib - # occasionally dies in parallel make - emake -j1 || die - if use doc ; then - emake -j1 html || die - fi -} - -src_test() { - emake -j1 test || die -} - -src_install() { - emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die - dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins -r examples/* || die - fi - if use doc; then - insinto "/usr/share/doc/${PF}/editor" - doins -r editor || die - cd docs/html - dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ - pmc.html tools.html docs src tools || die - fi -} diff --git a/dev-lang/parrot/parrot-5.7.0.ebuild b/dev-lang/parrot/parrot-5.7.0.ebuild deleted file mode 100644 index 72505bab6ebe..000000000000 --- a/dev-lang/parrot/parrot-5.7.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-5.7.0.ebuild,v 1.1 2013/09/24 07:07:09 patrick Exp $ - -EAPI=3 - -inherit eutils multilib - -DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages" -HOMEPAGE="http://www.parrot.org/" -SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/devel/${PV}/${P}.tar.gz" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre" - -RDEPEND="sys-libs/readline - opengl? ( media-libs/freeglut ) - nls? ( sys-devel/gettext ) - unicode? ( >=dev-libs/icu-2.6 ) - gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) - gmp? ( >=dev-libs/gmp-4.1.4 ) - ssl? ( dev-libs/openssl ) - pcre? ( dev-libs/libpcre )" - -DEPEND="dev-lang/perl[doc?] - ${RDEPEND}" - -src_prepare() { - # Fix for #404195 - pcre detection is wonky - sed -i 's:libpcre.so.0:libpcre.so.1:' runtime/parrot/library/pcre.pir || die "Couldn't fix pcre location" - # Fix perldoc sandbox madness - epatch "${FILESDIR}/perldoc.patch" || die -} - -src_configure() { - myconf="--disable-rpath" - use unicode || myconf+=" --without-icu" - use ssl || myconf+=" --without-crypto" - use gdbm || myconf+=" --without-gdbm" - use nls || myconf+=" --without-gettext" - use gmp || myconf+=" --without-gmp" - use opengl || myconf+=" --without-opengl" - use pcre || myconf+=" --without-pcre" - - perl Configure.pl \ - --ccflags="${CFLAGS}" \ - --linkflags="${LDFLAGS}" \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --sysconfdir="${EPREFIX}"/etc \ - --sharedstatedir="${EPREFIX}"/var/lib/parrot \ - $myconf || die -} - -src_compile() { - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib - # occasionally dies in parallel make - emake -j1 || die - if use doc ; then - emake -j1 html || die - fi -} - -src_test() { - emake -j1 test || die -} - -src_install() { - emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die - dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins -r examples/* || die - fi - if use doc; then - insinto "/usr/share/doc/${PF}/editor" - doins -r editor || die - cd docs/html - dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ - pmc.html tools.html docs src tools || die - fi -} diff --git a/dev-lang/parrot/parrot-6.0.0.ebuild b/dev-lang/parrot/parrot-6.0.0.ebuild deleted file mode 100644 index 5b544e7d02e7..000000000000 --- a/dev-lang/parrot/parrot-6.0.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-6.0.0.ebuild,v 1.1 2014/01/27 05:40:13 patrick Exp $ - -EAPI=3 - -inherit eutils multilib - -# weird failures -RESTRICT="test" - -DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages" -HOMEPAGE="http://www.parrot.org/" -SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/supported/${PV}/${P}.tar.gz" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre" - -RDEPEND="sys-libs/readline - opengl? ( media-libs/freeglut ) - nls? ( sys-devel/gettext ) - unicode? ( >=dev-libs/icu-2.6 ) - gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) - gmp? ( >=dev-libs/gmp-4.1.4 ) - ssl? ( dev-libs/openssl ) - pcre? ( dev-libs/libpcre ) - doc? ( dev-perl/JSON )" - -DEPEND="dev-lang/perl[doc?] - ${RDEPEND}" - -src_prepare() { - # Fix perldoc sandbox madness - epatch "${FILESDIR}/perldoc-5.10.patch" || die -} - -src_configure() { - myconf="--disable-rpath" - use unicode || myconf+=" --without-icu" - use ssl || myconf+=" --without-crypto" - use gdbm || myconf+=" --without-gdbm" - use nls || myconf+=" --without-gettext" - use gmp || myconf+=" --without-gmp" - use opengl || myconf+=" --without-opengl" - use pcre || myconf+=" --without-pcre" - - perl Configure.pl \ - --ccflags="${CFLAGS}" \ - --linkflags="${LDFLAGS}" \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --sysconfdir="${EPREFIX}"/etc \ - --sharedstatedir="${EPREFIX}"/var/lib/parrot \ - $myconf || die -} - -src_compile() { - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib - # occasionally dies in parallel make - emake -j1 || die - if use doc ; then - emake -j1 html || die - fi -} - -src_test() { - emake -j1 test || die -} - -src_install() { - emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die - dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins -r examples/* || die - fi - if use doc; then - insinto "/usr/share/doc/${PF}/editor" - doins -r editor || die - cd docs/html - dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ - pmc.html tools.html docs src tools || die - fi -} |