6 files changed, 11 insertions, 202 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/Manifest b/dev-lang/lazarus/Manifest
index 56a1178d22e7..0c13a1936ff8 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,21 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX lazarus-0.9.20-fpcsrc.patch 333 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f SHA1 3e5c47eac41249dd2c78321be6ae9604b8d55931 SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c
-AUX lazarus-0.9.24-cputarget.patch 488 RMD160 b2ef423c2bc3a161508d95b2d8f5f6b183411c76 SHA1 a48f86f31204de80dddd25ff2928a73e040fab22 SHA256 957a295f8b7f85ea1bbb71b71f9ed2de1f413f6b0f75621aaac4b9aa25e4ffd3
 AUX lazarus-0.9.26-fpcsrc.patch 407 RMD160 b37a3ee5f1d4f5a7887dce621542513fed49d86b SHA1 976860962e2c9b3f9f4063f764ab9c85139bfdb6 SHA256 bff38dbaf47dd07bf91ae12c7babe0a9254dcb9ad360829649ac2df056e88730
-DIST lazarus-0.9.22-0.tar.gz 9264538 RMD160 cd78903b564b84f23a8f403a7324b616a23de116 SHA1 a150d387ac716f7ebd5697bd576c818c0f1a72b7 SHA256 9454e7383ad654fffba2adfc5749662dc3e5d4d7b064c25f8863260819b654f6
-DIST lazarus-0.9.24-0.tar.gz 11037130 RMD160 3f815d228397443d347d2c32a71c52b3d617d632 SHA1 11f239df774f401ac260e1f6f1c115839dff4ddd SHA256 4720c8d633c8e3d18750452278d135450c7c942ff591c10cd7d9afc6bc0f724e
 DIST lazarus-0.9.26-0.tgz 12641854 RMD160 b8f4f1a558263f9978d7d980c59f06d102316657 SHA1 759fa0cc8410034f42b7e53df12007c66004d3aa SHA256 d4c2dc8e8c797049d45d0c01aff51ea94fcae489efab7d4529afb6aeca8066dd
-EBUILD lazarus-0.9.22-r1.ebuild 2440 RMD160 36c8ac971794b3e57cee7c2b04bb625843003d9a SHA1 e0e1d6cc8348b78c8b1d5f7846c6cbd9ee693bb6 SHA256 01e5f7151a960631c252f27a858fda33f6ef7911a54c60f426ebde4a646cd396
-EBUILD lazarus-0.9.24.ebuild 2548 RMD160 d3a776f7e36ac5eae0f18d11bc9c74f60cc094f2 SHA1 74acc89c8effb9e49e84fdaa018cec36dc46c235 SHA256 8f928f7d29c13d5bf9d0589dc6fb47a39f618de04e1fef2603a6ec9d1eb56c59
 EBUILD lazarus-0.9.26.ebuild 2386 RMD160 7f8a5367dcdc2324ac3157f1dca903d1112582bd SHA1 a127ec47acb15618525a12bcc56aa68ca3a89347 SHA256 67c5e76b66967cb9678e2f7b472fb3d90900768ae95ac6570879bdf8f9b20fee
-MISC ChangeLog 3740 RMD160 c055b069bd84ba519c0cfab05bd6c524ff60adcc SHA1 a4a6cc3a4638c5367010d541aa731df0c719af69 SHA256 2863da38f7371168b628ea0e584da1b89f5c7b4a9d459bbd78ca126e336a782c
+MISC ChangeLog 3935 RMD160 e9c26feb6687f463cdc85dd188b49448da8a456b SHA1 bc31e548a77a0f10df8aefde12501ce1c5a574c0 SHA256 58503b083e7e26c098eda338d1a345c9d0afce51c800c8d8000463a28ba7ada7
 MISC metadata.xml 281 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 SHA1 c861318fcfa3725a45dd0deb55fbfc26a49245b6 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj45BYACgkQwnQyISwouHzCjwCeM6G1lDw7aZ5XRD0hIx3Mcz2u
-K8QAn0cUgATNKKwL+uGPE4IPPD5Yh6ki
-=kE9+
+iEYEARECAAYFAkmy9WUACgkQNQqtfCuFnePQLACfbXQWPeNRJvFaaV/7t8AXebTC
+MTgAn1rr3NkvpA1G+pSDlRiT1xSEuhgO
+=6xCz
 -----END PGP SIGNATURE-----
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!"
-}