summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/libidn/ChangeLog10
-rw-r--r--net-dns/libidn/files/50libidn-gentoo.el12
-rw-r--r--net-dns/libidn/libidn-1.9-r1.ebuild (renamed from net-dns/libidn/libidn-1.9.ebuild)46
3 files changed, 47 insertions, 21 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/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
}