6 files changed, 206 insertions, 11 deletions
diff --git a/dev-lang/fpc-ide/ChangeLog b/dev-lang/fpc-ide/ChangeLog
index 85195b73aaf5..240f5cca7f35 100644
--- a/dev-lang/fpc-ide/ChangeLog
+++ b/dev-lang/fpc-ide/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/fpc-ide
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/ChangeLog,v 1.15 2009/06/25 20:37:52 truedfx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/ChangeLog,v 1.16 2010/01/16 10:38:28 truedfx Exp $
+
+*fpc-ide-2.4.0 (16 Jan 2010)
+
+  16 Jan 2010; Harald van Dĳk <truedfx@gentoo.org> +fpc-ide-2.4.0.ebuild:
+  Version bump
 
   25 Jun 2009; Harald van Dĳk <truedfx@gentoo.org> fpc-ide-2.2.4.ebuild:
   Don't try to create fp config files in /usr during build (bug #274518 by
diff --git a/dev-lang/fpc-ide/fpc-ide-2.4.0.ebuild b/dev-lang/fpc-ide/fpc-ide-2.4.0.ebuild
new file mode 100644
index 000000000000..35b49e6ee2a2
--- /dev/null
+++ b/dev-lang/fpc-ide/fpc-ide-2.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/fpc-ide-2.4.0.ebuild,v 1.1 2010/01/16 10:38:28 truedfx Exp $
+
+S="${WORKDIR}/fpcbuild-${PV}/fpcsrc/ide"
+
+HOMEPAGE="http://www.freepascal.org/"
+DESCRIPTION="Free Pascal Compiler Integrated Development Environment"
+SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="~dev-lang/fpc-${PV}"
+RDEPEND="${DEPEND}"
+
+# test gives compile errors, was not updated with fpc changes
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A} || die "Unpacking ${A} failed!"
+
+	find "${WORKDIR}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die
+
+	# Use default configuration (minus stripping) unless specifically requested otherwise
+	if ! test ${PPC_CONFIG_PATH+set}; then
+		local FPCVER=$(fpc -iV)
+		export PPC_CONFIG_PATH="${WORKDIR}"
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+		sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
+	fi
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	emake -j1 INSTALL_PREFIX="${D}"usr install || die "make install failed"
+}
+
+pkg_postinst() {
+	einfo "To read the documentation, enable the doc USE flag for dev-lang/fpc,"
+	einfo "and add /usr/share/doc/fpc-${PV}/fpctoc.htx to the Help Files list."
+}
diff --git a/dev-lang/fpc/ChangeLog b/dev-lang/fpc/ChangeLog
index 9f6027dc2e77..783624f509c4 100644
--- a/dev-lang/fpc/ChangeLog
+++ b/dev-lang/fpc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/fpc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.49 2009/07/22 20:24:39 truedfx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.50 2010/01/16 10:38:29 truedfx Exp $
+
+*fpc-2.4.0 (16 Jan 2010)
+
+  16 Jan 2010; Harald van Dĳk <truedfx@gentoo.org> +fpc-2.4.0.ebuild:
+  Version bump, bug #299525
 
 *fpc-2.2.4-r2 (22 Jul 2009)
 
diff --git a/dev-lang/fpc/fpc-2.4.0.ebuild b/dev-lang/fpc/fpc-2.4.0.ebuild
new file mode 100644
index 000000000000..38f43bc19a31
--- /dev/null
+++ b/dev-lang/fpc/fpc-2.4.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.4.0.ebuild,v 1.1 2010/01/16 10:38:29 truedfx Exp $
+
+EAPI=2
+
+inherit eutils
+
+RESTRICT="strip" #269221
+
+S="${WORKDIR}/fpcbuild-${PV}/fpcsrc"
+
+HOMEPAGE="http://www.freepascal.org/"
+DESCRIPTION="Free Pascal Compiler"
+SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
+	amd64? ( mirror://sourceforge/freepascal/fpc-2.4.0.x86_64-linux.tar )
+	ppc? ( mirror://sourceforge/freepascal/fpc-2.4.0.powerpc-linux.tar )
+	sparc? ( mirror://sourceforge/freepascal/fpc-2.2.4.sparc-linux.tar )
+	x86? ( mirror://sourceforge/freepascal/fpc-2.4.0.i386-linux.tar )
+	doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> fpc-${PV}-doc-html.tar.gz
+		mirror://gentoo/fpc-${PV}-fpctoc.htx.bz2 )"
+
+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"
+RDEPEND="${DEPEND}"
+#DEPEND="${DEPEND}
+#	>=sys-devel/binutils-2.19.1-r1"
+
+src_unpack() {
+	case ${ARCH} in
+	amd64)	FPC_ARCH="x86_64"  PV_BIN=2.4.0 ;;
+	ppc)	FPC_ARCH="powerpc" PV_BIN=2.4.0 ;;
+	sparc)	FPC_ARCH="sparc"   PV_BIN=2.2.4 ;;
+	x86)	FPC_ARCH="i386"    PV_BIN=2.4.0 ;;
+	*)	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!"
+
+	#cd "${S}"
+	#sed -i -e 's/ -Xs / /g' $(find . -name Makefile) || die "sed failed"
+}
+
+set_pp() {
+	case ${ARCH} in
+	x86)	FPC_ARCH="386" ;;
+	ppc)	FPC_ARCH="ppc" ;;
+	amd64)	FPC_ARCH="x64" ;;
+	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_all utils || die "make failed"
+}
+
+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 packages_install \
+		utils_install || die "make install failed!"
+
+	dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH}
+
+	cd "${S}"/../install/doc
+	emake -j1 "$@" installdoc || die "make installdoc failed!"
+
+	cd "${S}"/../install/man
+	emake -j1 "$@" installman || die "make installman failed!"
+
+	if use doc ; then
+		cd "${S}"/../../doc || die
+		insinto /usr/share/doc/${P}
+		doins -r * || die "doins fpdocs failed"
+		newins "${WORKDIR}"/fpc-${PV}-fpctoc.htx fpctoc.htx || die "newins fpctoc.htx failed"
+	fi
+
+	if use source ; then
+		cd "${S}"
+		shift
+		emake -j1 PP="${D}"usr/bin/ppc${FPC_ARCH} "$@" sourceinstall || die "make sourceinstall failed!"
+		find "${D}"usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \;
+	fi
+
+	"${D}"usr/lib/fpc/${PV}/samplecfg "${D}"usr/lib/fpc/${PV} "${D}"etc || die "samplecfg failed"
+	sed -i -e "s:${D}:/:g" "${D}"etc/fpc.cfg || die "sed fpc.cfg failed"
+
+	rm -rf "${D}"usr/lib/fpc/lexyacc
+}
diff --git a/dev-lang/tendra/tendra-4.1.2.ebuild b/dev-lang/tendra/tendra-4.1.2.ebuild
index 366566a16508..b9ce7017989f 100644
--- a/dev-lang/tendra/tendra-4.1.2.ebuild
+++ b/dev-lang/tendra/tendra-4.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tendra/tendra-4.1.2.ebuild,v 1.1 2006/08/26 18:21:07 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tendra/tendra-4.1.2.ebuild,v 1.2 2010/01/16 10:38:29 truedfx Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A C/C++ compiler initially developed by DERA"
 HOMEPAGE="http://www.tendra.org/
@@ -10,12 +10,12 @@ HOMEPAGE="http://www.tendra.org/
 SRC_URI="ftp://ftp.allbsd.org/pub/TenDRA/releases/tendra/TenDRA-${PV}.tar.bz2
 	mirror://gentoo/${P}-misc.patch.bz2
 	mirror://gentoo/${P}-minix.patch.bz2
-	http://dev.gentoo.org/~truedfx/${P}-misc.patch.bz2
+	http://dev.gentoo.org/~truedfx/${P}-r1-misc.patch.bz2
 	http://dev.gentoo.org/~truedfx/${P}-minix.patch.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -24,10 +24,14 @@ RDEPEND="!dev-lang/tcc"
 
 S=${WORKDIR}/TenDRA-${PV}
 
+pkg_setup() {
+	use amd64 && multilib_toolchain_setup x86
+}
+
 src_unpack() {
 	unpack TenDRA-${PV}.tar.bz2
 	cd "${S}"
-	epatch "${DISTDIR}"/${P}-misc.patch.bz2
+	epatch "${DISTDIR}"/${P}-r1-misc.patch.bz2
 	epatch "${DISTDIR}"/${P}-minix.patch.bz2
 }
 
diff --git a/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild b/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild
index 5add3d072109..225f771a3ca1 100644
--- a/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild
+++ b/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild,v 1.2 2009/12/23 19:53:47 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tendra/tendra-5.0_pre20070510-r2.ebuild,v 1.3 2010/01/16 10:38:29 truedfx Exp $
 
 inherit bsdmk eutils flag-o-matic multilib
 
@@ -40,7 +40,8 @@ src_unpack() {
 src_compile() {
 	replace-flags '-O*' '-O'
 
-	HOSTARCH=i386 PREFIX=/usr sh makedefs || die "makedefs failed"
+	HOSTARCH=i386 PREFIX=/usr SYSTEM=Linux VERSION=2.6 \
+		sh makedefs || die "makedefs failed"
 	${BMAKE} -DBOOTSTRAP || die "bootstrap failed"
 	${BMAKE} || die "build failed"
 }