Version bump (bug #363677 by Michal Janke). Add the ide USE flag to replace the fpc-ide package.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 187 insertions, 4 deletions

diff --git a/dev-lang/fpc/ChangeLog b/dev-lang/fpc/ChangeLog
index 4b7f1f0f3ba7..9f33a15bf15b 100644
--- a/dev-lang/fpc/ChangeLog
+++ b/dev-lang/fpc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/fpc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.54 2011/02/12 18:43:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.55 2011/12/11 23:42:14 radhermit Exp $
+
+*fpc-2.4.4 (11 Dec 2011)
+
+  11 Dec 2011; Tim Harder <radhermit@gentoo.org> +fpc-2.4.4.ebuild,
+  metadata.xml:
+  Version bump (bug #363677 by Michal Janke). Add the ide USE flag to replace
+  the fpc-ide package.
 
   12 Feb 2011; Raúl Porcel <armin76@gentoo.org> fpc-2.4.0.ebuild:
   sparc stable wrt #345663
diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest
index 12f8cdc6d3b6..422d7c65921f 100644
--- a/dev-lang/fpc/Manifest
+++ b/dev-lang/fpc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX fpc-2.2.0-unneeded-symbols.patch 1671 RMD160 e2f825a8ba1812def18b005d1028ddda5a56b01c SHA1 4488af97128e4e092a317cabaa4009c604abe10b SHA256 79dd0ed2dad15714ec294615ff84a425140bbcf34996a20ca0efc2215a9dc802
 AUX fpc-2.2.2-execstack.patch 13689 RMD160 8572c7c48504df15d9c58cbb8f818fa2c33c33b9 SHA1 cf77545d32d1405cb3d33ed35fccb596ff06d1e2 SHA256 af6d54691c404fdc41c28c166c0b35bb8446dc0500e8a000ef41011b17010328
 AUX fpc-2.2.2-unneeded-symbols.patch 1675 RMD160 fb9619c19b8736627795b477f91091ea1286a320 SHA1 aa34506b4ea86a0ebe2deea2968f0d92a6ce3416 SHA256 21f76ccd00bf445d740c5c724344ec8eb9f9b77303cfb9e0ef31c4adb92bbb29
@@ -21,14 +24,32 @@ DIST fpc-2.4.0-fpctoc.htx.bz2 69318 RMD160 897358d7791e91bc5fe3cebec3892de5daf5f
 DIST fpc-2.4.0.i386-linux.tar 38778880 RMD160 ec922595fc5448d0348149de4f6b36271f1abc65 SHA1 97068f52ffbd414739ddd608e6aff97bdf6fba19 SHA256 bb0108dfd18a1a7e0e450340f5eac5665940056c91c4b436eedf8c05ee4c5afd
 DIST fpc-2.4.0.powerpc-linux.tar 36014080 RMD160 ac9925c436c503869f3f72d123f8b4850c0a33e4 SHA1 77dd98fa657f7991490157b805ae0c12761741bf SHA256 5c60a59eaea7de4a1114ef51e92ef096132ed43228890fae13aaf39a93049e4e
 DIST fpc-2.4.0.x86_64-linux.tar 40130560 RMD160 b15cd8cd1e062db4dac708383336ee1a504b7606 SHA1 947da97cff081c96e0ff4074382d4d2f7523c33f SHA256 1fb8219ab7090cb091b96afbfc91d7355eea386f9498cebd84a5a85c5e082d84
+DIST fpc-2.4.4-doc-html.tar.gz 4529444 RMD160 4cca9721e2c0b5ed9b21aaaed6b3b17ffe26eb41 SHA1 70c994036f12db61313b3f01f5bbd43524e6f811 SHA256 9e7e7b86eccacdfe5ebe75d12c0d8fd56e5dc92e5044049b04f2f9182a134d5d
+DIST fpc-2.4.4-fpctoc.htx.bz2 116367 RMD160 dbdc4fb26cf31c5f395f990c4a0d4cc606e83d8b SHA1 6cd67cf3fef6cbfabd40e524326d947c4a203f10 SHA256 1f0b46db908ae0502a8fac9b2a079e756fb0bde8d264eb126851de87070716ca
+DIST fpc-2.4.4.i386-linux.tar 42577920 RMD160 0ea94ad7e123498c93f2d9b41814aedb4661eb8e SHA1 5b5b38711d154696bdd12d628b748cafd58d7dac SHA256 1ed28b76d4eb971bc41cea42f29f240f385e0073870eeadd707e80cf199f3a04
+DIST fpc-2.4.4.powerpc-linux.tar 40775680 RMD160 37c3f0d2c401a3c04084c7c71271e54472673dda SHA1 195033d27f273040720d813315d06b5593a72388 SHA256 a4f82bf02848a8811b3743d4b71a173c4c3022b1faf74ea89799e46c081ca7d2
+DIST fpc-2.4.4.x86_64-linux.tar 44707840 RMD160 e8013f0775f6648a3732155338aaa315fe2674a2 SHA1 b80089faa44f11ad40d718dbac9f159b1cd0acc7 SHA256 f15e0959ddb6f65536da84047a61a0fae3b05029410dc7550f9fa7b4ad179245
 DIST fpcbuild-2.2.0.tar.gz 35801603 RMD160 d27530092aac60758b37265dfa3200333b7b677c SHA1 bf7abac8a260cae614c717ebce18ff8ad708dfe3 SHA256 55c6fe8df0a09b15c1bc5cbf6c7df12ee955f86933fdf624f26fda59636d7a5f
 DIST fpcbuild-2.2.2.tar.gz 39186745 RMD160 8be1f261780762705254dbfdd07e0b0e2bdcaa47 SHA1 d32cf96b61f8046638cbbec727582fa9ad16291e SHA256 0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1
 DIST fpcbuild-2.2.4.tar.gz 39849184 RMD160 e615282179266f2bdc4b5d2cb6ea54fb209fd9ed SHA1 9ea373ad4be152b67a249784f69cfd23702e61fe SHA256 77a54f09e39f07ed723071784a86d9ac8ca08fb5aa6fe41c8e9970bea395b4cf
 DIST fpcbuild-2.4.0.tar.gz 41769847 RMD160 00369c1a19d5245f18ab0a7859b505c2964ce757 SHA1 d03a7131c6e0bb8c965089df870cc3c802d5ba8a SHA256 b3abbeaa0f2c3427fd447759e715cbc19b920f2ccad2b40ae5ab47e9d4124fd4
+DIST fpcbuild-2.4.4.tar.gz 48018719 RMD160 a3aa37a7873a2d5c984a5ce0c898b6eb534f8a23 SHA1 82d3afb7ef2b21167dfc39d6567f7709a45c76c4 SHA256 ecdbc150eecc33f5734e62f1a3507421db8eba6d9074c0c5519a8fc8ffe46924
 EBUILD fpc-2.2.0-r1.ebuild 4334 RMD160 34367230f14e4e163997b553b43e28b12024bfab SHA1 7671d32f5a16809ed5c2dbb7ed0cececbb461870 SHA256 8de648ebc5a56d589e78e35a7f6633544a00dca667e3192cb8b48c8258ebf14f
 EBUILD fpc-2.2.0.ebuild 4201 RMD160 53fb252731827d35ef08777c87c2170d78a7aa2b SHA1 cd19a350f873e80954b8283a391d1994345435d1 SHA256 d961a368f690699cb356923cd6f024728d260ead6cab17892f17811ef4d97da0
 EBUILD fpc-2.2.2-r1.ebuild 4431 RMD160 7e6de90bb0e5817cb22c484ccdf9d0221f0569fa SHA1 86651adfb74b7ca88fddcea2ba8d7231aee6ba76 SHA256 2947b56d2c62ce2d349b8cc9e4178c530778e5851c22fe7918c46a99ac218408
 EBUILD fpc-2.2.4-r2.ebuild 3895 RMD160 bf22685e229a1d64faa4a42ed3b142f6fdd3fc9f SHA1 8b18ee6c745d56fb8ea5722841cd5418d2eda610 SHA256 56e99ec3a55cbc010e0ffe3a2a4f9c4f21933d782fc31fe219fa945cd12707cb
 EBUILD fpc-2.4.0.ebuild 3881 RMD160 bf6ba66d1eb255724a7b5d58628ee30f52b9f205 SHA1 84664ad297eb5df2aab7a3cbe2f12eac84bfa021 SHA256 3390490e4acc35566b6c6adba4ea3a2328a368f29aa6d576252f4d1b05d2c4e5
-MISC ChangeLog 6806 RMD160 d3a3cefdb7acc56800ba5a905a26ff6459dda5e6 SHA1 476900b1e8087cd09165ec550f82bd35dfe07af1 SHA256 32e5098415ac567b9ecafd0ebb41e83f1a4e3c96509f649d5db4957268a1c01d
-MISC metadata.xml 162 RMD160 359e0d4ecc394cc3fb84227087c1a518d9e6c347 SHA1 d4c1c09bc042bd11d40dc634bf52edb93e4cf6f0 SHA256 444ece0c3cb4908c78c6588147078383d3636d1b3da9a20111ec03c5640eefdb
+EBUILD fpc-2.4.4.ebuild 4183 RMD160 527dffb21357f5ed777fa36f095b451638c476f8 SHA1 77b5fa2c21162aa0eb496c708d5cf7e483e00341 SHA256 fb49b04450d6d1d8ee26e939edb19d954421de698244b7bc14029cb5b8004a33
+MISC ChangeLog 7020 RMD160 48a7872f9945d7d485320bcc53580ca4765881bd SHA1 1c376e361f9b9aa2fc8b8e70f95d360c61d04ec8 SHA256 66df86d1738036556afc623a23af562f77e55b7cd458a9c35c2772693398fa1d
+MISC metadata.xml 251 RMD160 9a0651c3c39bc148d9aa9e4efbd6c1be74200916 SHA1 19b42ff88e6afe233acaa93f4f7d4ee20fe5313d SHA256 5e64453397ac86a70519ff062544e29c087fe71e83fb4693da25f4b6b8df612a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJO5T/iAAoJEEqz6FtPBkyjGO8H/iRqHhJSO+ygHs6gtdHcThoY
+7+OiiYBc7WRQvGBvSN0r4I8B+lRwbOvklau7ic2irBiZ2Q5zTgJpI11DY7HRacfS
+DGdMb+xGH1NwUI+zlx6A1UEFPFGQ9qwaLCwG4u/Iynqu/tFnne9AIoUcE2Nd3tPB
+RiSuzbAg95wg2Y18Juws0+4I18p/lRwX4/5s/1DR2yFH+xu2TcYVTyNlWBwOhDxC
+5LZjvEdBBEOh+/QmOCxmFX4/9K8lzjeQ6jjDyfBiI8ymU2/ZCb6fQKFZslCstNK4
+Tse6PEwCRG6gTvuCEAwh6bAdK69CtMZiaBEoUpD11suE16V5pfooKPjHkEZ4lOA=
+=z0iN
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/fpc/fpc-2.4.4.ebuild b/dev-lang/fpc/fpc-2.4.4.ebuild
new file mode 100644
index 000000000000..8b2c443ebcca
--- /dev/null
+++ b/dev-lang/fpc/fpc-2.4.4.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.4.4.ebuild,v 1.1 2011/12/11 23:42:14 radhermit Exp $
+
+EAPI=4
+
+HOMEPAGE="http://www.freepascal.org/"
+DESCRIPTION="Free Pascal Compiler"
+SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
+	amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar )
+	ppc? ( mirror://sourceforge/freepascal/${P}.powerpc-linux.tar )
+	sparc? ( mirror://sourceforge/freepascal/${PN}-2.2.4.sparc-linux.tar )
+	x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar )
+	doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz
+		http://dev.gentoo.org/~radhermit/distfiles/${P}-fpctoc.htx.bz2 )"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc ide source"
+
+RDEPEND="ide? ( !dev-lang/fpc-ide )"
+
+RESTRICT="strip" #269221
+
+S="${WORKDIR}/fpcbuild-${PV}/fpcsrc"
+
+src_unpack() {
+	case ${ARCH} in
+	amd64)	FPC_ARCH="x86_64"  PV_BIN=${PV} ;;
+	ppc)	FPC_ARCH="powerpc" PV_BIN=${PV} ;;
+	sparc)	FPC_ARCH="sparc"   PV_BIN=2.2.4 ;;
+	x86)	FPC_ARCH="i386"    PV_BIN=${PV} ;;
+	*)	die "This ebuild doesn't support ${ARCH}." ;;
+	esac
+
+	unpack ${A}
+
+	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!"
+}
+
+src_prepare() {
+	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="${PV}"
+		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
+}
+
+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
+
+	# Save new compiler from cleaning...
+	cp "${S}"/compiler/ppc${FPC_ARCH} "${S}"/ppc${FPC_ARCH}.new || die
+
+	# ...rebuild with current version...
+	emake -j1 PP="${S}"/ppc${FPC_ARCH}.new compiler_cycle
+
+	# ..and clean up afterwards
+	rm "${S}"/ppc${FPC_ARCH}.new || die
+
+	# Using the new compiler.
+	set_pp new
+
+	emake -j1 PP="${pp}" rtl_clean
+
+	emake -j1 PP="${pp}" rtl packages_all utils
+
+	if use ide ; then
+		cd "${S}"/ide || die
+		emake -j1 PP="${pp}"
+	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/${PF} \
+		INSTALL_MANDIR="${D}"usr/share/man \
+		INSTALL_SOURCEDIR="${D}"usr/lib/fpc/${PV}/source
+
+	emake -j1 "$@" compiler_install rtl_install packages_install utils_install
+
+	dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH}
+
+	cd "${S}"/../install/doc || die
+	emake -j1 "$@" installdoc
+
+	cd "${S}"/../install/man || die
+	emake -j1 "$@" installman
+
+	if use doc ; then
+		cd "${S}"/../../doc || die
+		dodoc -r *
+		newdoc "${WORKDIR}"/${P}-fpctoc.htx fpctoc.htx
+		docompress -x /usr/share/doc/${PF}/fpctoc.htx
+	fi
+
+	if use ide ; then
+		cd "${S}"/ide
+		emake -j1 "$@" install
+	fi
+
+	if use source ; then
+		cd "${S}" || die
+		shift
+		emake -j1 PP="${D}"usr/bin/ppc${FPC_ARCH} "$@" sourceinstall
+		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
+	sed -i -e "s:${D}:/:g" "${D}"etc/fpc.cfg || die "sed fpc.cfg failed"
+
+	rm -r "${D}"usr/lib/fpc/lexyacc || die
+}
+
+pkg_postinst() {
+	if use ide ; then
+		einfo "To read the documentation in the fpc IDE, enable the doc USE flag"
+		einfo "and add /usr/share/doc/${PF}/fpctoc.htx to the Help Files list."
+	fi
+}
diff --git a/dev-lang/fpc/metadata.xml b/dev-lang/fpc/metadata.xml
index f376edc581d2..f7d72d730c47 100644
--- a/dev-lang/fpc/metadata.xml
+++ b/dev-lang/fpc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>lang-misc</herd>
+	<herd>lang-misc</herd>
+	<use>
+		<flag name="ide">Build and install the Free Pascal Compiler IDE</flag>
+	</use>
 </pkgmetadata>