Fix drop-jreality-patch and libexecdir, thanks Benjamin Lorenz

Package-Manager: portage-2.1.10.43/cvs/Linux x86_64

4 files changed, 16 insertions, 12 deletions

diff --git a/sci-mathematics/polymake/ChangeLog b/sci-mathematics/polymake/ChangeLog
index be326db6ebea..c3aeff905e9c 100644
--- a/sci-mathematics/polymake/ChangeLog
+++ b/sci-mathematics/polymake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/polymake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.7 2011/12/25 15:21:49 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.8 2011/12/26 08:32:49 tomka Exp $
+
+  26 Dec 2011; Thomas Kahle <tomka@gentoo.org> polymake-2.11.ebuild,
+  files/polymake-2.11-drop-jreality.patch:
+  Fix drop-jreality-patch and libexecdir, thanks Benjamin Lorenz
 
 *polymake-2.11 (25 Dec 2011)
 
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 11c4e9b39f29..09d2297e78ec 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX 2.10-drop-jreality.patch 1091 RMD160 6b1e49f3ca55319413db31479d501904a846c7b8 SHA1 ad9917f637def387799f5dd090e2f48d684944bb SHA256 25790558e1ba2a5491805c9d3851569db73036d658ac749f05e1f5ce8a0f5c7d
 AUX 2.10-soname.patch 1057 RMD160 a9b2344dacdde91ec1d3fa5d57e54ddaf6e53050 SHA1 a3a4830253d24731eeeb31a852dcb3ad49298f0f SHA256 3f1a3f2cebb4d2bebd26bc7b906bb3787e05efdab49075d37c736b5bec5cf204
-AUX polymake-2.11-drop-jreality.patch 1083 RMD160 4cde9a92437aceba4aedf4a86cd574678e5cc614 SHA1 dac30cdfa6aa0aa99bb3e9a0ce70340e55890967 SHA256 e85181b8fee89532ce36223e3bd52ff57e73474394fb8096c570a38ebb2e91e8
+AUX polymake-2.11-drop-jreality.patch 1089 RMD160 21408cc895710a3665ae264c621ced6ffb48c414 SHA1 03740f85add8ba2142b5573ee3439b81ca45d6a8 SHA256 eef8495dbc941409c4cbaeb05e8ec6ef4d4895a51b98ce4bc543ad29c875fb3c
 DIST polymake-2.10-2.tar.bz2 22276991 RMD160 c32687b1361eddfc27aeef3cec7719ed3b35c0dd SHA1 2990537954725d7da763f1f1fdcf6c2e954d94dc SHA256 48ecf60bbb52cbb190bc7800e949793c68c322615d67a4f8a481e06059e45752
 DIST polymake-2.11_rc2.tar.bz2 22487813 RMD160 c53e2811861322d530d9b688c1f08ba9798ce166 SHA1 69342929b3bf5d40dde7fe3df0563b7f7c69c472 SHA256 6efac71d7d93d232a0d6a72874728e3f1276c18d537a6e5340f65b0d6b9caec8
 EBUILD polymake-2.10.ebuild 2364 RMD160 4471d47328b9f7db8fc353c389aa51ac141605ab SHA1 b46ec59ef9a35a94231188d71a3b3c1d589ae4c6 SHA256 734906c5508680910d0f5c53ab4a7d7859f19d7ad733ead423242ed7456f414b
-EBUILD polymake-2.11.ebuild 2344 RMD160 aa1e1b63a59d0852017b273009c52a0d0ccc8d75 SHA1 ebebdf14c901b328209b0c6b28f9485acd75c7a6 SHA256 be8289591ba52b0e6f35b9435fc07503e2ac4a36b842afc6063e2c107cd46b65
-MISC ChangeLog 1570 RMD160 36ceace51de37504f20d97ed539cdeb0e8df34d4 SHA1 46afd74c612eecf40b4928b1ce8052d11d402564 SHA256 4d11f9da2f6493b0f714ecc6ce5e8dcb75e8f635083a195b416bd9615d854c69
+EBUILD polymake-2.11.ebuild 2322 RMD160 e6a93c795dfc72c304cc8affaf7fe4360b167920 SHA1 77522b24dc4b761e1821d17036f1d1ed3eea021e SHA256 f7e89550e385c74ed50120bae7846fdda63cbb0e4dfb2334eb4835d764fd36e7
+MISC ChangeLog 1748 RMD160 a7a7f30effe86eacca6fe294925fce8ca9f513ad SHA1 cec6a81d05b79911b9f309d15e473fec7c702ba7 SHA256 604d4f91e67a6f87b58080155ff43423bca057d5f3134a968a1a839f3a257583
 MISC metadata.xml 615 RMD160 1779fe920cb0ac998ddc9477b005ba5d4bce073d SHA1 4ae7194efb2d6f693d8f24658e0da7210e335bbf SHA256 05a17f47de10b29c32a8edd01ed12ad2584e6f2762c931605af0e1845bed6895
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk73P5QACgkQodBTJSDyo654IQD+KiGZHmqA9HuThUyzQNeOjwLh
-f387DtQGoYH96D0Q13QA/RBouyU6qH5rsjC4XvhhnAPOL79GBE7vB4qxs7ui2BGc
-=fNlt
+iF4EAREIAAYFAk74MUAACgkQodBTJSDyo66gXAD/Zz2S4KeaVX0nTIdnp4YMRTMF
+vvNP0ft+qxrQFCR9uNwA/1pfzy1J9n5aYz3s23c+RgMZAe0vDmzkvFTShw52jBYI
+=W4Hh
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch b/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch
index 21485804ab2f..0eefe58ac938 100644
--- a/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch
+++ b/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch
@@ -6,12 +6,12 @@ diff -U 3 -dHrN polymake-2.11.orig/Makefile polymake-2.11/Makefile
  	 *linux*|*Linux*) \
  	   for d in linux32 linux64; do \
 -	     ${PERL} ${INSTALL_PL} -m ${DirMask} -U external/jreality/jni/$$d ${InstallArch}/lib/jreality/jni/$$d; \
-+		;; \
++		true; \
  	   done; \
  	   ;; \
           Darwin*|darwin*) \
 -	   ${PERL} ${INSTALL_PL} -m ${DirMask} -U external/jreality/jni/macosx ${InstallArch}/lib/jreality/jni/macosx; \
-+		;; \
++		true; \
  	   ;; \
  	 esac
  	[ -d ${InstallBin} ] || $(call _CreateDir,${InstallBin})
diff --git a/sci-mathematics/polymake/polymake-2.11.ebuild b/sci-mathematics/polymake/polymake-2.11.ebuild
index 8862851c91f7..504908a229c7 100644
--- a/sci-mathematics/polymake/polymake-2.11.ebuild
+++ b/sci-mathematics/polymake/polymake-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.11.ebuild,v 1.1 2011/12/25 15:21:49 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.11.ebuild,v 1.2 2011/12/26 08:32:49 tomka Exp $
 
 EAPI=2
 
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	# embedded jreality is a precompiled desaster (bug #346073)
 	epatch "${FILESDIR}/${P}"-drop-jreality.patch
-	# Assign a soname (reported upstream, no answer)
+	# Assign a soname
 	epatch "${FILESDIR}/2.10"-soname.patch
 	rm -rf java_build/jreality
 
@@ -60,7 +60,7 @@ src_configure () {
 		--without-java \
 		--without-prereq \
 		--libdir=/usr/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
+		--libexecdir=/usr/$(get_libdir)/polymake \
 		"${myconf}" || die
 }