Changed default browser from netscape to xdg-open, now installs docs in standard Gentoo directories. Also added pkgconfig in DEPEND, closing bug #204782.

Package-Manager: portage-2.1.4_rc14

4 files changed, 72 insertions, 18 deletions

diff --git a/sci-mathematics/euler/ChangeLog b/sci-mathematics/euler/ChangeLog
index db78f9509bb2..25783f513f70 100644
--- a/sci-mathematics/euler/ChangeLog
+++ b/sci-mathematics/euler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/euler
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/ChangeLog,v 1.15 2007/07/25 17:40:26 drac Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/ChangeLog,v 1.16 2008/01/07 23:44:34 bicatali Exp $
+
+  07 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/euler-xdg.patch, euler-1.61.0.ebuild:
+  Changed default browser from netscape to xdg-open, now installs docs in
+  standard Gentoo directories. Also added pkgconfig in DEPEND, closing bug
+  #204782.
 
   25 Jul 2007; Samuli Suominen <drac@gentoo.org> -euler-1.60.6-r1.ebuild:
   Prune unused version, GTK+-1.2 deprecation.
diff --git a/sci-mathematics/euler/Manifest b/sci-mathematics/euler/Manifest
index 9d64f2af8116..9b0029624798 100644
--- a/sci-mathematics/euler/Manifest
+++ b/sci-mathematics/euler/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX command-gcc4-gentoo.patch 341 RMD160 433a86213f049d3ffb9ec3023419c2faf0f4b87c SHA1 a6b222d470510ee4354cda1ba640b6ae0a96b214 SHA256 9871a61e1a04efc3780c0a140eb86b055c6d2637e75a4316b3988580e93c0787
 MD5 2c3ee647a9bb675678ac382dc4d4369c files/command-gcc4-gentoo.patch 341
 RMD160 433a86213f049d3ffb9ec3023419c2faf0f4b87c files/command-gcc4-gentoo.patch 341
@@ -10,15 +13,19 @@ AUX euler-glibc-2.4-gentoo.patch 349 RMD160 509201244866852702d01a3a924dd9b9c85f
 MD5 c554d3f6ecbbd3518199d769677e44b6 files/euler-glibc-2.4-gentoo.patch 349
 RMD160 509201244866852702d01a3a924dd9b9c85fea44 files/euler-glibc-2.4-gentoo.patch 349
 SHA256 90b7dd6d35c38bf18adb64b1312912c4aeb3147ecc65b0899899cc05534d2fe6 files/euler-glibc-2.4-gentoo.patch 349
+AUX euler-xdg.patch 918 RMD160 01103d9a73b80c5cd9ef814cf1e7476976b6791a SHA1 df07b516fb8384441f9378f25bbef2dbeed2785b SHA256 a475529fcab14e7e8f7c08ef84bb73e36c3c4126052b6839ee2962ab1617bfa0
+MD5 f85483ace6500cb2c060702687a8fdff files/euler-xdg.patch 918
+RMD160 01103d9a73b80c5cd9ef814cf1e7476976b6791a files/euler-xdg.patch 918
+SHA256 a475529fcab14e7e8f7c08ef84bb73e36c3c4126052b6839ee2962ab1617bfa0 files/euler-xdg.patch 918
 DIST euler-1.61.0.tgz 1202485 RMD160 d015f1eaf1192508ddfe20ea9aba033bcc1d140d SHA1 55f8c768bf370db5ea07911cc40a995c556d23a4 SHA256 1350a3ded26fa8bab2580a1dc3a689aabbb100b872df62819327282773e02d95
-EBUILD euler-1.61.0.ebuild 841 RMD160 de87b09fcfadc3140da95af8ca5fd78f3ada8a09 SHA1 056c557acd7b54ee0473c89cae2b61e746c6968b SHA256 9dd8b217c67357a954d530b62d40d222df4d30722b92dc92b67430af192e12c7
-MD5 a52f2186d8f98756feb83c3bc3b62f81 euler-1.61.0.ebuild 841
-RMD160 de87b09fcfadc3140da95af8ca5fd78f3ada8a09 euler-1.61.0.ebuild 841
-SHA256 9dd8b217c67357a954d530b62d40d222df4d30722b92dc92b67430af192e12c7 euler-1.61.0.ebuild 841
-MISC ChangeLog 4632 RMD160 ce6d20a9115528fcdd9b0ca8bce58de610689213 SHA1 10fd8cab77c3df1ed4ace370c59c8a9f6d3ac6b8 SHA256 303710c135c474214998c4471ad7d771384cbcc93c46f4cfeedc81bf2a1e51d2
-MD5 189ea0c36c9dd0ddddcf49e6b434c967 ChangeLog 4632
-RMD160 ce6d20a9115528fcdd9b0ca8bce58de610689213 ChangeLog 4632
-SHA256 303710c135c474214998c4471ad7d771384cbcc93c46f4cfeedc81bf2a1e51d2 ChangeLog 4632
+EBUILD euler-1.61.0.ebuild 1117 RMD160 5386c8636d4505f9201022a10933c6afd3be3bf7 SHA1 d910d8de978e87052a222320380ca15217d4bcfd SHA256 0dd1349b3286b28bd873c3fd2a9abf54a8b61c377d135afb53f378e7c00aeb86
+MD5 f75039a18856758cfa9468d741e97889 euler-1.61.0.ebuild 1117
+RMD160 5386c8636d4505f9201022a10933c6afd3be3bf7 euler-1.61.0.ebuild 1117
+SHA256 0dd1349b3286b28bd873c3fd2a9abf54a8b61c377d135afb53f378e7c00aeb86 euler-1.61.0.ebuild 1117
+MISC ChangeLog 4899 RMD160 304a2594daa3f309579bfb6f84a48c2843d29f88 SHA1 1f86325c272a4e267fabc59c5711985da9435d40 SHA256 6998ba1039c2b13e2fffd22f48755a8651212906d7836ffda33269f4dc36afd4
+MD5 0284fd1ff0398a3164f04380599a9e2c ChangeLog 4899
+RMD160 304a2594daa3f309579bfb6f84a48c2843d29f88 ChangeLog 4899
+SHA256 6998ba1039c2b13e2fffd22f48755a8651212906d7836ffda33269f4dc36afd4 ChangeLog 4899
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
@@ -26,3 +33,10 @@ SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9 metadata
 MD5 e695eadddeb53eadf9a80df723941a04 files/digest-euler-1.61.0 232
 RMD160 0a14649ebd0c0523b655b652bd11a826cb756d87 files/digest-euler-1.61.0 232
 SHA256 f719d3ffda7cb0df5d15f9224a094efbfe5e4f1fb1c69b3c1fa98672ae860395 files/digest-euler-1.61.0 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHgrlw1ycZbhPLE2ARAl0oAKCqhqs+aMx+qJFXZXUV2AzjNuR1sQCgjrzw
+9RZ+7Y2OFoc0UNe3yIsrq7Q=
+=Q1sQ
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/euler/euler-1.61.0.ebuild b/sci-mathematics/euler/euler-1.61.0.ebuild
index ecd35ad06f8a..047c2c8ac02b 100644
--- a/sci-mathematics/euler/euler-1.61.0.ebuild
+++ b/sci-mathematics/euler/euler-1.61.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/euler-1.61.0.ebuild,v 1.6 2007/07/13 05:28:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/euler-1.61.0.ebuild,v 1.7 2008/01/07 23:44:34 bicatali Exp $
 
 inherit autotools eutils
 
@@ -11,7 +11,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc -sparc x86"
 IUSE=""
-DEPEND=">=x11-libs/gtk+-2"
+
+DEPEND=">=x11-libs/gtk+-2
+	dev-util/pkgconfig"
+
+RDEPEND=">=x11-libs/gtk+-2
+	x11-misc/xdg-utils"
 
 src_unpack() {
 	unpack ${A}
@@ -19,13 +24,19 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/configure-gentoo.patch
 	epatch "${FILESDIR}"/command-gcc4-gentoo.patch
-	epatch "${FILESDIR}"/euler-glibc-2.4-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-glibc-2.4-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-xdg.patch
+	# gentoo specific stuff
+	sed -i -e '/COPYING/d' -e '/INSTALL/d' Makefile.am
+	sed -i \
+		-e "s:doc/euler:doc/${PF}:g" \
+		Makefile.am docs/Makefile.am \
+		docs/*/Makefile.am docs/*/images/Makefile.am \
+		src/main.c \
+		|| die "sed for docs failed"
 	eautoreconf
-
-	sed -e 's:g77:g77 gfortran:g' -i ./configure || \
-		die "Failed to patch configure"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 }
diff --git a/sci-mathematics/euler/files/euler-xdg.patch b/sci-mathematics/euler/files/euler-xdg.patch
new file mode 100644
index 000000000000..cb1bf54a2bbb
--- /dev/null
+++ b/sci-mathematics/euler/files/euler-xdg.patch
@@ -0,0 +1,23 @@
+--- docs/doc.html.orig	2008-01-07 23:11:25.490634852 +0000
++++ docs/doc.html	2008-01-07 23:13:57.652980222 +0000
+@@ -184,7 +184,8 @@
+ <div align=center><img src="images/pref3.gif"></div>
+ 
+ <p align="justify">Finally, You can set a flag to let Euler save preferences at exit (the default).
+-You may choose another browser than the one suggested (netscape by default). And
++You may choose another browser than the one suggested (your default
++  desktop browser is selected with xdg-open by default). And
+ You can also reset the preferences to the default values.</p>
+ <div align=center><img src="images/pref4.gif"></div>
+ 
+--- src/rc.h.orig	2008-01-07 23:15:36.617118688 +0000
++++ src/rc.h	2008-01-07 23:15:54.097371330 +0000
+@@ -26,7 +26,7 @@
+ #define E_GSTACK_DEFAULT		4*1024l
+ #define E_GLINES_DEFAULT		40
+ 
+-#define E_BROWSER_DEFAULT		"netscape"
++#define E_BROWSER_DEFAULT		"xdg-open"
+ 
+ #define MAX_COLORS				16
+