5 files changed, 7 insertions, 192 deletions
diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index 1d79d19d5916..2343db1ee9f0 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/lazarus
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.22 2008/10/17 19:13:56 truedfx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.23 2009/03/07 22:29:30 fauli Exp $
+
+  07 Mar 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/lazarus-0.9.20-fpcsrc.patch, -files/lazarus-0.9.24-cputarget.patch,
+  -lazarus-0.9.22-r1.ebuild, -lazarus-0.9.24.ebuild:
+  clean up
 
   17 Oct 2008; Harald van Dĳk <truedfx@gentoo.org> lazarus-0.9.26.ebuild:
   Fix desktop entry icon (#242468 by Renato Caldas)
diff --git a/dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch b/dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch
deleted file mode 100644
index dbde4e06a548..000000000000
--- a/dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lazarus/ide/include/unix/lazbaseconf.inc
-+++ lazarus/ide/include/unix/lazbaseconf.inc
-@@ -24,7 +24,8 @@
- }
- 
- const
--  DefaultFPCSrcDirs: array[1..14] of string = (
-+  DefaultFPCSrcDirs: array[1..15] of string = (
-+    '/usr/lib/fpc/@FPCVER@/source',
-     '/usr/share/fpcsrc',
-     '/usr/local/share/fpcsrc',
-     '/usr/fpcsrc',
diff --git a/dev-lang/lazarus/files/lazarus-0.9.24-cputarget.patch b/dev-lang/lazarus/files/lazarus-0.9.24-cputarget.patch
deleted file mode 100644
index 81507408c1a0..000000000000
--- a/dev-lang/lazarus/files/lazarus-0.9.24-cputarget.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  Bug #201666: CPU_TARGET is not yet set when looking for fpc, so don't use it
-
---- lazarus/Makefile
-+++ lazarus/Makefile
-@@ -107,7 +107,7 @@
- FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
- ifneq ($(FPCPROG),)
- FPCPROG:=$(firstword $(FPCPROG))
--FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
-+FPC:=$(shell $(FPCPROG) -PB)
- ifneq ($(findstring Error,$(FPC)),)
- override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
- endif
diff --git a/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild b/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild
deleted file mode 100644
index ad4e0ffa4201..000000000000
--- a/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild,v 1.4 2008/02/29 17:57:18 carlo Exp $
-
-inherit eutils
-
-# bug #183604
-RESTRICT="strip"
-
-FPCVER="2.0.4"
-
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-linking-exception"
-KEYWORDS="~amd64 ~ppc ~x86"
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi."
-HOMEPAGE="http://www.lazarus.freepascal.org/"
-IUSE=""
-SRC_URI="mirror://sourceforge/lazarus/${P}-0.tar.gz"
-
-DEPEND="~dev-lang/fpc-${FPCVER}
-	net-misc/rsync
-	>=x11-libs/gtk+-2.0"
-RDEPEND="${DEPEND}
-	!=gnome-base/librsvg-2.16.1"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if ! built_with_use "dev-lang/fpc" source; then
-	    eerror "You need to build dev-lang/fpc with the 'source' USE flag"
-	    eerror "in order for lazarus to work properly."
-	    die "lazarus needs fpc built with the 'source' USE to work."
-	fi
-}
-
-src_unpack() {
-	# check for broken fpc.cfg
-	# don't check in pkg_setup since it won't harm binpkgs
-	if grep -q '^[ 	]*-Fu.*/lcl$' /etc/fpc.cfg
-	then
-		eerror "Your /etc/fpc.cfg automatically adds a LCL directory"
-		eerror "to the list of unit directories. This will break the"
-		eerror "build of lazarus."
-		die "don't set the LCL path in /etc/fpc.cfg"
-	fi
-
-	unpack ${A}
-	sed -e "s/@FPCVER@/${FPCVER}/" "${FILESDIR}"/${PN}-0.9.20-fpcsrc.patch \
-		> "${T}"/fpcsrc.patch || die "could not sed fpcsrc patch"
-
-	cd "${S}"
-	epatch "${T}"/fpcsrc.patch
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake -j1 || die "make failed!"
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		"${S}" "${D}"usr/share \
-	|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../lazarus/images/mainicon.xpm /usr/share/pixmaps/lazarus.xpm
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
-}
diff --git a/dev-lang/lazarus/lazarus-0.9.24.ebuild b/dev-lang/lazarus/lazarus-0.9.24.ebuild
deleted file mode 100644
index 15894269ac39..000000000000
--- a/dev-lang/lazarus/lazarus-0.9.24.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.24.ebuild,v 1.3 2008/02/29 17:57:18 carlo Exp $
-
-inherit eutils
-
-# bug #183604
-RESTRICT="strip"
-
-FPCVER="2.2.0"
-
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-linking-exception"
-KEYWORDS="~amd64 ~ppc ~x86"
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi."
-HOMEPAGE="http://www.lazarus.freepascal.org/"
-IUSE=""
-SRC_URI="mirror://sourceforge/lazarus/${P}-0.tar.gz"
-
-DEPEND="~dev-lang/fpc-${FPCVER}
-	net-misc/rsync
-	>=x11-libs/gtk+-2.0"
-RDEPEND="${DEPEND}
-	!=gnome-base/librsvg-2.16.1"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if ! built_with_use "dev-lang/fpc" source; then
-	    eerror "You need to build dev-lang/fpc with the 'source' USE flag"
-	    eerror "in order for lazarus to work properly."
-	    die "lazarus needs fpc built with the 'source' USE to work."
-	fi
-}
-
-src_unpack() {
-	# check for broken fpc.cfg
-	# don't check in pkg_setup since it won't harm binpkgs
-	if grep -q '^[ 	]*-Fu.*/lcl$' /etc/fpc.cfg
-	then
-		eerror "Your /etc/fpc.cfg automatically adds a LCL directory"
-		eerror "to the list of unit directories. This will break the"
-		eerror "build of lazarus."
-		die "don't set the LCL path in /etc/fpc.cfg"
-	fi
-
-	unpack ${A}
-	sed -e "s/@FPCVER@/${FPCVER}/" "${FILESDIR}"/${PN}-0.9.20-fpcsrc.patch \
-		> "${T}"/fpcsrc.patch || die "could not sed fpcsrc patch"
-
-	cd "${S}"
-	epatch "${T}"/fpcsrc.patch
-
-	epatch "${FILESDIR}"/${P}-cputarget.patch
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake -j1 || die "make failed!"
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${D}"usr/share \
-	|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../lazarus/images/mainicon.xpm /usr/share/pixmaps/lazarus.xpm
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
-}