Update to 2.0.0 and clean up these ebuilds #93233

(Portage version: 2.0.51.22-r1)

6 files changed, 155 insertions, 88 deletions

diff --git a/dev-lang/fpc/ChangeLog b/dev-lang/fpc/ChangeLog
index d7243a12c96b..c3bb7391d30c 100644
--- a/dev-lang/fpc/ChangeLog
+++ b/dev-lang/fpc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/fpc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.16 2005/04/19 10:30:18 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.17 2005/06/25 22:26:32 agriffis Exp $
+
+*fpc-2.0.0 (25 Jun 2005)
+
+  25 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  fpc-1.9.5_pre20040820.ebuild, fpc-2.0.0_rc2.ebuild, +fpc-2.0.0.ebuild:
+  Update to 2.0.0 and clean up these ebuilds #93233
 
   19 Apr 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml:
   Remove retired developer from metadata.xml.
diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest
index bd418e0d0fbb..7d5b79bbe951 100644
--- a/dev-lang/fpc/Manifest
+++ b/dev-lang/fpc/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 e0a99b6258d6937dbd867a5f152602b8 fpc-1.9.5_pre20040820.ebuild 1674
+MD5 5b518d783273c513ae377b63d6aaa859 fpc-2.0.0_rc2.ebuild 2254
 MD5 5737ea0ddc4369d249d6f6d6b079fd2e ChangeLog 1474
-MD5 feca19be90abeecd1b0b2f3bf6e5ba32 fpc-2.0.0_rc2.ebuild 2284
-MD5 f6b0ed26bfd2aafee562a2c1dabc2094 fpc-1.9.5_pre20040820.ebuild 1678
-MD5 765515c95e92cbeb5061c5eb1978eb68 files/digest-fpc-1.9.5_pre20040820 58
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 e30b2480c61003664d52e3522cb235cf fpc-2.0.0.ebuild 2314
 MD5 35b2220a69ffb4f90c2d27e905024582 files/digest-fpc-2.0.0_rc2 126
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZN3ajUHll2nfF60RApA7AJ4/Q3vxH4uJtGL9WjCIv9VJSFdSbwCeK8Cx
-IESKiNL6Gj9iywxlFmSJc/s=
-=WmkJ
------END PGP SIGNATURE-----
+MD5 2e4de16cb96f4d081946df091d8a50a1 files/digest-fpc-2.0.0 141
+MD5 765515c95e92cbeb5061c5eb1978eb68 files/digest-fpc-1.9.5_pre20040820 58
diff --git a/dev-lang/fpc/files/digest-fpc-2.0.0 b/dev-lang/fpc/files/digest-fpc-2.0.0
new file mode 100644
index 000000000000..413073422791
--- /dev/null
+++ b/dev-lang/fpc/files/digest-fpc-2.0.0
@@ -0,0 +1,2 @@
+MD5 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz 21040763
+MD5 5f0a5fba632a811dcfdafe0ff80476a3 fpc-2.0.0.i386-linux.tar 21360640
diff --git a/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild b/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild
index 3a2e6a1ade6f..dfb46e1d6ab9 100644
--- a/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild
+++ b/dev-lang/fpc/fpc-1.9.5_pre20040820.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/fpc/fpc-1.9.5_pre20040820.ebuild,v 1.1 2005/01/20 22:45:19 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild,v 1.2 2005/06/25 22:26:32 agriffis Exp $
 
 inherit eutils
 
@@ -21,26 +21,22 @@ src_compile() {
 
 	einfo "Building the fpc compiler and units"
 	# have to use -j1 as it doesn't seem to like -j2+
-	emake -j1 \
-	build \
-	OS_TARGET=linux \
-	PP=${S}/ppc386 \
-	PREFIX=${D}/usr \
-	|| die "Free Pascal Compiler build process failed!"
+	emake -j1 build \
+		OS_TARGET=linux \
+		PP=${S}/ppc386 \
+		PREFIX=${D}/usr \
+		|| die "Free Pascal Compiler build process failed!"
 }
 
 src_install() {
-
 	einfo "Installing the fpc compiler and units"
-	emake -j1 \
-	install \
-	OS_TARGET=linux \
-	PP=${S}/ppc386 \
-	PREFIX=${D}/usr \
-	|| die "Free Pascal Compiler install failed!"
-
-	if use doc
-	then
+	make install \
+		OS_TARGET=linux \
+		PP=${S}/ppc386 \
+		PREFIX=${D}/usr \
+		|| die "Free Pascal Compiler install failed!"
+
+	if use doc; then
 		#install the html docs
 		einfo "Installing html docs"
 		mkdir ${D}/usr/share/doc/fpc-${FPC_V}/html
diff --git a/dev-lang/fpc/fpc-2.0.0.ebuild b/dev-lang/fpc/fpc-2.0.0.ebuild
new file mode 100644
index 000000000000..53b9a0a3a085
--- /dev/null
+++ b/dev-lang/fpc/fpc-2.0.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.0.ebuild,v 1.1 2005/06/25 22:26:32 agriffis Exp $
+
+inherit eutils
+
+MY_PV="2.0.0"
+STABLE="2.0.0"
+ARCH="386"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
+KEYWORDS="~x86"
+DESCRIPTION="Free Pascal Compiler"
+HOMEPAGE="http://www.freepascal.org/"
+IUSE=""
+SRC_URI="mirror://sourceforge/freepascal/fpc-${MY_PV}.source.tar.gz
+	 mirror://sourceforge/freepascal/fpc-${MY_PV}.i386-linux.tar"
+DEPEND="!dev-lang/fpc-bin"
+RDEPEND="!dev-lang/fpc-bin"
+S=${WORKDIR}/fpc
+
+src_unpack() {
+	unpack ${A} || die "Unpacking ${A} failed!"
+	tar -xf binary.i386-linux.tar || die "Unpacking binary.i386-linux.tar failed!"
+	tar -zxf base.i386-linux.tar.gz || die "Unpacking base.i386-linux.tar.gz failed!"
+}
+
+set_pp() {
+	case $1 in
+		bootstrap) pp=${WORKDIR}/lib/fpc/${STABLE}/ppc${ARCH} ;;
+		new) pp=${S}/compiler/ppc${ARCH} ;;
+		*) die "set_pp: unknown argument: $1" ;;
+	esac
+}
+
+src_compile() {
+	local pp d
+
+	# Using the bootstrap compiler.
+	set_pp bootstrap
+	emake -j1 compiler_cycle PP=${pp} \
+		|| die "make compiler_cycle failed!"
+
+	# Using the new compiler.
+	set_compiler new
+
+	# We cannot do this at once!
+	for d in rtl packages fcl; do
+		emake -j1 -C $d clean PP=${pp} || die "make -C $d clean failed!"
+	done
+
+	emake -j1 rtl packages_base_all fcl packages_extra_all PP=${pp} \
+		|| die "make rtl packages_base_all fcl packages_extra_all failed!"
+
+	emake -j1 utils PP=${pp} DATA2INC=${S}/utils/data2inc \
+		|| die "make utils failed!"
+}
+
+src_install() {
+	local pp
+	set_pp new
+
+	make compiler_install rtl_install fcl_install packages_install utils_install \
+		PP=${pp} FPCMAKE=${S}/utils/fpcm/fpcmake INSTALL_PREFIX=${D}usr \
+		|| die "make install failed!"
+}
+
+pkg_preinst() {
+	${IMAGE}/usr/lib/fpc/${MY_PV}/samplecfg /usr/lib/fpc/${MY_PV} ${IMAGE}/etc
+	ln -s ../lib/fpc/${MY_PV}/ppc386 ${IMAGE}/usr/bin/
+}
+
+pkg_postinst() {
+	# Using ewarn - it is really important for other ebuilds (e.g. Lazarus)
+	if [ -e /etc/._cfg0000_fpc.cfg ]; then
+		echo
+		ewarn "Make sure you etc-update /etc/fpc.cfg"
+		ewarn "Otherwise FPC will not work correctly."
+		echo
+		ebeep
+	fi
+	einfo "/usr/bin/ppc386 now points to the new binary:"
+	einfo "			/usr/lib/${PN}/${MY_PV}/ppc${ARCH}"
+}
diff --git a/dev-lang/fpc/fpc-2.0.0_rc2.ebuild b/dev-lang/fpc/fpc-2.0.0_rc2.ebuild
index dc60262fd6dd..e00982fa771e 100644
--- a/dev-lang/fpc/fpc-2.0.0_rc2.ebuild
+++ b/dev-lang/fpc/fpc-2.0.0_rc2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.0_rc2.ebuild,v 1.2 2005/03/31 01:55:54 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.0_rc2.ebuild,v 1.3 2005/06/25 22:26:32 agriffis Exp $
 
 inherit eutils
 
-MY_P="1.9.8"
+MY_PV="1.9.8"
 STABLE="1.0.10"
 ARCH="386"
 
@@ -14,85 +14,71 @@ KEYWORDS="~x86"
 DESCRIPTION="Free Pascal Compiler"
 HOMEPAGE="http://www.freepascal.org/"
 IUSE=""
-SRC_URI="ftp://ftp.freepascal.org/pub/fpc/beta/source-${MY_P}/fpc-${MY_P}.source.tar.gz
+SRC_URI="ftp://ftp.freepascal.org/pub/fpc/beta/source-${MY_PV}/fpc-${MY_PV}.source.tar.gz
 	 ftp://ftp.freepascal.org/pub/fpc/dist/Linux/i386/separate/binary.tar"
 DEPEND="!dev-lang/fpc-bin"
 RDEPEND="!dev-lang/fpc-bin"
 S=${WORKDIR}/fpc
 
-src_unpack () {
+src_unpack() {
 	unpack ${A} || die "Unpacking ${A} failed!"
 	tar -zxf baselinux.tar.gz || die "Unpacking baselinux.tar.gz failed!"
 }
 
-src_compile () {
+set_pp() {
+	case $1 in
+		bootstrap) pp=${WORKDIR}/lib/fpc/${STABLE}/ppc${ARCH} ;;
+		new) pp=${S}/compiler/ppc${ARCH} ;;
+		*) die "set_pp: unknown argument: $1" ;;
+	esac
+}
+
+src_compile() {
+	local pp d
+
 	# Using the bootstrap compiler.
-	COMPILER=${WORKDIR}/lib/fpc/${STABLE}/ppc${ARCH}
-	emake -j1 \
-		compiler_cycle \
-	PP=${COMPILER} \
+	set_pp bootstrap
+	emake -j1 compiler_cycle PP=${pp} \
 		|| die "make compiler_cycle failed!"
 
 	# Using the new compiler.
-	COMPILER=${S}/compiler/ppc${ARCH}
+	set_compiler new
 
 	# We cannot do this at once!
-	clean_subdir "rtl"
-	clean_subdir "packages"
-	clean_subdir "fcl"
+	for d in rtl packages fcl; do
+		emake -j1 -C $d clean PP=${pp} || die "make -C $d clean failed!"
+	done
 
-	emake -j1 \
-		rtl \
-		packages_base_all \
-		fcl \
-		packages_extra_all \
-	PP=${COMPILER} \
-	|| die "make rtl packages_base_all fcl packages_extra_all failed!"
+	emake -j1 rtl packages_base_all fcl packages_extra_all PP=${pp} \
+		|| die "make rtl packages_base_all fcl packages_extra_all failed!"
 
-	DATA2INC=${S}/utils/data2inc
-	emake -j1 \
-	utils \
-	PP=${COMPILER} \
-	DATA2INC=${DATA2INC} \
-	|| die "make utils failed!"
+	emake -j1 utils PP=${pp} DATA2INC=${S}/utils/data2inc \
+		|| die "make utils failed!"
 }
 
-src_install () {
-	FPCMAKE=${S}/utils/fpcm/fpcmake
-	emake -j1 \
-		compiler_install \
-		rtl_install \
-		fcl_install \
-		packages_install \
-		utils_install \
-	PP=${COMPILER} \
-	FPCMAKE=${FPCMAKE} \
-	INSTALL_PREFIX=${D}usr \
-	|| die "make compiler_install rtl_install fcl_install packages_install utils_install failed!"
+src_install() {
+	local pp
+	set_pp new
+
+	make compiler_install rtl_install fcl_install packages_install utils_install \
+		PP=${pp} FPCMAKE=${S}/utils/fpcm/fpcmake INSTALL_PREFIX=${D}usr \
+		|| die "make install failed!"
 }
 
-pkg_preinst () {
-	${D}usr/lib/fpc/${MY_P}/samplecfg /usr/lib/fpc/${MY_P} ${D}etc
-	ln -s ../lib/fpc/${MY_P}/ppc386 ${D}usr/bin/
+pkg_preinst() {
+	${IMAGE}/usr/lib/fpc/${MY_PV}/samplecfg /usr/lib/fpc/${MY_PV} ${IMAGE}/etc
+	ln -s ../lib/fpc/${MY_PV}/ppc386 ${IMAGE}/usr/bin/
 }
 
-pkg_postinst () {
-	# Using ewarn - it is really important for other ebuilds.
+pkg_postinst() {
+	# Using ewarn - it is really important for other ebuilds (e.g. Lazarus)
 	if [ -e /etc/._cfg0000_fpc.cfg ]; then
-		ewarn
-		ewarn "Make sure you update /etc/fpc.cfg !"
+		echo
+		ewarn "Make sure you etc-update /etc/fpc.cfg"
 		ewarn "Otherwise FPC will not work correctly."
-		ewarn
+		echo
 		ebeep
 	fi
-	einfo "/usr/bin/ppc386 now points to the new binary."
-	echo $D
-}
-
-clean_subdir() {
-	emake -j1 \
-	-C $1 \
-	clean \
-	PP=${COMPILER} \
-	|| die "make -C $1 clean failed!"
+	einfo "/usr/bin/ppc386 now points to the new binary:"
+	einfo "			/usr/lib/${PN}/${MY_PV}/ppc${ARCH}"
 }