From 95ba9a79f36c919932df677a2314fde3cfd9887b Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 7 Jul 2010 16:16:12 +0000 Subject: [PATCH] Optionally install static libs. Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- net-dns/libidn/ChangeLog | 6 ++- net-dns/libidn/Manifest | 8 +-- net-dns/libidn/libidn-1.16.ebuild | 83 ------------------------------- net-dns/libidn/libidn-1.18.ebuild | 83 ------------------------------- net-dns/libidn/libidn-1.19.ebuild | 5 +- 5 files changed, 10 insertions(+), 175 deletions(-) delete mode 100644 net-dns/libidn/libidn-1.16.ebuild delete mode 100644 net-dns/libidn/libidn-1.18.ebuild diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog index 21f355e74222..b471fa306096 100644 --- a/net-dns/libidn/ChangeLog +++ b/net-dns/libidn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/libidn # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.118 2010/05/22 14:03:47 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.119 2010/07/07 16:16:12 jer Exp $ + + 07 Jul 2010; Jeroen Roovers -libidn-1.16.ebuild, + -libidn-1.18.ebuild, libidn-1.19.ebuild: + Optionally install static libs. *libidn-1.19 (22 May 2010) diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest index ae2dff86df0d..2b077e4abf6f 100644 --- a/net-dns/libidn/Manifest +++ b/net-dns/libidn/Manifest @@ -1,11 +1,7 @@ AUX 50libidn-gentoo.el 455 RMD160 68a84a8b9aa9ff2b7c6e6b266e2545d2bbb243f2 SHA1 6c986493a8790b67d47444d64ec56b867f644513 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937 DIST libidn-1.15.tar.gz 2635155 RMD160 fb02015566838cbd86dda5b74f0da9ef78009b1b SHA1 6321660c7072737110b790044cbf8653a95ea175 SHA256 db75022eff366bd5646ab1e6d7bcd1c2048473a7dbdf0cd0421de92c88bbdc18 -DIST libidn-1.16.tar.gz 2746588 RMD160 100dd4ca6169fa3fbdcc01c042ea9f8f861c548f SHA1 33ff88e7111f07f3bb8aa888fdc7848bb319d4ce SHA256 f7d80facfbad22ff36dcc7c571f510e7b8d8f3e5970ba9c1c384c4f330e4dcff -DIST libidn-1.18.tar.gz 2975485 RMD160 447391e90fbf3d82ee8da7ed6ba8308e36e09807 SHA1 0b81360368e5100d1ec5261dea58fc72ef39ab6b SHA256 b824ef81319f4ba1a2e49b7208a3ad820a1baa7369e4555b8e45227e5796e77c DIST libidn-1.19.tar.gz 3207771 RMD160 71c520b6e4b1ec770bb9c9253f5b40dfc6b3d682 SHA1 2b6dcb500e8135a9444a250d7df76f545915f25f SHA256 8ed2e936b1ae3e30b45b54ca3672deaa83ee0f4d20db5ad83dc1af7222d39f41 EBUILD libidn-1.15.ebuild 1966 RMD160 35611747e329ecb3d474834f39f7c1ebc0d64b57 SHA1 25b85083524606b2f74c8f31a1234113253be3a3 SHA256 04298986c37d0cb9e73c485cc5597b2ee623b0553b56ec345e732366e90a11b4 -EBUILD libidn-1.16.ebuild 1975 RMD160 0871bbf73042159368f3250bdecee6e70e84f766 SHA1 464565e88b0d33939483088b8d210ea626281f2c SHA256 f5bddcfe5154517407075997d92a9c725dca9b4bbcd78d2ebc5b434ffdd5d3e4 -EBUILD libidn-1.18.ebuild 1975 RMD160 73cbecccfc2fec66e9e829751e1870e1ed24123f SHA1 0b63651bf45e044b6279490e53013333403b662e SHA256 22bf4ab1eb06c791c4fbb23aedfb5d45cc3484949ba9e1981d287f9b191d9bde -EBUILD libidn-1.19.ebuild 1975 RMD160 a36d5ef69f68a17328cdf769132b66eaebbba727 SHA1 ad91182f811270ffb468cae28e15f4c03c576e95 SHA256 041d2ac8dbd2e88c928ce7c9ae060c0fa7f3369a651fa85de700af8091c41cfe -MISC ChangeLog 14687 RMD160 1f3719700e107ea9bffcee6efeb5cbfca27624e1 SHA1 f79b81a2a0d9b1b98d5226fc8991823e7d5e68b5 SHA256 22a871c3c9f861b69ed13cf438aa19ca8ec0dffbdf22be72b78d3f2ef16e63ad +EBUILD libidn-1.19.ebuild 2024 RMD160 c72dc8315feb850de3fd423c07ac9b8266c3efff SHA1 9f4bc797de071d3dfa9503b9de4b460737ac00fc SHA256 09d612a74f8d621c73fc505f4558d3a7572c82de74f714320fc7d46421f7e486 +MISC ChangeLog 14833 RMD160 cf34dd455190ef2dc8bd8f932cff5a7a89ed44f2 SHA1 a51b2293d111992edaf721d15de4f1770feefd39 SHA256 19201ef7a571c656f6d54c1f3223486da33b906388738bc45a6910cf0ff256ce MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3 diff --git a/net-dns/libidn/libidn-1.16.ebuild b/net-dns/libidn/libidn-1.16.ebuild deleted file mode 100644 index 310361d1cbc0..000000000000 --- a/net-dns/libidn/libidn-1.16.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.16.ebuild,v 1.1 2010/01/14 04:01:41 jer Exp $ - -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" - -COMMON_DEPEND="emacs? ( virtual/emacs ) - mono? ( >=dev-lang/mono-0.95 )" -DEPEND="${COMMON_DEPEND} - nls? ( >=sys-devel/gettext-0.17 ) - java? ( >=virtual/jdk-1.4 dev-java/gjdoc )" -RDEPEND="${COMMON_DEPEND} - nls? ( virtual/libintl ) - java? ( >=virtual/jre-1.4 )" - -SITEFILE=50${PN}-gentoo.el - -src_unpack() { - unpack ${A} - # bundled, with wrong bytecode - rm "${S}/java/${P}.jar" || die -} - -src_compile() { - econf \ - $(use_enable nls) \ - $(use_enable java) \ - $(use_enable mono csharp mono) \ - --with-lispdir="${SITELISP}/${PN}" \ - --with-packager="Gentoo" \ - --with-packager-version="r${PR}" \ - --with-packager-bug-reports="https://bugs.gentoo.org" \ - || 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 - - 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/* || die - 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 -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-dns/libidn/libidn-1.18.ebuild b/net-dns/libidn/libidn-1.18.ebuild deleted file mode 100644 index a80d13153bee..000000000000 --- a/net-dns/libidn/libidn-1.18.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.18.ebuild,v 1.1 2010/02/15 22:05:38 jer Exp $ - -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" - -COMMON_DEPEND="emacs? ( virtual/emacs ) - mono? ( >=dev-lang/mono-0.95 )" -DEPEND="${COMMON_DEPEND} - nls? ( >=sys-devel/gettext-0.17 ) - java? ( >=virtual/jdk-1.4 dev-java/gjdoc )" -RDEPEND="${COMMON_DEPEND} - nls? ( virtual/libintl ) - java? ( >=virtual/jre-1.4 )" - -SITEFILE=50${PN}-gentoo.el - -src_unpack() { - unpack ${A} - # bundled, with wrong bytecode - rm "${S}/java/${P}.jar" || die -} - -src_compile() { - econf \ - $(use_enable nls) \ - $(use_enable java) \ - $(use_enable mono csharp mono) \ - --with-lispdir="${SITELISP}/${PN}" \ - --with-packager="Gentoo" \ - --with-packager-version="r${PR}" \ - --with-packager-bug-reports="https://bugs.gentoo.org" \ - || 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 - - 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/* || die - 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 -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-dns/libidn/libidn-1.19.ebuild b/net-dns/libidn/libidn-1.19.ebuild index 4b19b60a8e8f..9964ed0577ca 100644 --- a/net-dns/libidn/libidn-1.19.ebuild +++ b/net-dns/libidn/libidn-1.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.19.ebuild,v 1.1 2010/05/22 14:03:47 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.19.ebuild,v 1.2 2010/07/07 16:16:12 jer Exp $ inherit java-pkg-opt-2 mono elisp-common @@ -11,7 +11,7 @@ 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" +IUSE="doc emacs java mono nls static-libs" COMMON_DEPEND="emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 )" @@ -35,6 +35,7 @@ src_compile() { $(use_enable nls) \ $(use_enable java) \ $(use_enable mono csharp mono) \ + $(use_enable static-libs static) \ --with-lispdir="${SITELISP}/${PN}" \ --with-packager="Gentoo" \ --with-packager-version="r${PR}" \ -- 2.26.2