Version bump, bug 101858, thanks Adrian

(Portage version: 2.0.51.22-r1)

12 files changed, 98 insertions, 115 deletions

diff --git a/dev-lang/parrot/ChangeLog b/dev-lang/parrot/ChangeLog
index 346adb053984..7c449bb54b21 100644
--- a/dev-lang/parrot/ChangeLog
+++ b/dev-lang/parrot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/parrot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.6 2005/07/01 00:22:27 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.7 2005/08/15 06:30:56 mcummings Exp $
+
+*parrot-0.2.3 (15 Aug 2005)
+
+  15 Aug 2005; Michael Cummings <mcummings@gentoo.org>
+  files/mod_parrot.patch, +files/parrot-config.patch, +files/root.in.patch,
+  -parrot-0.1.1.ebuild, -parrot-0.1.2.ebuild, -parrot-0.2.1.ebuild,
+  +parrot-0.2.3.ebuild:
+  Version bump, bug 101858, thanks Adrian
 
 *parrot-0.2.1 (01 Jul 2005)
 
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 8e05c392dd5b..2ea907cbe43a 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,19 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 087cc21885de744c3ecc51a6ae1c32b0 parrot-0.1.2.ebuild 1487
-MD5 0127bae315429503b0149322fd09f640 parrot-0.1.1.ebuild 1097
 MD5 2a07721ae678695fcda05cd1bcda4a43 ChangeLog 1198
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 0127bae315429503b0149322fd09f640 parrot-0.1.1.ebuild 1097
+MD5 087cc21885de744c3ecc51a6ae1c32b0 parrot-0.1.2.ebuild 1487
 MD5 e4275488c1eb9769b76c30173337e742 parrot-0.2.1.ebuild 1751
-MD5 bb2ee3162424592150ab37c417374ceb files/mod_parrot.patch 226
+MD5 afde73e47e6ecbfbd40b779af7c1d301 parrot-0.2.3.ebuild 2156
+MD5 1ac50a47aab4a14fbd9f47f929ee33c8 files/mod_parrot.patch 293
 MD5 75fbd20b4daec7e1b315a172ad60c64f files/digest-parrot-0.1.1 65
 MD5 33b986910cc59316976efc38da8ab47c files/digest-parrot-0.1.2 65
 MD5 e973d8e474a6da7a82f7d20c2d496a1c files/digest-parrot-0.2.1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1tQgBXaUFmZvwyMRAjmqAKCoBWF+9YUYLkr0C7hqHXBTMTKPUwCbBgrp
-OnKXh7eRMC153hGXJgi6RSA=
-=bJDT
------END PGP SIGNATURE-----
+MD5 173cae8d616eb7a79b78c15e34920888 files/parrot-config.patch 569
+MD5 3749a364b06115bfe0df40a6a88bb434 files/root.in.patch 1264
+MD5 6fefa983d0557ec5599f54babc66d7df files/digest-parrot-0.2.3 65
diff --git a/dev-lang/parrot/files/digest-parrot-0.1.1 b/dev-lang/parrot/files/digest-parrot-0.1.1
deleted file mode 100644
index 1d3b974f49fb..000000000000
--- a/dev-lang/parrot/files/digest-parrot-0.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39991aee98df7b1249e44cced43403e3 parrot-0.1.1.tar.gz 8878237
diff --git a/dev-lang/parrot/files/digest-parrot-0.1.2 b/dev-lang/parrot/files/digest-parrot-0.1.2
deleted file mode 100644
index c91533e3fc1c..000000000000
--- a/dev-lang/parrot/files/digest-parrot-0.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1fb2322b661832caa08a08918c4bb9b parrot-0.1.2.tar.gz 9036672
diff --git a/dev-lang/parrot/files/digest-parrot-0.2.1 b/dev-lang/parrot/files/digest-parrot-0.2.1
deleted file mode 100644
index e860d9c08f18..000000000000
--- a/dev-lang/parrot/files/digest-parrot-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf1ff580db7954c23edd341c23768bd3 parrot-0.2.1.tar.gz 2745687
diff --git a/dev-lang/parrot/files/digest-parrot-0.2.3 b/dev-lang/parrot/files/digest-parrot-0.2.3
new file mode 100644
index 000000000000..8730add26ca4
--- /dev/null
+++ b/dev-lang/parrot/files/digest-parrot-0.2.3
@@ -0,0 +1 @@
+MD5 3026f948fa5b8003fb56a832fc44856b parrot-0.2.3.tar.gz 2829461
diff --git a/dev-lang/parrot/files/mod_parrot.patch b/dev-lang/parrot/files/mod_parrot.patch
index df2197e8d9ab..4056a7f4a7b7 100644
--- a/dev-lang/parrot/files/mod_parrot.patch
+++ b/dev-lang/parrot/files/mod_parrot.patch
@@ -1,14 +1,22 @@
---- src/call_list.txt	2005-05-08 10:46:37.000000000 +0200
-+++ call_list.in.txt	2005-05-10 22:19:26.000000000 +0200
-@@ -281,6 +281,11 @@
+--- src/call_list.txt	2005-07-12 15:08:57.000000000 +0200
++++ src/call_list.txt.new	2005-08-06 13:26:32.000000000 +0200
+@@ -285,6 +285,19 @@
  i	tp
  v	tiiiptt
  i	Pip
 +p   J
++t   J
 +t   Jp
++p   Jp
 +t   Jpt
 +i   Jp
++i   Jpi
 +i   JPip
++v   ptt
++v   pit
++i   Jpii
++i   ip
++
  
  # PyBuiltins
  P	JOPP
diff --git a/dev-lang/parrot/files/parrot-config.patch b/dev-lang/parrot/files/parrot-config.patch
new file mode 100644
index 000000000000..cb474bb0de73
--- /dev/null
+++ b/dev-lang/parrot/files/parrot-config.patch
@@ -0,0 +1,21 @@
+--- parrot-0.2.3/parrot-config.imc	2005-04-11 11:54:11.000000000 +0200
++++ parrot/parrot-config.imc	2005-08-06 13:33:29.000000000 +0200
+@@ -27,9 +27,11 @@
+     .local int argc
+     argc = argv
+     if argc < 2 goto usage
+-    .local pmc conf_hash
++    .local pmc interp, conf_hash
+     .local string key
+-    conf_hash = _config()
++    .include "iglobals.pasm"
++    interp = getinterp
++    conf_hash = interp[.IGLOBALS_CONFIG_HASH]
+     .local int i
+     i = 1
+ loop:
+@@ -70,4 +72,3 @@
+     printerr ": config-key\n"
+     exit 1
+ .end
+-   .include "library/config.imc"
diff --git a/dev-lang/parrot/files/root.in.patch b/dev-lang/parrot/files/root.in.patch
new file mode 100644
index 000000000000..b93a020afe7b
--- /dev/null
+++ b/dev-lang/parrot/files/root.in.patch
@@ -0,0 +1,30 @@
+--- ../parrot-0.2.3/config/gen/makefiles/root.in	2005-07-29 12:07:33.000000000 +0200
++++ config/gen/makefiles/root.in	2005-08-07 17:40:26.000000000 +0200
+@@ -1,5 +1,5 @@
+ # Copyright: 2001-2005 The Perl Foundation.  All Rights Reserved.
+-# $Id: root.in.patch,v 1.1 2005/08/15 06:30:56 mcummings Exp $
++# $Id: root.in.patch,v 1.1 2005/08/15 06:30:56 mcummings Exp $
+ 
+ ###############################################################################
+ # NOTES:
+@@ -656,10 +656,8 @@
+ runtime/parrot/include/config.fpmc : myconfig config_lib.pasm $(MINIPARROT)
+ 	@echo Invoking Parrot to generate runtime/parrot/include/config.fpmc --cross your fingers
+ 	$(MINIPARROT) config_lib.pasm > $@
+-	@echo If the next line prints $(VERSION), it did help.
+-	$(MINIPARROT) parrot-config.imc VERSION DEVEL
+ 
+-parrot.def :
++parrot.def : build_tools\parrotdef.pl
+ 	perl build_tools/parrotdef.pl
+ 
+ $(PARROT) : $(IMCC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+@@ -1029,6 +1027,8 @@
+ $(OPS_DIR)/core_ops_switch.c $(INC_DIR)/oplib/core_ops_switch.h : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC_DIR)/config.h lib/Parrot/OpLib/core.pm
+ 	$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl CSwitch --core
+ 
++build_tools\parrotdef.pl : $(CLASS_PMC_FILES)
++
+ ${TEMP_cg_c}
+ 
+ ${TEMP_gc_c}
diff --git a/dev-lang/parrot/parrot-0.1.1.ebuild b/dev-lang/parrot/parrot-0.1.1.ebuild
deleted file mode 100644
index 598409509418..000000000000
--- a/dev-lang/parrot/parrot-0.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-0.1.1.ebuild,v 1.6 2005/07/14 21:07:36 agriffis Exp $
-
-DESCRIPTION="The virtual machine that perl6 relies on."
-HOMEPAGE="http://www.parrotcode.org/"
-SRC_URI="mirror://cpan/authors/id/L/LT/LTOETSCH/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE=""
-
-#this ebuild has been tested with the given perl
-#if we trust the README then 5.6 should also be ok.
-DEPEND=">=dev-lang/perl-5.8.5-r2
-	>=dev-libs/icu-2.6"
-
-src_compile() {
-	#This configure defines the DESTDIR for make.
-	perl Configure.pl --prefix=${D}|| die "Perl ./Configure.pl failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-
-	#The prefix was set by Configure.pl - see src_compile().
-	make install BUILDPREFIX=${D} PREFIX=/usr/lib/${P} || die
-	dodir /usr/bin
-	dosym /usr/lib/${P}/bin/parrot /usr/bin
-
-	#TODO: put the doc (pod) and examples in a special dir
-	#/docs/ /examples/
-	#Note: this is not yet supported by the Makefile
-
-	#TODO:
-	#dodoc ...
-}
diff --git a/dev-lang/parrot/parrot-0.1.2.ebuild b/dev-lang/parrot/parrot-0.1.2.ebuild
deleted file mode 100644
index 60330923164a..000000000000
--- a/dev-lang/parrot/parrot-0.1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-0.1.2.ebuild,v 1.4 2005/07/14 21:07:36 agriffis Exp $
-
-inherit base eutils
-
-DESCRIPTION="The virtual machine that perl6 relies on."
-HOMEPAGE="http://www.parrotcode.org/"
-SRC_URI="mirror://cpan/authors/id/L/LT/LTOETSCH/${S}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE=""
-
-#this ebuild has been tested with the given perl
-#if we trust the README then 5.6 should also be ok.
-DEPEND=">=dev-lang/perl-5.8.5-r2
-		>=dev-libs/icu-2.6"
-
-src_compile()	{
-	#This configure defines the DESTDIR for make.
-	perl Configure.pl --prefix=${D}|| die "Perl ./Configure.pl failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install()	{
-	#The prefix was set by Configure.pl - see src_compile().
-	make install BUILDPREFIX=${D} PREFIX=/usr/lib/${P} || die
-	dodir /usr/bin
-	dosym /usr/lib/${P}/bin/parrot /usr/bin
-
-	#copy some special files escpecially mod_parrot-0.1
-	#maybe this should depend on a USE-Flag i.e. apache
-
-	#install libparrot.a into /usr/lib/
-	dolib.a blib/lib/*.a
-	dosym /usr/lib/${P}/bin/parrot /usr/lib/${P}/parrot
-
-	insinto /usr/lib/${P}
-	doins config_lib.pasm
-	dodir /usr/lib/${P}/include
-	dodir /usr/lib/${P}/include/parrot
-	insinto /usr/lib/${P}/include/parrot/
-	doins ${S}/include/parrot/*.h
-
-	dodir /usr/share/doc/${P}
-	dodoc README RESPONSIBLE_PARTIES ABI_CHANGES ChangeLog CREDITS DEVELOPING
-}
diff --git a/dev-lang/parrot/parrot-0.2.1.ebuild b/dev-lang/parrot/parrot-0.2.3.ebuild
index 16f44bd7ff93..aef74abc73aa 100644
--- a/dev-lang/parrot/parrot-0.2.1.ebuild
+++ b/dev-lang/parrot/parrot-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-0.2.1.ebuild,v 1.3 2005/07/14 21:07:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-0.2.3.ebuild,v 1.1 2005/08/15 06:30:56 mcummings Exp $
 
 inherit base eutils
 
@@ -11,11 +11,9 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="gdbm gmp python"
+IUSE="test"
 
-#this ebuild has been tested with the given perl
-#if we trust the README then 5.6 should also be ok.
-DEPEND=">=dev-lang/perl-5.8.5-r2
+DEPEND="dev-lang/perl
 		>=dev-libs/icu-2.6
 		gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
 		gmp? ( >=dev-libs/gmp-4.1.4 )
@@ -26,12 +24,16 @@ DEPEND=">=dev-lang/perl-5.8.5-r2
 src_unpack ()   {
 	unpack ${A}
 	cd ${S}
+	#see https://rt.perl.org/rt3/Ticket/Display.html?id=36818
 	epatch ${FILESDIR}/mod_parrot.patch
+	#see https://rt.perl.org/rt3/Ticket/Display.html?id=36812
+	epatch ${FILESDIR}/root.in.patch
+	epatch ${FILESDIR}/parrot-config.patch
 }
 
 src_compile()	{
 	#This configure defines the DESTDIR for make.
-	perl Configure.pl --prefix=${D}|| die "Perl ./Configure.pl failed"
+	perl Configure.pl --prefix=/usr/lib/${P} || die "Perl ./Configure.pl failed"
 	emake -j1 || die "emake failed"
 }
 
@@ -52,12 +54,21 @@ src_install()	{
 	insinto /usr/lib/${P}
 	doins config_lib.pasm
 
-	#copy Header files
+	#copy Header files - this should be done by "make install"
 	dodir /usr/lib/${P}/include
 	dodir /usr/lib/${P}/include/parrot
 	insinto /usr/lib/${P}/include/parrot/
 	doins ${S}/include/parrot/*.h
 
+	#necessary for mod_parrot-0.3
+	dodir /usr/lib/${P}/src/
+	insinto /usr/lib/${P}/src/
+	doins ${S}/src/parrot_config.o
+
 	dodir /usr/share/doc/${P}
-	dodoc README RESPONSIBLE_PARTIES ABI_CHANGES ChangeLog CREDITS
+	dodoc README RESPONSIBLE_PARTIES ABI_CHANGES ChangeLog CREDITS NEWS
+}
+
+src_test()	{
+	emake test || die "test failed"
 }