fix support for GNU Emacs, see bug 187332

Package-Manager: portage-2.1.3.9

4 files changed, 99 insertions, 9 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 79d00921ee9b..d0a44e3f4797 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.68 2007/08/15 06:04:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.69 2007/09/16 17:33:19 opfer Exp $
+
+*libidn-0.6.9-r2 (16 Sep 2007)
+
+  16 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  +libidn-0.6.9-r2.ebuild:
+  fix support for GNU Emacs, see bug 187332
 
   15 Aug 2007; Jeroen Roovers <jer@gentoo.org> libidn-0.6.9-r1.ebuild:
   Stable for HPPA (bug #188420).
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 2c308ea2dfdc..274543fbbc42 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -16,14 +16,18 @@ EBUILD libidn-0.6.9-r1.ebuild 1404 RMD160 cea9bf16702ad05551a9d1614cf8fe55ed122d
 MD5 9263f5abafb64d7d36bcea958d79bde0 libidn-0.6.9-r1.ebuild 1404
 RMD160 cea9bf16702ad05551a9d1614cf8fe55ed122d0b libidn-0.6.9-r1.ebuild 1404
 SHA256 222d95cec4cc571101ec64a8bdbf783249435006e4486a39d05242607ac07e1a libidn-0.6.9-r1.ebuild 1404
+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 8501 RMD160 167079fea79a5d3adbf36caeaa23900fc26bc385 SHA1 59a7f5986fecfa35dd750f7c7ea7e61446cb27c9 SHA256 fbdec817dff475a2e6cc8102c00528bf7c6da90ccc2577504390bc428b90acbc
-MD5 586111aafc8ec04546a30086adcf2883 ChangeLog 8501
-RMD160 167079fea79a5d3adbf36caeaa23900fc26bc385 ChangeLog 8501
-SHA256 fbdec817dff475a2e6cc8102c00528bf7c6da90ccc2577504390bc428b90acbc ChangeLog 8501
+MISC ChangeLog 8662 RMD160 9d659a81a9b0795fd0212556cc56cb5be4816423 SHA1 52c740511129ebbd4f51a943bb3b6160362e2a86 SHA256 7c1b87d31d892b66de2319fb0013513b5dbdf305f07e7feac2ac9a7d77d6f643
+MD5 b0740d3afa01d14141a3ecf8e54026fd ChangeLog 8662
+RMD160 9d659a81a9b0795fd0212556cc56cb5be4816423 ChangeLog 8662
+SHA256 7c1b87d31d892b66de2319fb0013513b5dbdf305f07e7feac2ac9a7d77d6f643 ChangeLog 8662
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
@@ -34,13 +38,16 @@ SHA256 170873bc00e236487938fabb611c5f1c820eddcf801b33fd8bcdd147b4da96db files/di
 MD5 0f22f0272cf4b72bf24a440f906141b4 files/digest-libidn-0.6.9-r1 241
 RMD160 41c5877073fa1d017f55e168a4184e2987c4d2a1 files/digest-libidn-0.6.9-r1 241
 SHA256 d8282dacbc6cd505526e2a72ef38eb69418964c7600b05eb2a2bdd1f3b1bdc6c files/digest-libidn-0.6.9-r1 241
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG0D2yp/wUKkr7RBoRAsyYAJ91Sw2TGLcj/P/OEuLF2efcUY3kOQCgw2rX
-+0TroyzI4fEhjCoF9a5XA6o=
-=WxSX
+iD8DBQFG7WjnNQqtfCuFneMRAuW0AJ90UYjOWpVdxetHdtvqELMDpUX1xACfXGhy
+YWkYOhfdR10QFOYgtiD+4gA=
+=H93W
 -----END PGP SIGNATURE-----
diff --git a/net-dns/libidn/files/digest-libidn-0.6.9-r2 b/net-dns/libidn/files/digest-libidn-0.6.9-r2
new file mode 100644
index 000000000000..f23961947108
--- /dev/null
+++ b/net-dns/libidn/files/digest-libidn-0.6.9-r2
@@ -0,0 +1,3 @@
+MD5 616135837f5aaa9fac752e6b54221fb3 libidn-0.6.9.tar.gz 2193905
+RMD160 bbf5507b33c1ae57c4b12ec60ac2ea546c3ddc8c libidn-0.6.9.tar.gz 2193905
+SHA256 f6e9baf9b5cfdab60a67d0c853198a6a528e778bc5283cef45fc4c131a2ba335 libidn-0.6.9.tar.gz 2193905
diff --git a/net-dns/libidn/libidn-0.6.9-r2.ebuild b/net-dns/libidn/libidn-0.6.9-r2.ebuild
new file mode 100644
index 000000000000..258948ca1a81
--- /dev/null
+++ b/net-dns/libidn/libidn-0.6.9-r2.ebuild
@@ -0,0 +1,74 @@
+# 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 $
+
+inherit autotools elisp-common java-pkg-opt-2 mono
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="http://www.gnu.org/software/libidn/"
+SRC_URI="ftp://alpha.gnu.org/pub/gnu/libidn/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="java doc emacs mono nls"
+
+DEPEND="java? ( >=virtual/jdk-1.4
+				dev-java/gjdoc
+				mono? ( >=dev-lang/mono-0.95 )
+		)"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+		mono? ( >=dev-lang/mono-0.95 )
+		emacs? ( virtual/emacs )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/0.6.9-javacflags.patch"
+	elibtoolize
+	eautomake
+}
+
+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} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
+
+	use emacs || rm -r "${D}/usr/share/emacs"
+
+	if use doc; then
+		dohtml -r doc/reference/html/*
+	fi
+
+	if use java; then
+		java-pkg_newjar "${D}/usr/share/java/${P}.jar" || die "java-pkg_newjar failed"
+		rm -rf "${D}/usr/share/java"
+
+		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 to your ~/.emacs file"
+		elog "   (add-to-list 'load-path \"${SITELISP}/${PN}\")"
+		elog "   (load idna)"
+		elog "   (load punycode)"
+	fi
+}