diff options
Diffstat (limited to 'net-libs/gnutls')
| -rw-r--r-- | net-libs/gnutls/ChangeLog | 9 | ||||
| -rw-r--r-- | net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch | 18 | ||||
| -rw-r--r-- | net-libs/gnutls/gnutls-2.5.4.ebuild | 6 | ||||
| -rw-r--r-- | net-libs/gnutls/gnutls-2.6.0.ebuild | 84 |
4 files changed, 114 insertions, 3 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog index 0414ff5f8ee7..c4ce37ac72b4 100644 --- a/net-libs/gnutls/ChangeLog +++ b/net-libs/gnutls/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/gnutls # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.163 2008/09/04 14:32:58 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.164 2008/11/04 12:53:11 dragonheart Exp $ + +*gnutls-2.6.0 (04 Nov 2008) + + 04 Nov 2008; Daniel Black <dragonheart@gentoo.org> + +files/gnutls-2.6.0-cxx-configure.in.patch, gnutls-2.5.4.ebuild, + +gnutls-2.6.0.ebuild: + version bump as per bug #236690 thanks to Arfrever 04 Sep 2008; Daniel Black <dragonheart@gentoo.org> gnutls-2.5.4.ebuild: change dependancy as per bug #236642 suggested by Arfreve. Bug thanks to diff --git a/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch b/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch new file mode 100644 index 000000000000..9fa448b974ef --- /dev/null +++ b/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch @@ -0,0 +1,18 @@ +--- configure.in.orig 2008-11-04 22:27:44.000000000 +1100 ++++ configure.in 2008-11-04 22:31:13.000000000 +1100 +@@ -79,7 +79,6 @@ + + dnl Checks for programs. + AC_PROG_CC +-AC_PROG_CXX + AC_PROG_LN_S + GTK_DOC_CHECK(1.1) + AC_PATH_PROG([GAA], [gaa]) +@@ -114,6 +113,7 @@ + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], use_cxx=yes, use_cxx=no) + AC_LANG_POP(C++) ++ AC_PROG_CXX + fi + + AC_MSG_CHECKING([whether C99 macros are supported]) diff --git a/net-libs/gnutls/gnutls-2.5.4.ebuild b/net-libs/gnutls/gnutls-2.5.4.ebuild index 4f886d9239bd..1979c6510284 100644 --- a/net-libs/gnutls/gnutls-2.5.4.ebuild +++ b/net-libs/gnutls/gnutls-2.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.5.4.ebuild,v 1.2 2008/09/04 14:32:58 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.5.4.ebuild,v 1.3 2008/11/04 12:53:11 dragonheart Exp $ inherit libtool eutils @@ -13,7 +13,8 @@ SRC_URI="http://www.gnu.org/software/gnutls/releases/${P}.tar.bz2" LICENSE="LGPL-2.1 GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="zlib lzo doc nls guile bindist" +EAPI=1 +IUSE="zlib lzo doc nls guile bindist +cxx" RDEPEND="dev-libs/libgpg-error >=dev-libs/libgcrypt-1.4.0 @@ -56,6 +57,7 @@ src_compile() { $(use_with zlib) \ $(use_enable nls) \ $(use_enable guile) \ + $(use_enable cxx) \ $(use_enable doc gtk-doc) \ ${myconf} emake || die diff --git a/net-libs/gnutls/gnutls-2.6.0.ebuild b/net-libs/gnutls/gnutls-2.6.0.ebuild new file mode 100644 index 000000000000..8c72456da639 --- /dev/null +++ b/net-libs/gnutls/gnutls-2.6.0.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.0.ebuild,v 1.1 2008/11/04 12:53:11 dragonheart Exp $ + +inherit eutils libtool autotools + +DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project" +HOMEPAGE="http://www.gnutls.org/" + +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 + +# 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 ~sparc-fbsd ~x86 ~x86-fbsd" +EAPI=1 +IUSE="bindist +cxx doc 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 ) + 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 )" + +pkg_setup() { + if use guile && ! built_with_use dev-scheme/guile networking; then + eerror "You are trying to compile ${PN} package with USE=\"guile\"" + eerror "while dev-scheme/guile does not have USE=\"networking\"" + die + fi + 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." + epause 5 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-cxx-configure.in.patch + eautoreconf + + elibtoolize # for sane .so versioning on FreeBSD +} + +src_compile() { + local myconf + use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)" + econf \ + $(use_with zlib) \ + $(use_enable nls) \ + $(use_enable guile) \ + $(use_enable cxx) \ + $(use_enable doc gtk-doc) \ + ${myconf} + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO + + if use doc ; then + dodoc doc/README.autoconf doc/tex/gnutls.ps + docinto examples + dodoc doc/examples/*.c + fi +} |