Version bump (6.74). Removed old ebuild.

10 files changed, 154 insertions, 50 deletions

diff --git a/app-sci/tilp/ChangeLog b/app-sci/tilp/ChangeLog
index f3572c388e52..8dc2272ec8ef 100644
--- a/app-sci/tilp/ChangeLog
+++ b/app-sci/tilp/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-sci/tilp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/tilp/ChangeLog,v 1.9 2004/06/24 22:19:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/tilp/ChangeLog,v 1.10 2004/08/22 19:25:29 ribosome Exp $
+
+*tilp-6.74 (22 Aug 2004)
+
+  22 Aug 2004; Olivier Fisette <ribosome@gentoo.org> -files/6.68-keepdir.patch,
+  +files/6.74-makefile-desktop.patch, +files/6.74-makefile.patch,
+  +files/keepdir.patch, -tilp-6.09.ebuild, tilp-6.68-r2.ebuild,
+  +tilp-6.74.ebuild:
+  Version bump (6.74) (formatbug patch is no longer needed). Removed old ebuild.
+  Removed version from the keepdir patch's file name, since it is now shared 
+  with 6.74 (and changed ebuild for 6.68 accordingly).
 
   10 May 2004; Patrick Kursawe <phosphan@gentoo.org> tilp-6.68-r2.ebuild:
   Adding missing libglade dependency (see bug #50451)
diff --git a/app-sci/tilp/Manifest b/app-sci/tilp/Manifest
index f40799c0d1cd..847cd9fbc20b 100644
--- a/app-sci/tilp/Manifest
+++ b/app-sci/tilp/Manifest
@@ -1,8 +1,10 @@
-MD5 f1a3f7323c549cbb355b32a0bbc49bd9 tilp-6.68-r2.ebuild 1383
-MD5 5f8cc07866b7aea24ae7343e32691678 tilp-6.09.ebuild 1186
+MD5 54785e476659ea2718ea3edf3c049368 tilp-6.74.ebuild 1253
+MD5 7a836fb66c2e0a6785c8dd22958f7adc tilp-6.68-r2.ebuild 1377
 MD5 5d4a8f729e84f6c049c807d76771a081 ChangeLog 1392
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 06d7047c0e38a61469e836701cd8e0e4 files/6.68-keepdir.patch 384
+MD5 06d7047c0e38a61469e836701cd8e0e4 files/keepdir.patch 384
 MD5 f235d3d15c4b0687241a0c4b3d0d9013 files/formatbug.patch 492
+MD5 19f22f6cd7f216bca36431149033c082 files/6.74-makefile.patch 2495
 MD5 85eb0fa9a7b3fb2b8a27f8589b96dcaa files/digest-tilp-6.68-r2 62
-MD5 236baab42b2a15104005363c3b21f467 files/digest-tilp-6.09 61
+MD5 bc48a68d03eb437fcd76f7bd8993fac8 files/6.74-makefile-desktop.patch 706
+MD5 41f9e0437c9b7230232d5cc7c5c6df59 files/digest-tilp-6.74 62
diff --git a/app-sci/tilp/files/6.74-makefile-desktop.patch b/app-sci/tilp/files/6.74-makefile-desktop.patch
new file mode 100644
index 000000000000..ce7c30cd64ec
--- /dev/null
+++ b/app-sci/tilp/files/6.74-makefile-desktop.patch
@@ -0,0 +1,16 @@
+--- desktop/Makefile.in	2004-06-29 17:02:14.000000000 -0400
++++ desktop/Makefile.in.new	2004-08-22 00:25:48.029609736 -0400
+@@ -340,8 +340,11 @@
+ 	@echo "---";
+ 
+ 	@echo Installing Gnome VFS MIME magic patterns...
+-	@if ! grep "\*\*TI" /etc/gnome-vfs-mime-magic; then		\
+-		cat gnome/gnome-vfs-mime-magic >> /etc/gnome-vfs-mime-magic;	\
++	@if ! grep "\*\*TI" $(sysconfdir)/gnome-vfs-mime-magic; then		\
++		cp $(sysconfdir)/gnome-vfs-mime-magic .;	\
++		cat gnome/gnome-vfs-mime-magic >> gnome-vfs-mime-magic;	\
++		cp gnome-vfs-mime-magic $(DESTDIR)$(sysconfdir)/gnome-vfs-mime-magic;	\
++		cp gnome-vfs-mime-magic $(DESTDIR)$(sysconfdir)/pokpok;	\
+ 	fi;
+ 
+ 	@echo Installing application registry in Gnome...
diff --git a/app-sci/tilp/files/6.74-makefile.patch b/app-sci/tilp/files/6.74-makefile.patch
new file mode 100644
index 000000000000..e13924980428
--- /dev/null
+++ b/app-sci/tilp/files/6.74-makefile.patch
@@ -0,0 +1,65 @@
+--- /tmp/tilp-6.74/desktop/Makefile.in	2004-06-29 23:02:14.000000000 +0200
++++ ./desktop/Makefile.in	2004-08-14 14:20:51.929766560 +0200
+@@ -331,9 +331,15 @@
+ 
+ 
+ install: $(FILES)
++	@mkdir $(DESTDIR)$(sysconfdir);
+ 	@echo Installing magic local data for file\(1\) command...
+-	@if ! grep "\*\*TI85\*\*" /etc/magic; then	\
+-		cat others/magic >> /etc/magic;		\
++	@if ! grep "\*\*TI85\*\*" $(sysconfdir)/magic; \
++	 then \
++	  mkdir etc; \
++	  rm etc/magic; \
++	  cp $(sysconfdir)/magic etc/; \
++	  cat others/magic >> etc/magic; \
++	  $(INSTALL_DATA) etc/magic $(DESTDIR)$(sysconfdir)/magic; \
+ 	fi;
+ 	@echo Done.
+ 
+@@ -345,29 +351,35 @@
+ 	fi;
+ 
+ 	@echo Installing application registry in Gnome...
+-	@$(INSTALL) -m644 gnome/tilp.applications /usr/share/application-registry
++	@mkdir -p $(DESTDIR)/usr/share/application-registry/
++	@$(INSTALL) -m644 gnome/tilp.applications $(DESTDIR)/usr/share/application-registry
+ 
+ 	@echo Installing file and icons handling in Gnome...
+-	@$(INSTALL) -m644 gnome/tilp.keys /usr/share/mime-info
+-	@$(INSTALL) -m644 gnome/tilp.mime /usr/share/mime-info
++	@mkdir -p $(DESTDIR)/usr/share/mime-info;
++	@$(INSTALL) -m644 gnome/tilp.keys $(DESTDIR)/usr/share/mime-info
++	@$(INSTALL) -m644 gnome/tilp.mime $(DESTDIR)/usr/share/mime-info
+ 
+ 	@echo Installing TiLP menu entry in Gnome...
+-	@$(INSTALL) -m644 gnome/TiLP.desktop /usr/share/applications
++	@mkdir -p $(DESTDIR)/usr/share/applications
++	@$(INSTALL) -m644 gnome/TiLP.desktop $(DESTDIR)/usr/share/applications
+ 	@echo Done.
+ 
+ 	@echo "---";
+ 
+ 	@echo Installing KMimeMagic local data...
+-	@if ! grep "\*\*TI85" /usr/share/mimelnk/magic; then    \
+-		cat kde/magic >> /usr/share/mimelnk/magic;      \
++	
++#confusing kde mime type resolution
++#	@if ! grep "\*\*TI85" /usr/share/mimelnk/magic; then    \
++		cat kde/magic >> $(DESTDIR)/usr/share/mimelnk/magic;      \
+ 	fi;
+ 
+ 	@echo Installing TiLP menu entry in KDE...
+-	@$(INSTALL) -d /usr/share/applnk/Edutainment/Mathematics
+-	@$(INSTALL) -m644 kde/tilp.desktop /usr/share/applnk/Edutainment/Mathematics/
++	@$(INSTALL) -d $(DESTDIR)/usr/share/applnk/Edutainment/Mathematics
++	@$(INSTALL) -m644 kde/tilp.desktop $(DESTDIR)/usr/share/applnk/Edutainment/Mathematics/
+ 
+ 	@echo Installing file and icons handling in KDE...
+-	@$(INSTALL) -m644 kde/x-tilp.desktop /usr/share/mimelnk/application
++	@mkdir -p $(DESTDIR)/usr/share/mimelnk/application
++	@$(INSTALL) -m644 kde/x-tilp.desktop $(DESTDIR)/usr/share/mimelnk/application
+ 	@echo Done.
+ 
+ uninstall: $(FILES)
diff --git a/app-sci/tilp/files/digest-tilp-6.09 b/app-sci/tilp/files/digest-tilp-6.09
deleted file mode 100644
index 001ab28a5da8..000000000000
--- a/app-sci/tilp/files/digest-tilp-6.09
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54616af8500a2f0808a92db708362e18 tilp-6.09.tar.gz 763949
diff --git a/app-sci/tilp/files/digest-tilp-6.74 b/app-sci/tilp/files/digest-tilp-6.74
new file mode 100644
index 000000000000..a1acae9d17aa
--- /dev/null
+++ b/app-sci/tilp/files/digest-tilp-6.74
@@ -0,0 +1 @@
+MD5 8eb0003297566519350859cde5f25202 tilp-6.74.tar.gz 1183610
diff --git a/app-sci/tilp/files/6.68-keepdir.patch b/app-sci/tilp/files/keepdir.patch
index e0444106649c..e0444106649c 100644
--- a/app-sci/tilp/files/6.68-keepdir.patch
+++ b/app-sci/tilp/files/keepdir.patch
diff --git a/app-sci/tilp/tilp-6.09.ebuild b/app-sci/tilp/tilp-6.09.ebuild
deleted file mode 100644
index 6f26a1a909d2..000000000000
--- a/app-sci/tilp/tilp-6.09.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/tilp/tilp-6.09.ebuild,v 1.7 2004/06/24 22:19:26 agriffis Exp $
-
-DESCRIPTION="TiLP is a linking program for Texas Instruments' graphing calculators."
-HOMEPAGE="http://tilp.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/tilp/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-# Only tested on x86 so far...
-KEYWORDS="x86"
-IUSE=""
-DEPEND="dev-libs/libticables
-	dev-libs/libticalcs
-	dev-libs/libtifiles
-	=x11-libs/gtk+-1.2*"
-
-src_compile() {
-	# Note the special option --with-fontpath-prefix below.
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-fontpath-prefix=${D}/usr/X11R6/lib/X11/fonts \
-		--enable-exit-homedir || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* RELEASE THANKS TODO
-}
-
-pkg_postinst() {
-	# TiLP installs a font into /usr/X11R6/lib/X11/fonts/misc, so I'm running
-	# mkfontdir here to update the system
-	mkfontdir -- /usr/X11R6/lib/X11/fonts/misc
-}
diff --git a/app-sci/tilp/tilp-6.68-r2.ebuild b/app-sci/tilp/tilp-6.68-r2.ebuild
index 41034d85f151..6bfc10e437dc 100644
--- a/app-sci/tilp/tilp-6.68-r2.ebuild
+++ b/app-sci/tilp/tilp-6.68-r2.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-sci/tilp/tilp-6.68-r2.ebuild,v 1.4 2004/06/24 22:19:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/tilp/tilp-6.68-r2.ebuild,v 1.5 2004/08/22 19:25:29 ribosome Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ DEPEND=">=dev-libs/libticables-3.7.7
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-keepdir.patch
+	epatch ${FILESDIR}/keepdir.patch
 	epatch ${FILESDIR}/formatbug.patch
 }
 
diff --git a/app-sci/tilp/tilp-6.74.ebuild b/app-sci/tilp/tilp-6.74.ebuild
new file mode 100644
index 000000000000..033eb3feb305
--- /dev/null
+++ b/app-sci/tilp/tilp-6.74.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/tilp/tilp-6.74.ebuild,v 1.1 2004/08/22 19:25:29 ribosome Exp $
+
+inherit eutils
+
+DESCRIPTION="TiLP - A linking program for Texas Instruments' graphing calculators"
+HOMEPAGE="http://tilp.info/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="nls"
+
+DEPEND=">=dev-libs/libticables-3.8.6
+		>=dev-libs/libticalcs-4.5.3
+		>=dev-libs/libtifiles-0.5.9
+		app-text/dos2unix
+		>=x11-libs/gtk+-2
+		>=gnome-base/libglade-2
+		nls? sys-devel/gettext"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-makefile.patch
+	epatch ${FILESDIR}/${PV}-makefile-desktop.patch
+	epatch ${FILESDIR}/keepdir.patch
+}
+
+src_compile() {
+	# Note the special option --with-fontpath-prefix below.
+	cd ${WORKDIR}/${P}/
+	./configure \
+		$(use_enable nls) \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--with-fontpath-prefix=${D}/usr/X11R6/lib/X11/fonts \
+		--enable-exit-homedir || die
+
+	emake || die
+}
+
+src_install() {
+	# The SHARE_DIR is required since it isn't set properly in a makefile.
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NEWS README README.linux RELEASE THANKS TODO
+	keepdir /usr/lib/tilp
+}