From 0f45fec5b899d9ceb3981bc7e4421a3827c84d69 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Tue, 3 Jan 2012 06:09:50 +0000 Subject: [PATCH] Version bump (bug #396695 by Merlijn Wajer). Add arm keyword. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- dev-lang/fpc/ChangeLog | 9 +- dev-lang/fpc/Manifest | 25 ++++-- dev-lang/fpc/fpc-2.6.0.ebuild | 149 ++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 10 deletions(-) create mode 100644 dev-lang/fpc/fpc-2.6.0.ebuild diff --git a/dev-lang/fpc/ChangeLog b/dev-lang/fpc/ChangeLog index cce6d4aaefd5..7841b2efff96 100644 --- a/dev-lang/fpc/ChangeLog +++ b/dev-lang/fpc/ChangeLog @@ -1,6 +1,11 @@ # 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.56 2011/12/12 23:40:50 radhermit Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.57 2012/01/03 06:09:50 radhermit Exp $ + +*fpc-2.6.0 (03 Jan 2012) + + 03 Jan 2012; Tim Harder +fpc-2.6.0.ebuild: + Version bump (bug #396695 by Merlijn Wajer). Add arm keyword. 12 Dec 2011; Tim Harder fpc-2.4.4.ebuild: Remove deprecated external fpc-ide related setup (fixes bug #394475). diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest index c694b3bb7560..0549b3c3dab2 100644 --- a/dev-lang/fpc/Manifest +++ b/dev-lang/fpc/Manifest @@ -29,27 +29,36 @@ DIST fpc-2.4.4-fpctoc.htx.bz2 116367 RMD160 dbdc4fb26cf31c5f395f990c4a0d4cc606e8 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 fpc-2.6.0-doc-html.tar.gz 4700802 RMD160 ef07829bc82ff7165500980391fc092795f376a9 SHA1 755d06841466052abec6cdf585f57343f57376d7 SHA256 be21aab603e4d6543ee9086624745650976b16a8ca053690aec23dea2f04caf6 +DIST fpc-2.6.0-fpctoc.htx.bz2 117836 RMD160 fafbe6bed6808fbfe835693f45ea905880544d45 SHA1 9e5a7d39d2a90144f1e400cac522250e2a287a9b SHA256 775e0595b73b347e4e0a0c90f478a9a62e2e49b11498692aa711d3ffb28f3ab0 +DIST fpc-2.6.0.arm-linux.tar 31057920 RMD160 05b55e3adcc4a9c30c8dc011c34aa12a88d34920 SHA1 dd062b4993d51d58f8ce0aa28096b9f2f146b770 SHA256 5df2c85af8af32e1a59a4fbd0ef6005a0a4d2541ae89ddc71a97ea66af5e0dcd +DIST fpc-2.6.0.i386-linux.tar 44052480 RMD160 fcf385c1b645183325cffd83f29b299c39c2237e SHA1 65ea01cab89c3472197552ee5fab2882d1a1cdb0 SHA256 aefdd270b0032f9720495afe66000656b2a14d0c3093a6fb4a65eeeef2a6d323 +DIST fpc-2.6.0.powerpc-linux.tar 42199040 RMD160 d55d727761cd6838cdc6c11f602b02b04d3808ef SHA1 ec910cc4db69c6af31e65fae4a3424c3441d0794 SHA256 6591475ef84693dd659cee96519b6e3ab63c30df9634b38d4efb4d2fd7896b4b +DIST fpc-2.6.0.powerpc64-linux.tar 47319040 RMD160 2a536b578b6fb761cfac683c5fe437a97ef00cd6 SHA1 83e60548b13b4f004ff60e8cd8fa170f6d2da314 SHA256 3cc96210748d1528510e1b992be0694164ce650ce87847d13e9789a80c646992 +DIST fpc-2.6.0.x86_64-linux.tar 46295040 RMD160 a699062d0e93b5208cfafc2ab3718e1867d3bd83 SHA1 5439c00c88c6ec5d3db37e7f21b6dfc6dcd4586d SHA256 9da2464c53536293493ff6434ca44097fb76ef164c92675d19c7a731cb893b4d 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 +DIST fpcbuild-2.6.0.tar.gz 50751193 RMD160 809c9b43afd1c19002aa55569d69729322f36858 SHA1 6d22b59b8db650b5f27473151d4866922880ffca SHA256 d788854faa373e59835d4e353133f9965993cce79c62d82e5c31837a9117beef 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 EBUILD fpc-2.4.4.ebuild 3812 RMD160 692cff684c5c225849a6bbd82e2788257e116d03 SHA1 40a0069254127eff64afab769426b929b27db162 SHA256 c13c15c2af158cba1b18f89c64242ec8bd89f5c6be15ab45c69e7adfb73f1e49 -MISC ChangeLog 7160 RMD160 8d06b678756b36594087a84d032de5fba0fa372c SHA1 2787e6ea4501995c917aedfe94b9262fe87b5bbc SHA256 9ad7cee218e02e9d6d0af77100447cdd5acf75b38ba4481d09a1417a0a4931b8 +EBUILD fpc-2.6.0.ebuild 4118 RMD160 74cd6ad22edb8746f4029a9b26a3a8db8ed9129f SHA1 f5977d47e0ac04bca59729b8c819990be6af383f SHA256 ab3a87afceda51ccce282220c0755488aa67451f9cc875f460fca1dc57a4d77a +MISC ChangeLog 7319 RMD160 4da176a22635400774c8df3595bf2c8aac6c0091 SHA1 46d0cae518fe5a908c99888c6bdee34b4444849d SHA256 f098c8a534687f79f1b4f15c810140b7046a842681fe70be78a0306a8f261f82 MISC metadata.xml 251 RMD160 9a0651c3c39bc148d9aa9e4efbd6c1be74200916 SHA1 19b42ff88e6afe233acaa93f4f7d4ee20fe5313d SHA256 5e64453397ac86a70519ff062544e29c087fe71e83fb4693da25f4b6b8df612a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO5pEHAAoJEEqz6FtPBkyjB1oIALdCkAcycvjrPf4OguYqm04/ -CGOv8L297JMGZzL7k0/XFG+kVDoGLv0jqDgsCJ5HoHVGWuCCcoLcbp9Ce1Tzq1wj -Xh+GJ1520e/z8HGhWm7JdSnyKqiEPxzuG9hskHbU20GM+W7Aniv0u3/IpKRjzmj7 -EVzJ1HtIMcEY6SmQxiBxJoRsT70aebNZc4EZ5mlFbkALlNyRQPrqIhMUqbc1HcRn -lurtnlY/jFUAZ98iVnetqOD9N2S8NWN6ZJfkc2aEW35AHY/RL3GDc+A0V3czAbDH -ANktHsri3fP7KAFlMYauaK8zwC4qbirvEfEKs8kXmgUNgmylLnAi59IJ2ICoPdk= -=i6CC +iQEcBAEBCgAGBQJPApu7AAoJEEqz6FtPBkyj9YoH/2gcBwyxcDoR4CihQYEExsKT +7BdWO5d0JbGPyRjYrK1WcoSuMAlu/XFhFM/CYIDM34hrqtLW1Crnsm7B2Ug5iIhv +e84FNFxSjZcLWJhSk/XzTqyMcGlBts9o5kR720/Zx582sa+NT8Y3u7M118vVj5c+ +hO6t9PA3glFZCiXVXxBcCoEMJggIdtGOAEArfcB63hqKT6YcRmBTCpSbhxqHmDOm +HJ4VAZg612tcAbYkKUS7ZEBifVy+j+Jfp7gzrkBeg4BgPxTkuZwQUNJZaHNzkTtD +C8842AoDoiyoEDRUk8RRegUQ1NBaB/2jQBwfkTJzyJDK6wT68h8oPTq9piUAEsQ= +=6xHz -----END PGP SIGNATURE----- diff --git a/dev-lang/fpc/fpc-2.6.0.ebuild b/dev-lang/fpc/fpc-2.6.0.ebuild new file mode 100644 index 000000000000..24934a5e10c7 --- /dev/null +++ b/dev-lang/fpc/fpc-2.6.0.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.6.0.ebuild,v 1.1 2012/01/03 06:09:50 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 ) + arm? ( mirror://sourceforge/freepascal/${P}.arm-linux.tar ) + ppc? ( mirror://sourceforge/freepascal/${P}.powerpc-linux.tar ) + ppc64? ( mirror://sourceforge/freepascal/${P}.powerpc64-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 ~arm ~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} ;; + arm) FPC_ARCH="arm" PV_BIN=${PV} ;; + ppc) FPC_ARCH="powerpc" PV_BIN=${PV} ;; + ppc64) FPC_ARCH="powerpc64" 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 ${P}.${FPC_ARCH}-linux/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 +} + +set_pp() { + case ${ARCH} in + amd64) FPC_ARCH="x64" ;; + arm) FPC_ARCH="arm" ;; + ppc) FPC_ARCH="ppc" ;; + ppc64) FPC_ARCH="ppc64" ;; + sparc) FPC_ARCH="sparc" ;; + x86) FPC_ARCH="386" ;; + *) 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 +} -- 2.26.2