correct path for X11 libs, fix Emacs supported, reported by maekke

Package-Manager: portage-2.1.3.9

3 files changed, 28 insertions, 12 deletions

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 1a7c65fc543b..ac3fc6fc1eab 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/magicpoint
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.29 2007/09/25 11:50:19 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.30 2007/10/24 14:53:09 opfer Exp $
+
+  24 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+  magicpoint-1.12a-r1.ebuild:
+  correct path for X11 libs, fix Emacs supported, reported by maekke
 
 *magicpoint-1.12a-r1 (25 Sep 2007)
 
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index 2b71e1bb7a12..2d7ab82e1524 100644
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50magicpoint-gentoo.el 207 RMD160 f4021f7d0892aea38ad48cfb92eeb001426aadf5 SHA1 ad44a645d89e776ca4c104fb05a3a24de3333ac2 SHA256 82c87e34b6c71744d774bc7c767e8e55508405fc1d69b50d0e456e012ba2f9d3
 MD5 10cb9aff0b571f8e39e8edbff0cb771b files/50magicpoint-gentoo.el 207
 RMD160 f4021f7d0892aea38ad48cfb92eeb001426aadf5 files/50magicpoint-gentoo.el 207
@@ -20,14 +23,14 @@ EBUILD magicpoint-1.11b.ebuild 2751 RMD160 6d9d900e1821bc2bccdeecd4c112c1272ed3b
 MD5 1342ab52a356e281fae5f57b4c51e490 magicpoint-1.11b.ebuild 2751
 RMD160 6d9d900e1821bc2bccdeecd4c112c1272ed3b57e magicpoint-1.11b.ebuild 2751
 SHA256 1ac45813514fce90f7da5b15ae9c95b8c24fb51eec86c12c15baa83bea09ff67 magicpoint-1.11b.ebuild 2751
-EBUILD magicpoint-1.12a-r1.ebuild 3091 RMD160 9a908f84d747f28af6e5c8b259516162c6f0d8b5 SHA1 9bb8202c210ff649c2ef79c069198e99f75968d4 SHA256 a284bb8f734809389ebd2c768c369f54631edb0e2c83223596bdfc5195801103
-MD5 fa689ce96daafad4dd7c4ed363ac093c magicpoint-1.12a-r1.ebuild 3091
-RMD160 9a908f84d747f28af6e5c8b259516162c6f0d8b5 magicpoint-1.12a-r1.ebuild 3091
-SHA256 a284bb8f734809389ebd2c768c369f54631edb0e2c83223596bdfc5195801103 magicpoint-1.12a-r1.ebuild 3091
-MISC ChangeLog 7289 RMD160 96fd4ec746ce04ba5c4de2f2192649521fe483f3 SHA1 86b6ed078402ccbbfeb618235546b6dbff75db7f SHA256 f80f1e9927b56fe25865be5566caf3844f3e2093bc19d9b71c3bc5db687e33cc
-MD5 7c41fe42f226c8d591b51e5ef9cf3195 ChangeLog 7289
-RMD160 96fd4ec746ce04ba5c4de2f2192649521fe483f3 ChangeLog 7289
-SHA256 f80f1e9927b56fe25865be5566caf3844f3e2093bc19d9b71c3bc5db687e33cc ChangeLog 7289
+EBUILD magicpoint-1.12a-r1.ebuild 3104 RMD160 cfbc272c884b90e2485d2e9e50b4d320917a1f94 SHA1 4934387659a89a38d64365e0122fba1dccda3a63 SHA256 d45308e566c351ef0b821950a7863849a860e3991db3e9288f89b063f2c7ac63
+MD5 0255a78d23323d8c8abe690d54796bd2 magicpoint-1.12a-r1.ebuild 3104
+RMD160 cfbc272c884b90e2485d2e9e50b4d320917a1f94 magicpoint-1.12a-r1.ebuild 3104
+SHA256 d45308e566c351ef0b821950a7863849a860e3991db3e9288f89b063f2c7ac63 magicpoint-1.12a-r1.ebuild 3104
+MISC ChangeLog 7444 RMD160 f3105e508f139104f20879d43f6b925e0d6586d4 SHA1 d6fb647626cfcd25cfa2fca0c4b87799c468ac85 SHA256 f2d8cdcdc3ebe60fb6204b61688fd50570b2b9463899c3749d1a0acfe4b7c909
+MD5 655cc4216f109aab4fe98ca516455357 ChangeLog 7444
+RMD160 f3105e508f139104f20879d43f6b925e0d6586d4 ChangeLog 7444
+SHA256 f2d8cdcdc3ebe60fb6204b61688fd50570b2b9463899c3749d1a0acfe4b7c909 ChangeLog 7444
 MISC metadata.xml 570 RMD160 364228d6f8a5ac84f59d6f65b90cd33d1cd88595 SHA1 5b4fc928fb888520247afaa0f39e76b4e134ba21 SHA256 7a1fa2a71e91b5c87a8ad52328ce74dc653d8868d0ffa8a2f2e0cb6952f71253
 MD5 cca347d4b0e88766d322951ccf1e97e7 metadata.xml 570
 RMD160 364228d6f8a5ac84f59d6f65b90cd33d1cd88595 metadata.xml 570
@@ -38,3 +41,10 @@ SHA256 adb1abefc2aa18dc308364a4ec0cde8802790a3684a7e35788033d7fb83851fb files/di
 MD5 59dc4d7f9468f183aae000f9ce9b7b57 files/digest-magicpoint-1.12a-r1 250
 RMD160 f8beb83e648305de04cf3541d8891bad4fd85f11 files/digest-magicpoint-1.12a-r1 250
 SHA256 2c72e789034c5e7b4b8ecda775f4faf6017c6fc8c30a7b8d028ae7776c9437f5 files/digest-magicpoint-1.12a-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHH1xbNQqtfCuFneMRAhCyAJ0T4OIwQWEkZuuJonwrkHGP8X7UTQCfap5v
+PkfmVMKr3OtGjN/iDSQcYrw=
+=u8fk
+-----END PGP SIGNATURE-----
diff --git a/app-office/magicpoint/magicpoint-1.12a-r1.ebuild b/app-office/magicpoint/magicpoint-1.12a-r1.ebuild
index b9ac014a9aca..8e8505966da1 100644
--- a/app-office/magicpoint/magicpoint-1.12a-r1.ebuild
+++ b/app-office/magicpoint/magicpoint-1.12a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.12a-r1.ebuild,v 1.2 2007/09/28 07:20:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.12a-r1.ebuild,v 1.3 2007/10/24 14:53:09 opfer Exp $
 
 inherit autotools elisp-common eutils fixheadtails
 
@@ -56,8 +56,8 @@ src_compile() {
 		$(use_with m17n-lib) \
 		--disable-vflib \
 		--disable-freetype \
-		--x-libraries=/usr/X11R6/lib \
-		--x-includes=/usr/X11R6/include || die "econf failed"
+		--x-libraries=/usr/lib/X11 \
+		--x-includes=/usr/include/X11 || die "econf failed"
 
 	xmkmf || die "xmkmf failed"
 	# no parallel build possibly, anywhere
@@ -87,8 +87,10 @@ src_install() {
 	dobin contrib/{mgp2html.pl,mgp2latex.pl}
 
 	if use emacs ; then
+		cd contrib/
 		elisp-install ${PN} *.el *.elc || die "elisp-install failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		cd -
 	fi
 
 	use doc && dodoc FAQ README* RELNOTES SYNTAX TODO* USAGE*