Version bump

(Portage version: 2.1.1_rc1-r1)

6 files changed, 178 insertions, 2 deletions

diff --git a/dev-lang/fpc/ChangeLog b/dev-lang/fpc/ChangeLog
index 8e7faec10782..6b9172dfbf44 100644
--- a/dev-lang/fpc/ChangeLog
+++ b/dev-lang/fpc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/fpc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.29 2006/08/05 15:15:49 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.30 2006/08/30 18:55:30 truedfx Exp $
+
+*fpc-2.0.4 (30 Aug 2006)
+
+  30 Aug 2006; Harald van Dijk <truedfx@gentoo.org> metadata.xml,
+  +fpc-2.0.4.ebuild:
+  Version bump
 
   05 Aug 2006; Harald van Dijk <truedfx@gentoo.org> fpc-2.0.2.ebuild:
   Build & install FreeVision library
diff --git a/dev-lang/fpc/files/digest-fpc-2.0.0-r1 b/dev-lang/fpc/files/digest-fpc-2.0.0-r1
index 80ef9d18060f..58d159711d99 100644
--- a/dev-lang/fpc/files/digest-fpc-2.0.0-r1
+++ b/dev-lang/fpc/files/digest-fpc-2.0.0-r1
@@ -2,10 +2,14 @@ MD5 5f0a5fba632a811dcfdafe0ff80476a3 fpc-2.0.0.i386-linux.tar 21360640
 RMD160 b077d19b5042c2401333d9a225683197d4ac0f8e fpc-2.0.0.i386-linux.tar 21360640
 SHA256 18f017a6c5c1af5a3eaac4e1210d6ebc210eb3d2fbbe105efdbab2e5f4c9bfa2 fpc-2.0.0.i386-linux.tar 21360640
 MD5 7019384e09411902e530dfe55d4ff145 fpc-2.0.0.powerpc-linux.tar 22231040
+RMD160 93ec2e6664f14bfb1a4dae8995b73d194448b75c fpc-2.0.0.powerpc-linux.tar 22231040
+SHA256 18c0ec2eadf66e986f321402ad4d6d84e4d1a96276c003f3530cca07aec28e23 fpc-2.0.0.powerpc-linux.tar 22231040
 MD5 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz 21040763
 RMD160 b4636f22fd311a562635a3163d1e56647d66b4b6 fpc-2.0.0.source.tar.gz 21040763
 SHA256 d2751eb72d8a509e503cdd31a9e7ac6b5ac5c88016e001f8d009ee1f4fa6d459 fpc-2.0.0.source.tar.gz 21040763
 MD5 dd8925ce8ce93309456c3072e6e4d14d fpc-2.0.0.sparc-linux.tar 22272000
+RMD160 4dfc0da46b3d8c67671ddcb1aeb46f0b4fda3e7c fpc-2.0.0.sparc-linux.tar 22272000
+SHA256 a6929aea5e5c962a874beaba23f17b52b82001d1c5d6b384e51d92d5b27cbd41 fpc-2.0.0.sparc-linux.tar 22272000
 MD5 36270de604c6b5ad3af8aaa08143e88f fpc-2.0.0.x86_64-linux.tar 18380800
 RMD160 843a297def69d1baaa4c8bce78fb40d6ade285fa fpc-2.0.0.x86_64-linux.tar 18380800
 SHA256 6a0d19bb9f44fe2bbf8c070bd1281eed2e9b7874047370fe6f33c8cc607d9962 fpc-2.0.0.x86_64-linux.tar 18380800
diff --git a/dev-lang/fpc/files/digest-fpc-2.0.2 b/dev-lang/fpc/files/digest-fpc-2.0.2
index 22504b115f5c..df0a50df8be9 100644
--- a/dev-lang/fpc/files/digest-fpc-2.0.2
+++ b/dev-lang/fpc/files/digest-fpc-2.0.2
@@ -2,7 +2,11 @@ MD5 5f0a5fba632a811dcfdafe0ff80476a3 fpc-2.0.0.i386-linux.tar 21360640
 RMD160 b077d19b5042c2401333d9a225683197d4ac0f8e fpc-2.0.0.i386-linux.tar 21360640
 SHA256 18f017a6c5c1af5a3eaac4e1210d6ebc210eb3d2fbbe105efdbab2e5f4c9bfa2 fpc-2.0.0.i386-linux.tar 21360640
 MD5 7019384e09411902e530dfe55d4ff145 fpc-2.0.0.powerpc-linux.tar 22231040
+RMD160 93ec2e6664f14bfb1a4dae8995b73d194448b75c fpc-2.0.0.powerpc-linux.tar 22231040
+SHA256 18c0ec2eadf66e986f321402ad4d6d84e4d1a96276c003f3530cca07aec28e23 fpc-2.0.0.powerpc-linux.tar 22231040
 MD5 dd8925ce8ce93309456c3072e6e4d14d fpc-2.0.0.sparc-linux.tar 22272000
+RMD160 4dfc0da46b3d8c67671ddcb1aeb46f0b4fda3e7c fpc-2.0.0.sparc-linux.tar 22272000
+SHA256 a6929aea5e5c962a874beaba23f17b52b82001d1c5d6b384e51d92d5b27cbd41 fpc-2.0.0.sparc-linux.tar 22272000
 MD5 36270de604c6b5ad3af8aaa08143e88f fpc-2.0.0.x86_64-linux.tar 18380800
 RMD160 843a297def69d1baaa4c8bce78fb40d6ade285fa fpc-2.0.0.x86_64-linux.tar 18380800
 SHA256 6a0d19bb9f44fe2bbf8c070bd1281eed2e9b7874047370fe6f33c8cc607d9962 fpc-2.0.0.x86_64-linux.tar 18380800
diff --git a/dev-lang/fpc/files/digest-fpc-2.0.4 b/dev-lang/fpc/files/digest-fpc-2.0.4
new file mode 100644
index 000000000000..30503bd1be94
--- /dev/null
+++ b/dev-lang/fpc/files/digest-fpc-2.0.4
@@ -0,0 +1,15 @@
+MD5 dd8925ce8ce93309456c3072e6e4d14d fpc-2.0.0.sparc-linux.tar 22272000
+RMD160 4dfc0da46b3d8c67671ddcb1aeb46f0b4fda3e7c fpc-2.0.0.sparc-linux.tar 22272000
+SHA256 a6929aea5e5c962a874beaba23f17b52b82001d1c5d6b384e51d92d5b27cbd41 fpc-2.0.0.sparc-linux.tar 22272000
+MD5 d826aab69c98b9efe30398ff63e4c9d9 fpc-2.0.4.i386-linux.tar 23818240
+RMD160 582a1eb3fe723d12f9aa15c06de23e1826261720 fpc-2.0.4.i386-linux.tar 23818240
+SHA256 debd4497b46a3402d47a0f4b104d6f386da7468297d6120944c52dabc4fe5a2c fpc-2.0.4.i386-linux.tar 23818240
+MD5 6ec5302fe446d94e5aaa1e159b0d65df fpc-2.0.4.powerpc-linux.tar 24330240
+RMD160 8623b3c2ad59e8895fb329593f1c77e2bf268ac9 fpc-2.0.4.powerpc-linux.tar 24330240
+SHA256 9927c0aff1b46af55ba7e39df9cde465bddd02242610df373659ec32076f4e0b fpc-2.0.4.powerpc-linux.tar 24330240
+MD5 3bbfe4c061ebd40502789eccef069d7c fpc-2.0.4.x86_64-linux.tar 22579200
+RMD160 c361ec237cf2e54d2462a7e987e5749898ed7346 fpc-2.0.4.x86_64-linux.tar 22579200
+SHA256 619ce0b4e93d0e8f6334443f2a950bfa1281b2c4d21033b8a54e84942b2406ee fpc-2.0.4.x86_64-linux.tar 22579200
+MD5 1ff8b80d1f5f564983bb4e1550b8b53a fpcbuild-2.0.4.tar.gz 26749033
+RMD160 7f9d8776fff666e4d946c059dc2167c2ec4d0f0b fpcbuild-2.0.4.tar.gz 26749033
+SHA256 4cb307dcb0d0d5cf0a3d0cd6abca917c7002ffb1fc96363ce42121dfa9aeaf6b fpcbuild-2.0.4.tar.gz 26749033
diff --git a/dev-lang/fpc/fpc-2.0.4.ebuild b/dev-lang/fpc/fpc-2.0.4.ebuild
new file mode 100644
index 000000000000..40b93d041361
--- /dev/null
+++ b/dev-lang/fpc/fpc-2.0.4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.4.ebuild,v 1.1 2006/08/30 18:55:30 truedfx Exp $
+
+inherit eutils
+
+PV_BIN="2.0.4"
+S="${WORKDIR}/fpcbuild_${PV}_exp/fpcsrc"
+
+HOMEPAGE="http://www.freepascal.org/"
+DESCRIPTION="Free Pascal Compiler"
+SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
+	x86? ( mirror://sourceforge/freepascal/fpc-${PV_BIN}.i386-linux.tar )
+	sparc? ( mirror://sourceforge/freepascal/fpc-2.0.0.sparc-linux.tar )
+	ppc? ( mirror://sourceforge/freepascal/fpc-${PV_BIN}.powerpc-linux.tar )
+	amd64? ( mirror://sourceforge/freepascal/fpc-${PV_BIN}.x86_64-linux.tar )"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc source"
+
+DEPEND="!dev-lang/fpc-bin
+	!dev-lang/fpc-source
+	doc? ( virtual/tetex )"
+RDEPEND="!dev-lang/fpc-bin
+	!dev-lang/fpc-source"
+
+src_unpack() {
+	case ${ARCH} in
+	x86)	FPC_ARCH="i386" ;;
+	ppc)	FPC_ARCH="powerpc" ;;
+	amd64)	FPC_ARCH="x86_64" ;;
+	sparc)	FPC_ARCH="sparc" ;;
+	*)	die "This ebuild doesn't support ${ARCH}." ;;
+	esac
+
+	unpack ${A} || die "Unpacking ${A} failed!"
+
+	tar -xf binary.${FPC_ARCH}-linux.tar || die "Unpacking binary.${FPC_ARCH}-linux.tar failed!"
+	tar -xzf base.${FPC_ARCH}-linux.tar.gz || die "Unpacking base.${FPC_ARCH}-linux.tar.gz failed!"
+
+	# Don't strip
+	find "${S}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die
+}
+
+set_pp() {
+	case ${ARCH} in
+	x86)	FPC_ARCH="386" ;;
+	ppc)	FPC_ARCH="powerpc" ;;
+	amd64)	FPC_ARCH="x86_64" ;;
+	sparc)	FPC_ARCH="sparc" ;;
+	*)	die "This ebuild doesn't support ${ARCH}." ;;
+	esac
+
+	case ${1} in
+	bootstrap)	pp=${WORKDIR}/lib/fpc/${PV_BIN}/ppc${FPC_ARCH} ;;
+	new) 	pp=${S}/compiler/ppc${FPC_ARCH} ;;
+	*)	die "set_pp: unknown argument: ${1}" ;;
+	esac
+}
+
+src_compile() {
+	local pp
+
+	# Using the bootstrap compiler.
+	set_pp bootstrap
+
+	emake -j1 PP="${pp}" compiler_cycle || die "make compiler_cycle failed!"
+
+	# Save new compiler from cleaning...
+	cp "${S}"/compiler/ppc${FPC_ARCH} "${S}"/ppc${FPC_ARCH}.new
+
+	# ...rebuild with current version...
+	emake -j1 PP="${S}"/ppc${FPC_ARCH}.new compiler_cycle || die "make compiler_cycle failed!"
+
+	# ..and clean up afterwards
+	rm "${S}"/ppc${FPC_ARCH}.new
+
+	# Using the new compiler.
+	set_pp new
+
+	emake -j1 PP="${pp}" rtl_clean || die "make rtl_clean failed"
+
+	emake -j1 PP="${pp}" rtl packages_base_all fcl fv packages_extra_all utils || die "make failed"
+
+	if use doc ; then
+		cd "${S}"/../fpcdocs
+		emake -j1 pdf || die "make pdf failed!"
+	fi
+}
+
+src_install() {
+	local pp
+	set_pp new
+
+	set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/fpcmake" \
+		INSTALL_PREFIX="${D}"usr \
+		INSTALL_DOCDIR="${D}"usr/share/doc/${P} \
+		INSTALL_MANDIR="${D}"usr/share/man \
+		INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source
+
+	emake -j1 "$@" compiler_install rtl_install fcl_install fv_install \
+		packages_install utils_install || die "make install failed!"
+
+	dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH}
+
+	if ! has nodoc ${FEATURES} ; then
+		cd "${S}"/../install/doc
+		emake -j1 "$@" installdoc || die "make installdoc failed!"
+	fi
+
+	if ! has noman ${FEATURES} ; then
+		cd "${S}"/../install/man
+		emake -j1 "$@" installman || die "make installman failed!"
+	fi
+
+	if ! has nodoc ${FEATURES} && use doc ; then
+		cd "${S}"/../fpcdocs
+		emake -j1 "$@" pdfinstall || die "make pdfinstall failed"
+	fi
+
+	if use source ; then
+		cd "${S}"
+		shift
+		emake -j1 PP="${D}"usr/bin/ppc${FPC_ARCH} "$@" sourceinstall || die "make sourceinstall failed!"
+	fi
+
+	"${D}"usr/lib/fpc/${PV}/samplecfg /usr/lib/fpc/${PV} "${D}"etc
+
+	rm -rf "${D}"usr/lib/fpc/lexyacc
+}
+
+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
+
+	ewarn "The default configuration for fpc strips executables. This"
+	ewarn "will cause QA notices in ebuilds for software using fpc."
+	ewarn "You can remove -Xs from /etc/fpc.cfg to avoid this."
+}
diff --git a/dev-lang/fpc/metadata.xml b/dev-lang/fpc/metadata.xml
index 20ce219711a2..f376edc581d2 100644
--- a/dev-lang/fpc/metadata.xml
+++ b/dev-lang/fpc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>lang-misc</herd>
 </pkgmetadata>