Fix Emacs support, bug 187332. Other small fixes.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 54 insertions, 27 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index cf088edcc9d1..e24e8f61891d 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/libidn
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.86 2008/08/25 10:32:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.87 2008/09/03 13:29:17 ulm Exp $
+
+*libidn-1.9-r1 (03 Sep 2008)
+
+  03 Sep 2008; Ulrich Mueller <ulm@gentoo.org> +files/50libidn-gentoo.el,
+  -libidn-1.9.ebuild, +libidn-1.9-r1.ebuild:
+  Byte-compile elisp files; add a site-init file; bug 187332. Setup config
+  options with use_enable. Don't inherit autotools.eclass since it is unused.
+  Remove intermediate version.
 
   25 Aug 2008; Alexis Ballier <aballier@gentoo.org> libidn-1.9.ebuild:
   keyword ~sparc-fbsd
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 61d0807d7d7d..ac636d493083 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX 0.6.9-javacflags.patch 613 RMD160 689aa4960422c72c5d906006fe8c3ef1a5e49d61 SHA1 d3e1807c01ed750ed5951e0e56d0aa59e2b38cda SHA256 fc71933575bd0f5b241949a47b9f156a412c68986da3b600dca2a4a4ad9928a1
+AUX 50libidn-gentoo.el 455 RMD160 68a84a8b9aa9ff2b7c6e6b266e2545d2bbb243f2 SHA1 6c986493a8790b67d47444d64ec56b867f644513 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937
 DIST libidn-1.0.tar.gz 2373729 RMD160 e1ebd229cf05c6c65ac5feb6793de956eb635bbb SHA1 680c38227e546df82584e7b02aacc7ad66c3af24 SHA256 160642c11121af0b99306fb66ec7a9a8bbc740f384e9829a78ca1f061c6fc312
 DIST libidn-1.5.tar.gz 2514421 RMD160 03265a42732a01b84215847e9244d0ec580616c9 SHA1 71809366139456ee67ce893f771bbcb52cb5a8bd SHA256 e0534a84e74303c78e0d8c4b0266374a0cca2bcfec7c831ebf00e2c9d3745a3c
 DIST libidn-1.8.tar.gz 2490255 RMD160 60507f1a3e4f255df715162f9ce9ffcbd5f82dfd SHA1 cf0628e7ff5aead62ab85a49fef8a2d2d1874ef3 SHA256 ba321cddd07d1b8c155199af3426fd80b521e238c1e79c52bcdf93fb379a7ed4
@@ -9,13 +10,13 @@ DIST libidn-1.9.tar.gz 2528436 RMD160 3b2217f015965600b69983cf831746a591f0680e S
 EBUILD libidn-1.0-r1.ebuild 1731 RMD160 e1d0bb5cff5e0fd3f8af7db7c6bc39e8ff3c41a4 SHA1 768194f53f5a83dd38e3e17178b023a095247f52 SHA256 9346bcda0b5b3b7adbd67c389a0ffa7c5b18111dfa7c64e75e438e7b4201bbfe
 EBUILD libidn-1.5-r1.ebuild 1824 RMD160 62cb8a15f60c1ffcdcf5adaa0b5ff12c80496080 SHA1 520ebe28c8e6afd2867d120f10da82d95e229864 SHA256 1da0fad268e29a1c6b9b0b1b6a80a166f2192739a375f6ab4cebff01fade681f
 EBUILD libidn-1.8.ebuild 1830 RMD160 6ecc62fdce8fc339b3f5a09d0398cd7d6c4af3fe SHA1 9b8845a406c149f41680b6ad8808957618265f54 SHA256 f0a46126cf4fa166b67c0ecc31fb45eabcb692f50dfd0a09add912c351304613
-EBUILD libidn-1.9.ebuild 1843 RMD160 c189bda7133e573eb6d3a9e2367a2460e8e125de SHA1 3361129ba3316db30b7795914fc632d15d9121a0 SHA256 7918cb382aae27b7acafd0f0f33d972583c2a1b1927a48f74916d6d1561dcf2b
-MISC ChangeLog 10856 RMD160 8b2ceb533d9fe8aa1bc4552a65e4ca4504bedb24 SHA1 4b1b0db3a6a5f5cd89bff204460d5f4defc00a8c SHA256 8b086928eaa780d3e9a20d8a78b87b68769d6e0d3238ea587151020f8a596dc2
+EBUILD libidn-1.9-r1.ebuild 1832 RMD160 1665aa525516cba221f7d733da21b9f96e61e39e SHA1 4af873ae299aa21e0e3cb8c3ca0cfd0d28adcbb8 SHA256 ba5c584c9c824e54834b6c3893c9c4938310921d538fd5c7dfc8a72af247e1a0
+MISC ChangeLog 11185 RMD160 bac5af38f591fc16aa1929d0b990de80aa84b9b2 SHA1 eb52680290588377ba50e096d23f3d08516924e5 SHA256 a55ba620053b28894bae5babe878f23f8a7bfd9523f42a2c31af1137d9f6b6ea
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkiyikEACgkQvFcC4BYPU0ocogCgzLBFssWCrRptVTBrr1MHMG0s
-ueQAnApansfm8IdpZ/arDCuFjSladlVy
-=oU2Q
+iEYEARECAAYFAki+kUMACgkQOeoy/oIi7uwFyACgtRUAxTJaSj1kgSvHl04gGOM0
+u0AAn0yJNIJ9OFG86ap6ErJR9d0Zlgg8
+=zPGe
 -----END PGP SIGNATURE-----
diff --git a/net-dns/libidn/files/50libidn-gentoo.el b/net-dns/libidn/files/50libidn-gentoo.el
new file mode 100644
index 000000000000..6ab280c64eb9
--- /dev/null
+++ b/net-dns/libidn/files/50libidn-gentoo.el
@@ -0,0 +1,12 @@
+
+;;; libidn site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'idna-to-ascii "idna"
+  "Returns an ASCII Compatible Encoding (ACE) of STR.")
+(autoload 'idna-to-unicode "idna"
+  "Returns a possibly multibyte string after decoding STR.")
+(autoload 'punycode-encode "punycode"
+  "Returns a Punycode encoding of STR.")
+(autoload 'punycode-decode "punycode"
+  "Returns a possibly multibyte string which is the punycode decoding of STR.")
diff --git a/net-dns/libidn/libidn-1.9.ebuild b/net-dns/libidn/libidn-1.9-r1.ebuild
index ef0676d90195..774ab1b87dc3 100644
--- a/net-dns/libidn/libidn-1.9.ebuild
+++ b/net-dns/libidn/libidn-1.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.9.ebuild,v 1.2 2008/08/25 10:32:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.9-r1.ebuild,v 1.1 2008/09/03 13:29:17 ulm Exp $
 
-inherit java-pkg-opt-2 mono autotools elisp-common
+inherit java-pkg-opt-2 mono elisp-common
 
 DESCRIPTION="Internationalized Domain Names (IDN) implementation"
 HOMEPAGE="http://www.gnu.org/software/libidn/"
@@ -13,11 +13,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="java doc emacs mono nls"
 
-DEPEND="mono? ( >=dev-lang/mono-0.95 )
+COMMON_DEPEND="emacs? ( virtual/emacs )
+	mono? ( >=dev-lang/mono-0.95 )"
+DEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jdk-1.4 dev-java/gjdoc )"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	mono? ( >=dev-lang/mono-0.95 )
-	emacs? ( virtual/emacs )"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.4 )"
 
 src_unpack() {
 	unpack ${A}
@@ -26,25 +27,32 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=" --disable-csharp"
-
-	use mono && myconf="--enable-csharp=mono"
-	use emacs && myconf="${myconf} --with-lispdir=${SITELISP}/${PN}"
-
 	econf \
 		$(use_enable nls) \
 		$(use_enable java) \
-		${myconf} \
+		$(use_enable mono csharp mono) \
+		--with-lispdir="${SITELISP}/${PN}" \
 		|| die
 
 	emake || die
+
+	if use emacs; then
+		elisp-compile src/*.el || die
+	fi
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO || die
 
-	use emacs || rm -rf "${D}/usr/share/emacs"
+	if use emacs; then
+		# *.el are installed by the build system
+		elisp-install ${PN} src/*.elc || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	else
+		rm -rf "${D}/usr/share/emacs"
+	fi
+
 	#use xemacs || rm -rf "${D}/usr/lib/xemacs"
 
 	if use doc ; then
@@ -62,11 +70,9 @@ src_install() {
 }
 
 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
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }