#278740 (FEATURES misuse), work around #269221 (bad stripping)

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 18 insertions, 167 deletions

diff --git a/dev-lang/fpc/ChangeLog b/dev-lang/fpc/ChangeLog
index 01d5535092af..9f6027dc2e77 100644
--- a/dev-lang/fpc/ChangeLog
+++ b/dev-lang/fpc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2009/06/09 21:04:10 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.49 2009/07/22 20:24:39 truedfx Exp $
+
+*fpc-2.2.4-r2 (22 Jul 2009)
+
+  22 Jul 2009; Harald van Dijk <truedfx@gentoo.org> -fpc-2.2.4.ebuild,
+  -fpc-2.2.4-r1.ebuild, +fpc-2.2.4-r2.ebuild:
+  Re-add RESTRICT=strip (#269221); drop FEATURES misuse (#278740)
 
 *fpc-2.2.4-r1 (09 Jun 2009)
 
diff --git a/dev-lang/fpc/fpc-2.2.4-r1.ebuild b/dev-lang/fpc/fpc-2.2.4-r2.ebuild
index 60c8eae56c13..9cb2cd454591 100644
--- a/dev-lang/fpc/fpc-2.2.4-r1.ebuild
+++ b/dev-lang/fpc/fpc-2.2.4-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.2.4-r1.ebuild,v 1.1 2009/06/09 21:04:10 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.2.4-r2.ebuild,v 1.1 2009/07/22 20:24:39 truedfx Exp $
 
 inherit eutils
 
+RESTRICT="strip" #269221
+
 S="${WORKDIR}/fpcbuild-${PV}/fpcsrc"
 
 HOMEPAGE="http://www.freepascal.org/"
@@ -24,8 +26,8 @@ IUSE="doc source"
 DEPEND="!dev-lang/fpc-bin
 	!dev-lang/fpc-source"
 RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	>=sys-devel/binutils-2.19.1-r1"
+#DEPEND="${DEPEND}
+#	>=sys-devel/binutils-2.19.1-r1"
 
 src_unpack() {
 	case ${ARCH} in
@@ -43,7 +45,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-execstack.patch
-	sed -i -e 's/ -Xs / /g' $(find . -name Makefile) || die "sed failed"
+	#sed -i -e 's/ -Xs / /g' $(find . -name Makefile) || die "sed failed"
 }
 
 set_pp() {
@@ -102,17 +104,13 @@ src_install() {
 
 	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
+	cd "${S}"/../install/doc
+	emake -j1 "$@" installdoc || die "make installdoc failed!"
 
-	if ! has noman ${FEATURES} ; then
-		cd "${S}"/../install/man
-		emake -j1 "$@" installman || die "make installman failed!"
-	fi
+	cd "${S}"/../install/man
+	emake -j1 "$@" installman || die "make installman failed!"
 
-	if ! has nodoc ${FEATURES} && use doc ; then
+	if use doc ; then
 		cd "${S}"/../../share/doc/fpdocs-${PV}
 		insinto /usr/share/doc/${P}
 		doins -r * || die "doins fpdocs failed"
diff --git a/dev-lang/fpc/fpc-2.2.4.ebuild b/dev-lang/fpc/fpc-2.2.4.ebuild
deleted file mode 100644
index ec9236f9b960..000000000000
--- a/dev-lang/fpc/fpc-2.2.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.2.4.ebuild,v 1.1 2009/04/23 21:05:03 truedfx Exp $
-
-inherit eutils
-
-S="${WORKDIR}/fpcbuild-${PV}/fpcsrc"
-
-HOMEPAGE="http://www.freepascal.org/"
-DESCRIPTION="Free Pascal Compiler"
-SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
-	x86? ( mirror://sourceforge/freepascal/fpc-2.2.4.i386-linux.tar )
-	sparc? ( mirror://sourceforge/freepascal/fpc-2.2.4.sparc-linux.tar )
-	ppc? ( mirror://sourceforge/freepascal/fpc-2.2.4.powerpc-linux.tar )
-	amd64? ( mirror://sourceforge/freepascal/fpc-2.2.4.x86_64-linux.tar )
-	doc? ( mirror://sourceforge/freepascal/fpc-${PV}-doc-pdf.zip )"
-
-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
-	x86)	FPC_ARCH="i386"    PV_BIN=2.2.4 ;;
-	ppc)	FPC_ARCH="powerpc" PV_BIN=2.2.4 ;;
-	amd64)	FPC_ARCH="x86_64"  PV_BIN=2.2.4 ;;
-	sparc)	FPC_ARCH="sparc"   PV_BIN=2.2.4 ;;
-	*)	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}"
-	epatch "${FILESDIR}"/${P}-execstack.patch
-	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"
-
-	# Use pregenerated docs to avoid sandbox violations (#146804)
-	#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 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
-		insinto /usr/share/doc/${PF}
-		doins "${WORKDIR}"/doc/*.pdf
-		#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!"
-		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
-}
-
-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."
-}