From 2513c8be877cb1a5b83adfa8fb45234fad3367f6 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Sun, 27 Nov 2011 19:41:02 +0000 Subject: [PATCH] Use ssl USE-flag instead of gnutls Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64 --- gnustep-base/gnustep-base/ChangeLog | 7 +- gnustep-base/gnustep-base/Manifest | 14 ++-- .../gnustep-base/gnustep-base-1.20.1.ebuild | 10 +-- .../gnustep-base/gnustep-base-1.22.0.ebuild | 78 ------------------- .../gnustep-base/gnustep-base-1.22.1.ebuild | 8 +- 5 files changed, 21 insertions(+), 96 deletions(-) delete mode 100644 gnustep-base/gnustep-base/gnustep-base-1.22.0.ebuild diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog index a8bdbde97f4c..d36c5ce59234 100644 --- a/gnustep-base/gnustep-base/ChangeLog +++ b/gnustep-base/gnustep-base/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnustep-base/gnustep-base # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.106 2011/09/29 22:05:28 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.107 2011/11/27 19:41:02 voyageur Exp $ + + 27 Nov 2011; Bernard Cafarelli + gnustep-base-1.20.1.ebuild, -gnustep-base-1.22.0.ebuild, + gnustep-base-1.22.1.ebuild: + Use ssl USE-flag instead of gnutls *gnustep-base-1.22.1 (29 Sep 2011) diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest index 6d11f27d62e8..f41f6f11485d 100644 --- a/gnustep-base/gnustep-base/Manifest +++ b/gnustep-base/gnustep-base/Manifest @@ -3,17 +3,15 @@ Hash: SHA256 AUX 50-gnustep-revdep 35 RMD160 f9508891da2de58ef884baabf9206577653a409b SHA1 40e21ae24078afb92067f51ca82722f20b742512 SHA256 e0bde19a964f2ae01855b4353c3d2af7b0b0ca25231827798ebfea16e435d3a2 DIST gnustep-base-1.20.1.tar.gz 2612827 RMD160 3f210ac74bf633bf1b5571ee3458e6db4f6d57b1 SHA1 5aff36405aa712473d51877ab77156d231297744 SHA256 fd495d7d800078f7fea7528472d5683899fb93f0270fe7e70f92cf310cd43610 -DIST gnustep-base-1.22.0.tar.gz 2880760 RMD160 046d163b55e9da6da07f366afd6b871264b3c1d1 SHA1 bfff2b816c3076116b7d9d3a76347b5aa4c8502a SHA256 ebb86cdcf194891194079506b2e08bd09df7d5be5413cbbfa521d4ea76a77b3a DIST gnustep-base-1.22.1.tar.gz 2887529 RMD160 822e800247ae50308d6bca766ace4eab276ea18a SHA1 61d61ca127a1beb580b9dfce3d907cfa6c98e881 SHA256 246819d15aa2b836a5e36405a52f73340cded8ff0039dd584288ba52bbe9d880 -EBUILD gnustep-base-1.20.1.ebuild 2567 RMD160 86a74cd5a426f42786dfc55a6e128078516ce989 SHA1 83117d85628b8f0ca1a637e25c2587b15c37b780 SHA256 2ac810e1aba24fa7213f728ab51eab36bd4532c9f38c66da43c6cbe0eed27e44 -EBUILD gnustep-base-1.22.0.ebuild 2351 RMD160 eff3b16515b27e7965fb9fc080180de2eef05531 SHA1 e39ea193b62fde881760a1355c6da999514c8e1f SHA256 f68e0694a1a0273c4455561318184a42ef45134c971c54c8e14a9832bb5a023c -EBUILD gnustep-base-1.22.1.ebuild 2351 RMD160 b22960da9a03612cb6b7d86af7ec5c29c7948dda SHA1 d2fba0595d841a083f1ae71b8a567baeb1d48175 SHA256 6f958a1145e29297a94999f01eff5463951edb116c09d71fa4e0d7e2a469cbd6 -MISC ChangeLog 21864 RMD160 c16eaf668fcd017cd5ad9219095eb4bee75b711b SHA1 0ebae1927d6b5a66e57b74e9d45dc5f68e644d1e SHA256 e7e9fed37301ddd7cf010631465d2e29696a75d8358330ced6eb0c26721c7313 +EBUILD gnustep-base-1.20.1.ebuild 2560 RMD160 822de32883cbcc824f3ad79917fb47cea3cb000c SHA1 dbe74e4d7f051a4fac63537d0e28cf9046adf102 SHA256 19de7997f02317842de202245c6dc18315d72ca8dab5fa466710df99bdfda664 +EBUILD gnustep-base-1.22.1.ebuild 2342 RMD160 e255e57c721cfc2ec6c96914fc8ba4380fc4f7fd SHA1 b75f0780759f30d635af8831972a709ea5869c4a SHA256 849d451edd24155063740a87ea2dfef0404ec24bf8a71dbe0afe48fccf3cd6d1 +MISC ChangeLog 22046 RMD160 075dbe55ba73db438c87e3ba1514cf3087a77d38 SHA1 74921d55c61f450e16df7c9678ac08fe319ea758 SHA256 58dd914d9d20a927b8e25ddb142f448f85ab40d7fb177590d62fa1ebff64f138 MISC metadata.xml 670 RMD160 5d5b88faf28b66aa5d5d3efd6fe5844e980604c9 SHA1 9582400efd6733f27beaf47fa801065838d86955 SHA256 e08343661cc7ecb6d963be62092a270a45f8af0201c9523d1feeddfa09a417fa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6E67cACgkQFYEBGcdFJfJeHgD+JZLNTr9h4XmpEgRgNF7oMLgC -SsbxY9WJd0J6xsC+H+sA/38MvkiLvEv0EuObDoLmImYW/qNi0ZnyXB3hwU4f1KRS -=/sEK +iF4EAREIAAYFAk7Skn8ACgkQFYEBGcdFJfKTvAD7BCRQvrU9TfO8IpymYF1ku5f3 +Dw10SoS7h9G99YRZgboA/3A3pwUIVJXBkDRySYSXuJrWsgxaN88MZzncx9Ltio3b +=VuZ+ -----END PGP SIGNATURE----- diff --git a/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild index 5a5e1b52d0eb..978a95048e06 100644 --- a/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild +++ b/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild,v 1.6 2010/08/13 17:29:16 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild,v 1.7 2011/11/27 19:41:02 voyageur Exp $ EAPI="3" @@ -14,14 +14,14 @@ KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~s SLOT="0" LICENSE="GPL-2 LGPL-2.1" -IUSE="+libffi gnutls zeroconf" +IUSE="+libffi ssl zeroconf" RDEPEND="${GNUSTEP_CORE_DEPEND} >=gnustep-base/gnustep-make-2.0.8 !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) - gnutls? ( net-libs/gnutls ) + ssl? ( net-libs/gnutls ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1 @@ -44,7 +44,7 @@ src_configure() { myconf="--disable-libffi --enable-ffcall" fi - myconf="$myconf $(use_enable gnutls tls)" + myconf="$myconf $(use_enable ssl tls)" myconf="$myconf $(use_enable zeroconf)" myconf="$myconf --with-xml-prefix=${EPREFIX}/usr" myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib" diff --git a/gnustep-base/gnustep-base/gnustep-base-1.22.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.22.0.ebuild deleted file mode 100644 index 433b09ab0978..000000000000 --- a/gnustep-base/gnustep-base/gnustep-base-1.22.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.22.0.ebuild,v 1.2 2011/04/26 08:06:35 voyageur Exp $ - -EAPI="3" - -inherit gnustep-base - -DESCRIPTION="A library of general-purpose, non-graphical Objective C objects." - -HOMEPAGE="http://www.gnustep.org" -SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -SLOT="0" -LICENSE="GPL-2 LGPL-2.1" - -IUSE="gnutls +icu +libffi zeroconf" - -RDEPEND="${GNUSTEP_CORE_DEPEND} - >=gnustep-base/gnustep-make-2.6.0 - gnutls? ( net-libs/gnutls ) - icu? ( >=dev-libs/icu-4.0 ) - !libffi? ( dev-libs/ffcall - gnustep-base/gnustep-make[-native-exceptions] ) - libffi? ( virtual/libffi ) - >=dev-libs/libxml2-2.6 - >=dev-libs/libxslt-1.1 - >=dev-libs/gmp-4.1 - >=dev-libs/openssl-0.9.7 - >=sys-libs/zlib-1.2 - zeroconf? ( || ( - net-dns/avahi[mdnsresponder-compat] - net-misc/mDNSResponder ) )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_configure() { - egnustep_env - - local myconf - if use libffi; - then - myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)" - else - myconf="--disable-libffi --enable-ffcall" - fi - - myconf="$myconf $(use_enable icu)" - myconf="$myconf $(use_enable gnutls tls)" - myconf="$myconf $(use_enable zeroconf)" - myconf="$myconf --with-xml-prefix=${EPREFIX}/usr" - myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib" - myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf" - - econf $myconf || die "configure failed" -} - -src_install() { - # We need to set LD_LIBRARY_PATH because the doc generation program - # uses the gnustep-base libraries. Since egnustep_env "cleans the - # environment" including our LD_LIBRARY_PATH, we're left no choice - # but doing it like this. - - egnustep_env - egnustep_install - - if use doc ; then - export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}" - egnustep_doc - fi - egnustep_install_config -} - -pkg_postinst() { - ewarn "The shared library version has changed in this release." - ewarn "You will need to recompile all Applications/Tools/etc in order" - ewarn "to use this library. Please run revdep-rebuild to do so" -} diff --git a/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild index 91ef26499f4d..01e6ece86798 100644 --- a/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild +++ b/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild,v 1.1 2011/09/29 22:05:28 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild,v 1.2 2011/11/27 19:41:02 voyageur Exp $ EAPI="3" @@ -14,15 +14,15 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linu SLOT="0" LICENSE="GPL-2 LGPL-2.1" -IUSE="gnutls +icu +libffi zeroconf" +IUSE="+icu +libffi ssl zeroconf" RDEPEND="${GNUSTEP_CORE_DEPEND} >=gnustep-base/gnustep-make-2.6.0 - gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0 ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) + ssl? ( net-libs/gnutls ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1 @@ -46,7 +46,7 @@ src_configure() { fi myconf="$myconf $(use_enable icu)" - myconf="$myconf $(use_enable gnutls tls)" + myconf="$myconf $(use_enable ssl tls)" myconf="$myconf $(use_enable zeroconf)" myconf="$myconf --with-xml-prefix=${EPREFIX}/usr" myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib" -- 2.26.2