clean up a bit

(Portage version: 2.0.53)

4 files changed, 6 insertions, 79 deletions

diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index 5f8af29aedd7..7f39b4887687 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/lazarus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.4 2005/11/17 10:15:17 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.5 2005/12/17 16:33:19 carlo Exp $
+
+  17 Dec 2005; Carsten Lohrke <carlo@gentoo.org> lazarus-0.9.10.ebuild:
+  clean up a bit
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> lazarus-0.9.10.ebuild:
   Marked ~amd64.
diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.6 b/dev-lang/lazarus/files/digest-lazarus-0.9.6
deleted file mode 100644
index 6e7d69625012..000000000000
--- a/dev-lang/lazarus/files/digest-lazarus-0.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 883163983cd0c81410e5971e5a1e3dc3 lazarus-0.9.6.tgz 7686485
diff --git a/dev-lang/lazarus/lazarus-0.9.10.ebuild b/dev-lang/lazarus/lazarus-0.9.10.ebuild
index a20add1eacd8..2a5672362e59 100644
--- a/dev-lang/lazarus/lazarus-0.9.10.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.10.ebuild,v 1.2 2005/11/17 10:15:17 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.10.ebuild,v 1.3 2005/12/17 16:33:19 carlo Exp $
 
 inherit eutils
 
@@ -17,18 +17,11 @@ DEPEND="=dev-lang/fpc-2.0.0-r1
 	=dev-lang/fpc-source-2.0.0
 	>=media-libs/gdk-pixbuf-0.22.0-r3
 	net-misc/rsync"
-RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/lazarus
 
-src_unpack () {
-	unpack ${A} || die "Unpacking ${A} failed!"
-}
-
 src_compile () {
-	emake -j1 \
-	all \
-	|| die "make all failed!"
+	make -j1 all || die "make all failed!"
 }
 
 src_install () {
diff --git a/dev-lang/lazarus/lazarus-0.9.6.ebuild b/dev-lang/lazarus/lazarus-0.9.6.ebuild
deleted file mode 100644
index 3ee2deb94889..000000000000
--- a/dev-lang/lazarus/lazarus-0.9.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.6.ebuild,v 1.1 2005/04/01 19:02:58 chriswhite Exp $
-
-inherit eutils
-
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-linking-exception"
-KEYWORDS="~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/lazarus-0.9.6.tgz"
-
-# Do not allow other versions of FPC.
-DEPEND="=dev-lang/fpc-2.0.0_rc2
-	=dev-lang/fpc-source-2.0.0_rc2
-	>=media-libs/gdk-pixbuf-0.22.0-r3
-	net-misc/rsync"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/lazarus
-
-src_unpack () {
-	unpack ${A} || die "Unpacking ${A} failed!"
-}
-
-src_compile () {
-	emake -j1 \
-	all \
-	|| die "make all failed!"
-}
-
-src_install () {
-	# Note: Make install is broken and wont be fixed.
-	einfo "Copying files. Please wait..."
-
-	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!"
-}
-
-pkg_preinst () {
-	# Fixing permissions.
-	find ${D} -name '*.sh' -exec chmod a+x {} \; || die "Failed to chmod *.sh files!"
-	find ${D} -name '*.pl' -exec chmod a+x {} \; || die "Failed to chmod *.pl files!"
-
-	# Symlinking binary
-	dodir /usr/bin/
-	dosym ../share/lazarus/startlazarus usr/bin/startlazarus || die "Symlinking startlazarus failed!"
-
-	# Desktop entry.
-	dodir /usr/share/pixmaps/
-	dosym ../lazarus/images/mainicon.xpm usr/share/pixmaps/lazarus.xpm || die "Symlinking icon failed!"
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus.xpm" || die "Failed making desktop entry!"
-}