Ebuild cleanup

6 files changed, 61 insertions, 11 deletions

diff --git a/app-dicts/babytrans/ChangeLog b/app-dicts/babytrans/ChangeLog
index a4b1b4adb09e..6223eaa0f0ca 100644
--- a/app-dicts/babytrans/ChangeLog
+++ b/app-dicts/babytrans/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-dicts/babytrans
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/ChangeLog,v 1.3 2004/09/22 02:39:52 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/ChangeLog,v 1.4 2004/09/22 04:04:33 angusyoung Exp $
+
+*babytrans-0.9.2-r2 (22 Sep 2004)
+
+  22 Sep 2004; Otavio Piske <angusyoung@gentoo.org>
+  +files/babytrans-0.9.2-gcc.patch, -files/babytrans-0.9.2-r1.patch,
+  babytrans-0.9.2-r1.ebuild, +babytrans-0.9.2-r2.ebuild:
+  Cleaned ebuild. It may be, now, more sane. Removed Gnome support. Removed 
+  installation of COPYING.  Additionally renamed patch and modified epatch 
+  in both ebuilds need.
 
   21 Sep 2004; Otavio Piske <angusyoung@gentoo.org> babytrans-0.9.2-r1.ebuild:
   Removed dependy on brazilian portuguese dictionary. It now depends only on
diff --git a/app-dicts/babytrans/Manifest b/app-dicts/babytrans/Manifest
index 2d4caa2870e6..f78dbd16a86b 100644
--- a/app-dicts/babytrans/Manifest
+++ b/app-dicts/babytrans/Manifest
@@ -1,6 +1,8 @@
-MD5 9c82f593ddbf2c1e842c1f46c258db3b babytrans-0.9.2-r1.ebuild 1382
-MD5 886aef9f9ace5544312a132b7af25418 ChangeLog 882
+MD5 508b94abdeb8fe0e8b7bfc79ce18ee2e babytrans-0.9.2-r2.ebuild 1015
+MD5 1a3528a4dc38dbe01fe3c4cbceea5988 babytrans-0.9.2-r1.ebuild 1241
+MD5 111cb665d00455dbad514082b1ba7e3d ChangeLog 1273
 MD5 d378a890367f8f48c801b0ead6464e2f metadata.xml 264
 MD5 f678700249988dcfab3b3b2a777727ef files/digest-babytrans-0.9.2-r1 67
+MD5 f678700249988dcfab3b3b2a777727ef files/digest-babytrans-0.9.2-r2 67
+MD5 bafd18d9e8a5779740e82b469a235fcc files/babytrans-0.9.2-gcc.patch 241
 MD5 f113d0b6d519f81f3993cd526820045d files/dictionary 450
-MD5 bafd18d9e8a5779740e82b469a235fcc files/babytrans-0.9.2-r1.patch 241
diff --git a/app-dicts/babytrans/babytrans-0.9.2-r1.ebuild b/app-dicts/babytrans/babytrans-0.9.2-r1.ebuild
index 4537a0e2d26c..f024647b2f34 100644
--- a/app-dicts/babytrans/babytrans-0.9.2-r1.ebuild
+++ b/app-dicts/babytrans/babytrans-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/babytrans-0.9.2-r1.ebuild,v 1.3 2004/09/22 02:39:52 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/babytrans-0.9.2-r1.ebuild,v 1.4 2004/09/22 04:04:33 angusyoung Exp $
 
 inherit eutils
 IUSE="gnome"
@@ -22,7 +22,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}/src
-	epatch ${FILESDIR}/${PF}.patch
+	epatch ${FILESDIR}/${P}-gcc.patch
 	cd ${S}
 }
 
@@ -43,11 +43,6 @@ src_compile() {
 }
 
 src_install() {
-#Some stuff to create a gnome menu entry.	
-	use gnome && ( \
-		insinto /usr/share/gnome/apps/Utilities
-		doins ${FILESDIR}/babytrans.desktop
-	)
 	insinto /usr/bin
 	einstall || die
 	insinto /usr/share/babytrans
diff --git a/app-dicts/babytrans/babytrans-0.9.2-r2.ebuild b/app-dicts/babytrans/babytrans-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..5fc4f47e1850
--- /dev/null
+++ b/app-dicts/babytrans/babytrans-0.9.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/babytrans-0.9.2-r2.ebuild,v 1.1 2004/09/22 04:04:33 angusyoung Exp $
+
+inherit eutils
+
+DESCRIPTION="BabyTrans is a Linux clone of the popular Babylon Translator for Windows."
+SRC_URI="http://fjolliton.free.fr/babytrans/test/${P}.tar.gz"
+HOMEPAGE="http://fjolliton.free.fr/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 "
+IUSE=""
+
+RDEPEND="=x11-libs/gtk+-1.2*
+	>=app-dicts/babytrans-en-0.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-gcc.patch
+}
+
+src_compile() {
+	econf || die "Configure failed"
+	emake || die
+}
+
+src_install() {
+	einstall || die
+
+	insinto /usr/share/babytrans
+	doins ${FILESDIR}/dictionary
+	dodoc AUTHORS README
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Now you should install one of the babytrans dictionaries"
+	einfo "available in portage. You can find then in $PORTDIR under"
+	einfo "the app-dicts category"
+	einfo ""
+}
diff --git a/app-dicts/babytrans/files/babytrans-0.9.2-r1.patch b/app-dicts/babytrans/files/babytrans-0.9.2-gcc.patch
index 0185f0227f1e..0185f0227f1e 100644
--- a/app-dicts/babytrans/files/babytrans-0.9.2-r1.patch
+++ b/app-dicts/babytrans/files/babytrans-0.9.2-gcc.patch
diff --git a/app-dicts/babytrans/files/digest-babytrans-0.9.2-r2 b/app-dicts/babytrans/files/digest-babytrans-0.9.2-r2
new file mode 100644
index 000000000000..98ce1ef0fb23
--- /dev/null
+++ b/app-dicts/babytrans/files/digest-babytrans-0.9.2-r2
@@ -0,0 +1 @@
+MD5 635848e6e9287e6a025236c71232df19 babytrans-0.9.2.tar.gz 223204