From 473928bb1d82f7d83e478e499259cf1d2f7561cf Mon Sep 17 00:00:00 2001 From: Dane Smith Date: Fri, 20 Aug 2010 14:05:50 -0400 Subject: Revbump --- net-libs/gnutls/ChangeLog | 6 ++ net-libs/gnutls/Manifest | 5 +- net-libs/gnutls/gnutls-2.10.0-r1.ebuild | 98 +++++++++++++++++++++++++++++++++ net-libs/gnutls/gnutls-2.10.0.ebuild | 98 --------------------------------- 4 files changed, 107 insertions(+), 100 deletions(-) create mode 100644 net-libs/gnutls/gnutls-2.10.0-r1.ebuild delete mode 100644 net-libs/gnutls/gnutls-2.10.0.ebuild diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog index 09a75e3..b376723 100644 --- a/net-libs/gnutls/ChangeLog +++ b/net-libs/gnutls/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*gnutls-2.10.0-r1 (20 Aug 2010) + + 20 Aug 2010; Dane Smith (c1pher) + -gnutls-2.10.0.ebuild, +gnutls-2.10.0-r1.ebuild: + Revbump + *gnutls-2.10.0 (20 Aug 2010) 20 Aug 2010; Dane Smith (c1pher) diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index a8bd018..a859aa4 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1,5 +1,6 @@ AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71 DIST gnutls-2.10.0.tar.bz2 7443055 RMD160 df2bdc20b841205fa20c8893dc3cb11a35946e2e SHA1 16c94a1262f8ea3c4dd34eec495bd57203bbcd3a SHA256 8596643ce143bf6dd933594dd12da10024b4284cdd1fde758aeff65cbaf68c88 -EBUILD gnutls-2.10.0.ebuild 2583 RMD160 70358e158dac6d421dd8a2dea1516066cabc7c59 SHA1 df5ee5baf40a44ef684c0247a07b05fcc70e3f1d SHA256 b050d8b3425ca0435d61074ba2da8a6adeee91646ebf87561cefce26fe8911a3 -MISC ChangeLog 373 RMD160 b959a62597ffe4806a5827c7c048993b6d0c11e9 SHA1 433a126bd3d8763a48db3af626f13951ba2e4b1d SHA256 f6e2104d8518302ffb1b1b0ff4660088432e7ca324a3875aeb1d862564ed3e28 +EBUILD gnutls-2.10.0-r1.ebuild 2583 RMD160 70358e158dac6d421dd8a2dea1516066cabc7c59 SHA1 df5ee5baf40a44ef684c0247a07b05fcc70e3f1d SHA256 b050d8b3425ca0435d61074ba2da8a6adeee91646ebf87561cefce26fe8911a3 +MISC ChangeLog 526 RMD160 c74391bdb57a61b4270635646fc73cbfebb6e60f SHA1 2efc48debace35097a8d4a9268c0b96b2f1b1119 SHA256 fba76b0a5f6c12207fc9fa0952eccb863ad7abb74a7247b2c8e2b5e4df9fe5fb +MISC ChangeLog.new~ 244 RMD160 cf07e67be715e391ef9f76fc19deeb74143dba61 SHA1 905a168db30b94f7899bd964321f14837c97def5 SHA256 6f8eaa2d7f1e80c1e9c21656171bb5959e7fd37db41b026d464eaf5753de8d1a MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 diff --git a/net-libs/gnutls/gnutls-2.10.0-r1.ebuild b/net-libs/gnutls/gnutls-2.10.0-r1.ebuild new file mode 100644 index 0000000..2d76d98 --- /dev/null +++ b/net-libs/gnutls/gnutls-2.10.0-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.10.0.ebuild,v 1.8 2010/08/06 16:50:42 jer Exp $ + +EAPI="3" + +inherit autotools libtool + +DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" +HOMEPAGE="http://www.gnutls.org/" + +if [[ "${PV}" == *pre* ]]; then + SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz" +else + MINOR_VERSION="${PV#*.}" + MINOR_VERSION="${MINOR_VERSION%.*}" + if [[ $((MINOR_VERSION % 2)) == 0 ]]; then + #SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" + SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" + else + SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2" + fi + unset MINOR_VERSION +fi + +# GPL-3 for the gnutls-extras library and LGPL for the gnutls library. +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="bindist +cxx doc examples guile lzo nls zlib" + +RDEPEND="dev-libs/libgpg-error + >=dev-libs/libgcrypt-1.4.0 + >=dev-libs/libtasn1-0.3.4 + nls? ( virtual/libintl ) + guile? ( dev-scheme/guile[networking] ) + zlib? ( >=sys-libs/zlib-1.1 ) + !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )" +DEPEND="${RDEPEND} + sys-devel/libtool + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test? ( valgrind? ( dev-util/valgrind ) )" + +S="${WORKDIR}/${P%_pre*}" + +pkg_setup() { + if use lzo && use bindist; then + ewarn "lzo support was disabled for binary distribution of GnuTLS" + ewarn "due to licensing issues. See Bug #202381 for details." + fi +} + +src_prepare() { + sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am + + local dir + for dir in m4 lib/m4 libextra/m4; do + rm -f "${dir}/lt"* "${dir}/libtool.m4" + done + find . -name ltmain.sh -exec rm {} \; + for dir in . lib libextra; do + pushd "${dir}" > /dev/null + eautoreconf + popd > /dev/null + done + + elibtoolize # for sane .so versioning on FreeBSD +} + +src_configure() { + local myconf + use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)" + econf --htmldir=/usr/share/doc/${P}/html \ + $(use_enable cxx) \ + $(use_enable doc gtk-doc) \ + $(use_enable guile) \ + $(use_enable nls) \ + $(use_enable valgrind valgrind-tests) \ + $(use_with zlib) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO + + if use doc; then + dodoc doc/gnutls.{pdf,ps} + dohtml doc/gnutls.html + fi + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/gnutls-2.10.0.ebuild b/net-libs/gnutls/gnutls-2.10.0.ebuild deleted file mode 100644 index 2d76d98..0000000 --- a/net-libs/gnutls/gnutls-2.10.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.10.0.ebuild,v 1.8 2010/08/06 16:50:42 jer Exp $ - -EAPI="3" - -inherit autotools libtool - -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" -HOMEPAGE="http://www.gnutls.org/" - -if [[ "${PV}" == *pre* ]]; then - SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz" -else - MINOR_VERSION="${PV#*.}" - MINOR_VERSION="${MINOR_VERSION%.*}" - if [[ $((MINOR_VERSION % 2)) == 0 ]]; then - #SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" - SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - else - SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2" - fi - unset MINOR_VERSION -fi - -# GPL-3 for the gnutls-extras library and LGPL for the gnutls library. -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="bindist +cxx doc examples guile lzo nls zlib" - -RDEPEND="dev-libs/libgpg-error - >=dev-libs/libgcrypt-1.4.0 - >=dev-libs/libtasn1-0.3.4 - nls? ( virtual/libintl ) - guile? ( dev-scheme/guile[networking] ) - zlib? ( >=sys-libs/zlib-1.1 ) - !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )" -DEPEND="${RDEPEND} - sys-devel/libtool - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - test? ( valgrind? ( dev-util/valgrind ) )" - -S="${WORKDIR}/${P%_pre*}" - -pkg_setup() { - if use lzo && use bindist; then - ewarn "lzo support was disabled for binary distribution of GnuTLS" - ewarn "due to licensing issues. See Bug #202381 for details." - fi -} - -src_prepare() { - sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am - - local dir - for dir in m4 lib/m4 libextra/m4; do - rm -f "${dir}/lt"* "${dir}/libtool.m4" - done - find . -name ltmain.sh -exec rm {} \; - for dir in . lib libextra; do - pushd "${dir}" > /dev/null - eautoreconf - popd > /dev/null - done - - elibtoolize # for sane .so versioning on FreeBSD -} - -src_configure() { - local myconf - use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)" - econf --htmldir=/usr/share/doc/${P}/html \ - $(use_enable cxx) \ - $(use_enable doc gtk-doc) \ - $(use_enable guile) \ - $(use_enable nls) \ - $(use_enable valgrind valgrind-tests) \ - $(use_with zlib) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO - - if use doc; then - dodoc doc/gnutls.{pdf,ps} - dohtml doc/gnutls.html - fi - - if use examples; then - docinto examples - dodoc doc/examples/*.c - fi -} -- cgit v1.2.3-65-gdbad