app-arch/parano: autoconf fixes, thanks to dragonheart

svn path=/; revision=55

4 files changed, 78 insertions, 76 deletions

diff --git a/app-arch/parano/Manifest b/app-arch/parano/Manifest
index c9b3d38ad..3cec06265 100644
--- a/app-arch/parano/Manifest
+++ b/app-arch/parano/Manifest
@@ -1,12 +1,12 @@
-AUX parano-0.3.3-makefile.patch 2461 RMD160 1707e783b7f903c680ec231a5dd70f45946558de SHA1 8aa7581651fef5d24020f3b1846dac6cd59852e9 SHA256 351b8b4f3059d4c328a2c978dff39052d8e61bef323f29fbdacae9a759928982
-MD5 1b2e50c9f260fa98a7f3fb5d77298412 files/parano-0.3.3-makefile.patch 2461
-RMD160 1707e783b7f903c680ec231a5dd70f45946558de files/parano-0.3.3-makefile.patch 2461
-SHA256 351b8b4f3059d4c328a2c978dff39052d8e61bef323f29fbdacae9a759928982 files/parano-0.3.3-makefile.patch 2461
+AUX parano-0.3.3-autoconf.patch 2021 RMD160 c61a66c03356e69f37d3b42caf1eb2927649de18 SHA1 739f4b4ae28345cf3d6a3567ab161ef111b7b1e4 SHA256 96247dcfb75110dcb3a17d19eea1b1e77b8027ea6127977c590d066654ead981
+MD5 e3141ef55a35c4f9281269744b26ca5d files/parano-0.3.3-autoconf.patch 2021
+RMD160 c61a66c03356e69f37d3b42caf1eb2927649de18 files/parano-0.3.3-autoconf.patch 2021
+SHA256 96247dcfb75110dcb3a17d19eea1b1e77b8027ea6127977c590d066654ead981 files/parano-0.3.3-autoconf.patch 2021
 DIST parano-0.3.3.tar.gz 156790 RMD160 8a2053cee8dc04d976ce49e2828f22f57177edc5 SHA1 3022e16eee108478c24630cac3f9840ad595dd7f SHA256 744c9c055f0eae85bdc585197c789bf6b5bba44b825111d79527efaf53681e1c
-EBUILD parano-0.3.3.ebuild 719 RMD160 4796524a577d2c4118be31a0efe32703bd4f063d SHA1 bc0725ea220f86eba201483fcc95a0bc1ad43fd4 SHA256 b9a4a5eee5d5291933d3bff99402276e3ef87bfe883ab2d95f3ed579199d4614
-MD5 56ca3441f2961852965cb18f5abff8f3 parano-0.3.3.ebuild 719
-RMD160 4796524a577d2c4118be31a0efe32703bd4f063d parano-0.3.3.ebuild 719
-SHA256 b9a4a5eee5d5291933d3bff99402276e3ef87bfe883ab2d95f3ed579199d4614 parano-0.3.3.ebuild 719
+EBUILD parano-0.3.3.ebuild 774 RMD160 3ea12cbe96749371acd140c5141ab7214fe71e0c SHA1 fa6f08006e5e457f05256744c622d9f482f232d1 SHA256 686b02f7ffdf1868495a23e047296ce2306d2e774566dd64fe30f53b093b879f
+MD5 5f2d1ec43387503b788a2eb52763d401 parano-0.3.3.ebuild 774
+RMD160 3ea12cbe96749371acd140c5141ab7214fe71e0c parano-0.3.3.ebuild 774
+SHA256 686b02f7ffdf1868495a23e047296ce2306d2e774566dd64fe30f53b093b879f parano-0.3.3.ebuild 774
 MISC ChangeLog 217 RMD160 8ac4193cc589b51a15213686cd5853a321cfab96 SHA1 4b1e3835c8da2d64e00ba74d7952835edd611ba0 SHA256 cb4caf93615520cc001f64030fc08d7e2921037a41cb985e50fff15fee632e03
 MD5 0b3346590c84cb2d51065c76c746238e ChangeLog 217
 RMD160 8ac4193cc589b51a15213686cd5853a321cfab96 ChangeLog 217
diff --git a/app-arch/parano/files/parano-0.3.3-autoconf.patch b/app-arch/parano/files/parano-0.3.3-autoconf.patch
new file mode 100644
index 000000000..c75eda68b
--- /dev/null
+++ b/app-arch/parano/files/parano-0.3.3-autoconf.patch
@@ -0,0 +1,64 @@
+diff -ru parano-0.3.3/mime/Makefile.am parano-0.3.3.new/mime/Makefile.am
+--- parano-0.3.3/mime/Makefile.am	2005-12-15 08:13:47.000000000 +1100
++++ parano-0.3.3.new/mime/Makefile.am	2006-06-11 11:14:05.000000000 +1000
+@@ -12,9 +12,3 @@
+ 	$(app_DATA) \
+ 	$(mime_DATA) \
+ 	$(mimexml_DATA)
+-
+-install-data-local: install-mimexmlDATA
+-	update-mime-database $(datadir)/mime
+-
+-uninstall-local:
+-	update-mime-database $(datadir)/mime
+diff -ru parano-0.3.3/src/Makefile.am parano-0.3.3.new/src/Makefile.am
+--- parano-0.3.3/src/Makefile.am	2005-12-15 08:13:48.000000000 +1100
++++ parano-0.3.3.new/src/Makefile.am	2006-06-11 11:14:05.000000000 +1000
+@@ -11,7 +11,3 @@
+ 
+ EXTRA_DIST = parano.gladep parano.py
+ CLEANFILES = parano
+-
+-parano: parano.py
+-	sed -e s!\@datadir\@!$(gladedir)! -e s!\@version\@!$(VERSION)! < $< > $@
+-	chmod +x $@
+--- /tmp/parano-0.3.3/configure.in	2006-05-13 03:10:02.000000000 +1000
++++ parano-0.3.3/configure.in	2006-06-11 19:46:28.000000000 +1000
+@@ -1,8 +1,9 @@
+ dnl -*- Mode: autoconf -*-
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.53)
+-AC_INIT(src/parano.py)
+-AM_INIT_AUTOMAKE(parano, "0.3.3")
++
++AC_INIT(parano, 0.3.3, http://developer.berlios.de/projects/parano/)
++AM_INIT_AUTOMAKE(parano, $PACKAGE_VERSION)
+ 
+ m4_define(required_python_abi, 2.3)
+ m4_define(required_python_version, 2.3.3)
+@@ -34,9 +35,12 @@
+     AC_MSG_ERROR(required pygtk version not found)
+ fi
+ 
++AC_SUBST(PACKAGE_VERSION)
++#AC_SUBST(datadir)
+ AC_OUTPUT(
+         Makefile
+         po/Makefile.in
+         src/Makefile
++		src/parano
+         mime/Makefile
+         )
+--- /tmp/parano-0.3.3/src/parano.py	2006-05-12 06:52:45.000000000 +1000
++++ parano-0.3.3/src/parano.in	2006-06-11 19:48:24.000000000 +1000
+@@ -18,8 +18,8 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ NAME="Parano"
+-VERSION="@version@"
+-DATADIR="@datadir@"
++VERSION="@PACKAGE_VERSION@"
++DATADIR="@datadir@/@PACKAGE@"
+ URL="http://parano.berlios.de"
+ 
+ import os, sys, time, re, thread
diff --git a/app-arch/parano/files/parano-0.3.3-makefile.patch b/app-arch/parano/files/parano-0.3.3-makefile.patch
deleted file mode 100644
index 82a1fd2d0..000000000
--- a/app-arch/parano/files/parano-0.3.3-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Only in parano-0.3.3: autom4te.cache
-diff -ur parano-0.3.3-orig/mime/Makefile.am parano-0.3.3/mime/Makefile.am
---- parano-0.3.3-orig/mime/Makefile.am	2006-06-10 23:04:54.000000000 +0200
-+++ parano-0.3.3/mime/Makefile.am	2006-06-10 23:05:55.000000000 +0200
-@@ -12,9 +12,3 @@
- 	$(app_DATA) \
- 	$(mime_DATA) \
- 	$(mimexml_DATA)
--
--install-data-local: install-mimexmlDATA
--	update-mime-database $(datadir)/mime
--
--uninstall-local:
--	update-mime-database $(datadir)/mime
-diff -ur parano-0.3.3-orig/mime/Makefile.in parano-0.3.3/mime/Makefile.in
---- parano-0.3.3-orig/mime/Makefile.in	2006-06-10 23:04:54.000000000 +0200
-+++ parano-0.3.3/mime/Makefile.in	2006-06-10 23:06:07.000000000 +0200
-@@ -357,8 +357,7 @@
- 
- info-am:
- 
--install-data-am: install-appDATA install-data-local install-mimeDATA \
--	install-mimexmlDATA
-+install-data-am: install-appDATA install-mimeDATA install-mimexmlDATA
- 
- install-exec-am:
- 
-@@ -384,27 +383,20 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-appDATA uninstall-info-am uninstall-local \
--	uninstall-mimeDATA uninstall-mimexmlDATA
-+uninstall-am: uninstall-appDATA uninstall-info-am uninstall-mimeDATA \
-+	uninstall-mimexmlDATA
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
- 	distclean-generic distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-appDATA install-data \
--	install-data-am install-data-local install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-mimeDATA install-mimexmlDATA install-strip \
--	installcheck installcheck-am installdirs maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
--	pdf-am ps ps-am uninstall uninstall-am uninstall-appDATA \
--	uninstall-info-am uninstall-local uninstall-mimeDATA \
--	uninstall-mimexmlDATA
--
--
--install-data-local: install-mimexmlDATA
--	update-mime-database $(datadir)/mime
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-mimeDATA \
-+	install-mimexmlDATA install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-+	uninstall-am uninstall-appDATA uninstall-info-am \
-+	uninstall-mimeDATA uninstall-mimexmlDATA
- 
--uninstall-local:
--	update-mime-database $(datadir)/mime
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/app-arch/parano/parano-0.3.3.ebuild b/app-arch/parano/parano-0.3.3.ebuild
index 40ac94c58..6c5712832 100644
--- a/app-arch/parano/parano-0.3.3.ebuild
+++ b/app-arch/parano/parano-0.3.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit gnome2
+inherit gnome2 autotools
 
 DESCRIPTION="GNOME program to create, edit and verify hashfiles"
 HOMEPAGE="http://parano.berlios.de"
@@ -22,9 +22,11 @@ DEPEND="${RDEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	# Removes update-mime-database error
-	epatch "${FILESDIR}"/${P}-makefile.patch
+	
+	# Many fixes, thanks to dragonheart
+	mv src/parano.py src/parano.in
+	epatch "${FILESDIR}/${P}-autoconf.patch"
+	eautoreconf
 }
 
 src_install() {