Fix Emacs support, bug #187332.

Package-Manager: portage-2.1.4_rc7

5 files changed, 48 insertions, 36 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 7d2975ad9967..f364d03c54bd 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/libidn
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.70 2007/09/22 19:10:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.71 2007/12/05 09:17:25 ulm Exp $
+
+*libidn-1.0-r1 (05 Dec 2007)
+
+  05 Dec 2007; Ulrich Mueller <ulm@gentoo.org> libidn-0.6.9-r2.ebuild,
+  -libidn-1.0.ebuild, +libidn-1.0-r1.ebuild:
+  Fix Emacs support also for version 1.0, bug #187332.
 
   22 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
   libidn-0.6.9-r1.ebuild:
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 1f2a6b56db26..70eca7eba748 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -16,18 +16,18 @@ EBUILD libidn-0.6.9-r1.ebuild 1407 RMD160 3781aa1da13bd5995fe8e05eada473c747912b
 MD5 3525b88096ea5c52f60b553f6f75a66b libidn-0.6.9-r1.ebuild 1407
 RMD160 3781aa1da13bd5995fe8e05eada473c747912b44 libidn-0.6.9-r1.ebuild 1407
 SHA256 5b16315c6f7a0a1d63dc9c0ae1933e9dc766008c74beb3169ab6a2a28338e29d libidn-0.6.9-r1.ebuild 1407
-EBUILD libidn-0.6.9-r2.ebuild 1847 RMD160 73a6415fae347600e0c169c5c3fcaafeabb3e8cb SHA1 21a938b9b3d0a942b0295a8dd9b310d092c5084c SHA256 fda251e0e47e4cfdc235c677ead7adab775fec009fc26a1fcf0f05eb96c64ad1
-MD5 8438036b5844cb669a5a85af73d203e9 libidn-0.6.9-r2.ebuild 1847
-RMD160 73a6415fae347600e0c169c5c3fcaafeabb3e8cb libidn-0.6.9-r2.ebuild 1847
-SHA256 fda251e0e47e4cfdc235c677ead7adab775fec009fc26a1fcf0f05eb96c64ad1 libidn-0.6.9-r2.ebuild 1847
-EBUILD libidn-1.0.ebuild 1484 RMD160 750a81c2b443e8d872b1ccceb67e69f41c646aeb SHA1 0416de506af2f5c11e3ff41177e46ecaede6934f SHA256 bdd388aba4fd522d94962ae89deb5908604c16183b796354f8183d8557342d35
-MD5 fd75051f543d03f2b5412e89ab8be5cd libidn-1.0.ebuild 1484
-RMD160 750a81c2b443e8d872b1ccceb67e69f41c646aeb libidn-1.0.ebuild 1484
-SHA256 bdd388aba4fd522d94962ae89deb5908604c16183b796354f8183d8557342d35 libidn-1.0.ebuild 1484
-MISC ChangeLog 8793 RMD160 689fa92f9fcf7f78e6a06533c6d86e2ac5e17b80 SHA1 714838401db70d1c6b23ef67e6d91f146a44bea6 SHA256 9fd35244aad1b1c17e6260e3c357b2f4fc1eb74d5d9840a3fc4c78aa95552d31
-MD5 1332560135f048a207136fad12a031ac ChangeLog 8793
-RMD160 689fa92f9fcf7f78e6a06533c6d86e2ac5e17b80 ChangeLog 8793
-SHA256 9fd35244aad1b1c17e6260e3c357b2f4fc1eb74d5d9840a3fc4c78aa95552d31 ChangeLog 8793
+EBUILD libidn-0.6.9-r2.ebuild 1843 RMD160 dfe44d26150bc94b26f51e182e1e6aaeff1c14af SHA1 8153a867c5bd5c4cb35455116b456a02ddf3eff4 SHA256 e5f6a8300de9d5a80b8f69bf3499ee7d2c6451a226c9dbf9d64567b9332ea463
+MD5 38dd0f7c0e5dbd03beed2df936747723 libidn-0.6.9-r2.ebuild 1843
+RMD160 dfe44d26150bc94b26f51e182e1e6aaeff1c14af libidn-0.6.9-r2.ebuild 1843
+SHA256 e5f6a8300de9d5a80b8f69bf3499ee7d2c6451a226c9dbf9d64567b9332ea463 libidn-0.6.9-r2.ebuild 1843
+EBUILD libidn-1.0-r1.ebuild 1734 RMD160 0f061bdc8833e4e5fda8dada5ae3595d5240b420 SHA1 a080d000eb3d2c10424e295ed176582724908695 SHA256 57fac666bad2df6a4f731fec7ef5bfb0c1923e40bbf27ae50796c406a3d97375
+MD5 6709371ced77a59effb5babe5918090d libidn-1.0-r1.ebuild 1734
+RMD160 0f061bdc8833e4e5fda8dada5ae3595d5240b420 libidn-1.0-r1.ebuild 1734
+SHA256 57fac666bad2df6a4f731fec7ef5bfb0c1923e40bbf27ae50796c406a3d97375 libidn-1.0-r1.ebuild 1734
+MISC ChangeLog 8988 RMD160 506d17fe201a17b060545e37c73345614d51a3af SHA1 11e47c0d594b7329fc476c152783f18a43d0b33b SHA256 8158c59e81d84b238a99bfc56745b14f64e3f572481034b5c3e218b7b103ea30
+MD5 518c49c589d7af1cdeb6067a8fa34779 ChangeLog 8988
+RMD160 506d17fe201a17b060545e37c73345614d51a3af ChangeLog 8988
+SHA256 8158c59e81d84b238a99bfc56745b14f64e3f572481034b5c3e218b7b103ea30 ChangeLog 8988
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
@@ -41,13 +41,13 @@ SHA256 d8282dacbc6cd505526e2a72ef38eb69418964c7600b05eb2a2bdd1f3b1bdc6c files/di
 MD5 0f22f0272cf4b72bf24a440f906141b4 files/digest-libidn-0.6.9-r2 241
 RMD160 41c5877073fa1d017f55e168a4184e2987c4d2a1 files/digest-libidn-0.6.9-r2 241
 SHA256 d8282dacbc6cd505526e2a72ef38eb69418964c7600b05eb2a2bdd1f3b1bdc6c files/digest-libidn-0.6.9-r2 241
-MD5 f79b9ec691756d82bb7251ebebafed02 files/digest-libidn-1.0 235
-RMD160 e96434f6700b343a1af61c9078ea1ae79f92e12b files/digest-libidn-1.0 235
-SHA256 cd9699304ec15ef1076cda22d68fe8459ad491b63390c78c2d19befd7ae36ae5 files/digest-libidn-1.0 235
+MD5 f79b9ec691756d82bb7251ebebafed02 files/digest-libidn-1.0-r1 235
+RMD160 e96434f6700b343a1af61c9078ea1ae79f92e12b files/digest-libidn-1.0-r1 235
+SHA256 cd9699304ec15ef1076cda22d68fe8459ad491b63390c78c2d19befd7ae36ae5 files/digest-libidn-1.0-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG9WikCkvF58q80IkRArGsAKCZUTsebarQbtx3Dfdw15/q7yTX6ACfbsGV
-5OQZtp5juG4xnJxbLRuD44g=
-=mp7z
+iD8DBQFHVmzCOeoy/oIi7uwRAtqSAKCTT1v6R2odJSB9PZxBtqKG8+VmXgCdFBrd
+T2FM4u9IpE5LthMOCEVFNEI=
+=lnSS
 -----END PGP SIGNATURE-----
diff --git a/net-dns/libidn/files/digest-libidn-1.0 b/net-dns/libidn/files/digest-libidn-1.0-r1
index a3faed85ec31..a3faed85ec31 100644
--- a/net-dns/libidn/files/digest-libidn-1.0
+++ b/net-dns/libidn/files/digest-libidn-1.0-r1
diff --git a/net-dns/libidn/libidn-0.6.9-r2.ebuild b/net-dns/libidn/libidn-0.6.9-r2.ebuild
index 258948ca1a81..3df4141171cb 100644
--- a/net-dns/libidn/libidn-0.6.9-r2.ebuild
+++ b/net-dns/libidn/libidn-0.6.9-r2.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/net-dns/libidn/libidn-0.6.9-r2.ebuild,v 1.1 2007/09/16 17:33:19 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.6.9-r2.ebuild,v 1.2 2007/12/05 09:17:25 ulm Exp $
 
 inherit autotools elisp-common java-pkg-opt-2 mono
 
@@ -33,7 +33,7 @@ src_compile() {
 	local myconf=" --disable-csharp"
 
 	use mono && myconf="--enable-csharp=mono"
-	use emacs && myconf="${myconf} --with-lispdir="${SITELISP}/${PN}""
+	use emacs && myconf="${myconf} --with-lispdir=${SITELISP}/${PN}"
 
 	econf \
 		$(use_enable nls) \
diff --git a/net-dns/libidn/libidn-1.0.ebuild b/net-dns/libidn/libidn-1.0-r1.ebuild
index 5b17beccd6be..6fa280d8c9a2 100644
--- a/net-dns/libidn/libidn-1.0.ebuild
+++ b/net-dns/libidn/libidn-1.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.0.ebuild,v 1.2 2007/08/13 13:47:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.0-r1.ebuild,v 1.1 2007/12/05 09:17:25 ulm Exp $
 
-inherit java-pkg-opt-2 mono autotools
+inherit java-pkg-opt-2 mono autotools elisp-common
 
 DESCRIPTION="Internationalized Domain Names (IDN) implementation"
 HOMEPAGE="http://www.gnu.org/software/libidn/"
@@ -18,12 +18,14 @@ DEPEND="java? ( >=virtual/jdk-1.4
 				mono? ( >=dev-lang/mono-0.95 )
 		)"
 RDEPEND="java? ( >=virtual/jre-1.4 )
-		mono? ( >=dev-lang/mono-0.95 )"
+		mono? ( >=dev-lang/mono-0.95 )
+		emacs? ( virtual/emacs )"
 
 src_compile() {
 	local myconf=" --disable-csharp"
 
 	use mono && myconf="--enable-csharp=mono"
+	use emacs && myconf="${myconf} --with-lispdir=${SITELISP}/${PN}"
 
 	econf \
 		$(use_enable nls) \
@@ -35,28 +37,32 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO || die
 
-	if ! use emacs; then
-		if [ -e "${D}/usr/share/emacs" ] ; then
-			rm -r "${D}/usr/share/emacs" || die
-		fi
-		if [ -e "${D}/usr/lib/xemacs" ] ; then
-			rm -r "${D}/usr/lib/xemacs" || die
-		fi
-	fi
+	use emacs || rm -rf "${D}/usr/share/emacs"
+	#use xemacs || rm -rf "${D}/usr/lib/xemacs"
 
 	if use doc; then
 		dohtml -r doc/reference/html/* || die
 	fi
 
 	if use java; then
-		java-pkg_newjar ${D}/usr/share/java/${P}.jar || die
-		rm -rf ${D}/usr/share/java || die
+		java-pkg_newjar "${D}"/usr/share/java/${P}.jar || die
+		rm -rf "${D}"/usr/share/java || die
 
 		if use doc; then
 			java-pkg_dojavadoc doc/java
 		fi
 	fi
 }
+
+pkg_postinst() {
+	if use emacs; then
+		elog "activate Emacs support by adding the following lines"
+		elog "to your ~/.emacs file:"
+		elog "   (add-to-list 'load-path \"${SITELISP}/${PN}\")"
+		elog "   (load idna)"
+		elog "   (load punycode)"
+	fi
+}