Version bump. Do not use autotools-utils.eclass (bug #392161).

Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 4dabea29b1974b6e495a5f26ee4d421de03d716e..f0df683fae03b7c6a61d0987c0d0f18b4ca4b534 100644 (file)
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/libidn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.146 2011/10/18 20:24:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.147 2011/11/27 23:29:32 jer Exp $
+
+*libidn-1.23 (27 Nov 2011)
+
+  27 Nov 2011; Jeroen Roovers <jer@gentoo.org> libidn-1.22-r1.ebuild,
+  +libidn-1.23.ebuild:
+  Version bump. Do not use autotools-utils.eclass (bug #392161).
 
 *libidn-1.22-r1 (18 Oct 2011)
 

diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 131f2c080894ad9b345479fbf75b72f26d26a842..b16cba430f140dca0aea34f5adf506c7093f54b5 100644 (file)
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 AUX 50libidn-gentoo.el 455 RMD160 68a84a8b9aa9ff2b7c6e6b266e2545d2bbb243f2 SHA1 6c986493a8790b67d47444d64ec56b867f644513 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937
 DIST libidn-1.22.tar.gz 3356444 RMD160 46773bd6192faaeef52c88b6aa8d2e3242f2cdd8 SHA1 8358e897c24d534438f6b5694c25e85889d860c3 SHA256 2f765e868795f5478900ec9f42cb0ecc6ca22e2a85a62763c0b13c7da2f588ed
-EBUILD libidn-1.22-r1.ebuild 2087 RMD160 d6c409e6ac4ddd374e9ec63328b78a38998155a4 SHA1 b86c18cd43cd5004c24391f34aa733331af12c8d SHA256 9144ecabddd066b87e7c0c096e33f2aa7549f977794643c6971cd29d742fe4ff
+DIST libidn-1.23.tar.gz 3477618 RMD160 22922f29abe5045f4cb1c30d3b3f75950e5b8b1c SHA1 98b00aeb8240a7a6e02f338edd6ef08adbc31a34 SHA256 25b42d75851ebae52e1c969353b74eefd3d6817f41c8d2a6db258f5ec60c5e6a
+EBUILD libidn-1.22-r1.ebuild 2088 RMD160 cb923fbb1667fe4ba26f529e4881758d09108836 SHA1 073709ceaf13b9d662556da2f47fc3f724bdb75f SHA256 b119508653b25a25b7a5c9d8cce055bd8ebeabea54379a713e150d9229034e94
 EBUILD libidn-1.22.ebuild 2059 RMD160 d96e1513ba032a8982bc328d40ee6465180f014f SHA1 c96e9310e1dc28bce57c3c0565d93303e37d331a SHA256 dbd9712e05ea407e74fbfddeca07f4cd281394317a81f0ae18d0d09998953d53
-MISC ChangeLog 17800 RMD160 423364a3d04e4d481537c0b7334cf4a428c78d55 SHA1 306b1370062d6a21054767de2b53c3d18270d142 SHA256 69ff8c6e63cea92c8a83cf23c29d6b2498c491a0f76690cbf8c30f431b56c056
+EBUILD libidn-1.23.ebuild 2085 RMD160 877a6d8b952ebacb4a18aa2db27529806a6110eb SHA1 a2bf5ad5710ba06aca7e21ee1e720d459af2feca SHA256 9f526778518c01070248a0663f82c89ffcece60b0d47c7e03a70c64bfb5ef4c7
+MISC ChangeLog 17987 RMD160 efe03ed72c96ef11ab687fd3882361d5524483da SHA1 4be3cdef5252ba3fa50eb9a593a0b7b1ec2b3fef SHA256 651b705372d718e376eadcd5b60c2c4b1ce132530cb4182761c1409b5cd15b94
 MISC metadata.xml 230 RMD160 f4eaafe69d80938604be6213ca2529b73ced7a53 SHA1 27d0d9e737236700ad6d266c9a2fc8869f427869 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6d4GYACgkQVWmRsqeSphPXmQCeLcvuCsp/dcmzcRJFU4V5loMS
-AmAAnR4+32/W0l5SnF26/6PtIM/qfKdO
-=yG3o
+iEYEARECAAYFAk7Sx+MACgkQVWmRsqeSphPlxACfRtUYjwtI5Q4F9CI0BuX0Qlxw
+eZoAnjCN7yaj2o4w8tZEVzgBid/z1tDg
+=7Ug2
 -----END PGP SIGNATURE-----

diff --git a/net-dns/libidn/libidn-1.22-r1.ebuild b/net-dns/libidn/libidn-1.22-r1.ebuild
index a06fb891a93f83b22a3b1138a957fe3bd62dd8d4..d1d6a00a8790b792793523b41f3e90a8f566aad6 100644 (file)
--- a/net-dns/libidn/libidn-1.22-r1.ebuild
+++ b/net-dns/libidn/libidn-1.22-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.22-r1.ebuild,v 1.1 2011/10/18 20:24:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.22-r1.ebuild,v 1.2 2011/11/27 23:29:32 jer Exp $
 
 EAPI="4"
 
-inherit autotools-utils java-pkg-opt-2 mono elisp-common
+inherit java-pkg-opt-2 mono elisp-common
 
 DESCRIPTION="Internationalized Domain Names (IDN) implementation"
 HOMEPAGE="http://www.gnu.org/software/libidn/"
@@ -20,7 +20,7 @@ COMMON_DEPEND="emacs? ( virtual/emacs )
 DEPEND="${COMMON_DEPEND}
        nls? ( >=sys-devel/gettext-0.17 )
        java? (
-               >=virtual/jdk-1.4
+               virtual/jdk
                doc? ( dev-java/gjdoc )
        )"
 RDEPEND="${COMMON_DEPEND}
@@ -79,7 +79,9 @@ src_install() {
                        java-pkg_dojavadoc doc/java
                fi
        fi
-       use static-libs || remove_libtool_files
+       if ! use static-libs; then
+               rm -f "${D}"/usr/lib*/lib*.la
+       fi
 }
 
 pkg_postinst() {

diff --git a/net-dns/libidn/libidn-1.23.ebuild b/net-dns/libidn/libidn-1.23.ebuild
new file mode 100644 (file)
index 0000000..9109358
--- /dev/null
+++ b/net-dns/libidn/libidn-1.23.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.23.ebuild,v 1.1 2011/11/27 23:29:32 jer Exp $
+
+EAPI="4"
+
+inherit java-pkg-opt-2 mono elisp-common
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="http://www.gnu.org/software/libidn/"
+SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc emacs java mono nls static-libs"
+
+COMMON_DEPEND="emacs? ( virtual/emacs )
+       mono? ( >=dev-lang/mono-0.95 )"
+DEPEND="${COMMON_DEPEND}
+       nls? ( >=sys-devel/gettext-0.17 )
+       java? (
+               virtual/jdk
+               doc? ( dev-java/gjdoc )
+       )"
+RDEPEND="${COMMON_DEPEND}
+       nls? ( virtual/libintl )
+       java? ( >=virtual/jre-1.4 )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+       # bundled, with wrong bytecode
+       rm "${S}/java/${P}.jar" || die
+}
+
+src_configure() {
+       econf \
+               $(use_enable nls) \
+               $(use_enable java) \
+               $(use_enable mono csharp mono) \
+               $(use_enable static-libs static) \
+               --disable-valgrind-tests \
+               --with-lispdir="${SITELISP}/${PN}" \
+               --with-packager="Gentoo" \
+               --with-packager-version="r${PR}" \
+               --with-packager-bug-reports="https://bugs.gentoo.org"
+}
+
+src_compile() {
+       default
+
+       if use emacs; then
+               elisp-compile src/*.el || die
+       fi
+}
+
+src_install() {
+       default
+       dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
+
+       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
+
+       if use doc ; then
+               dohtml -r doc/reference/html/*
+       fi
+
+       if use java ; then
+               java-pkg_newjar java/${P}.jar ${PN}.jar || die
+               rm -rf "${D}"/usr/share/java || die
+
+               if use doc ; then
+                       java-pkg_dojavadoc doc/java
+               fi
+       fi
+       if ! use static-libs; then
+               rm -f "${D}"/usr/lib*/lib*.la
+       fi
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}