summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-dns/libidn/ChangeLog8
-rw-r--r--net-dns/libidn/files/digest-libidn-1.0-r1 (renamed from net-dns/libidn/files/digest-libidn-1.0)0
-rw-r--r--net-dns/libidn/libidn-0.6.9-r2.ebuild4
-rw-r--r--net-dns/libidn/libidn-1.0-r1.ebuild (renamed from net-dns/libidn/libidn-1.0.ebuild)34
4 files changed, 29 insertions, 17 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/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
+}