From d20bcea40c28074f41f5ee586785cf7fbfd2a416 Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Mon, 7 Nov 2016 23:20:50 +0100
Subject: gnustep-base/gnustep-base: fix hard dep on openssl with USE=libressl

Fixes bug #595844

Package-Manager: portage-2.3.2
---
 .../gnustep-base/gnustep-base-1.24.8-r1.ebuild     | 88 ----------------------
 .../gnustep-base/gnustep-base-1.24.8-r2.ebuild     | 87 +++++++++++++++++++++
 .../gnustep-base/gnustep-base-1.24.9-r1.ebuild     | 87 +++++++++++++++++++++
 .../gnustep-base/gnustep-base-1.24.9.ebuild        | 88 ----------------------
 4 files changed, 174 insertions(+), 176 deletions(-)
 delete mode 100644 gnustep-base/gnustep-base/gnustep-base-1.24.8-r1.ebuild
 create mode 100644 gnustep-base/gnustep-base/gnustep-base-1.24.8-r2.ebuild
 create mode 100644 gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild
 delete mode 100644 gnustep-base/gnustep-base/gnustep-base-1.24.9.ebuild

(limited to 'gnustep-base')

diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.8-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.8-r1.ebuild
deleted file mode 100644
index c4c7fc245671..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.8-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils 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"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi libressl +ssl zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	>=dev-libs/openssl-0.9.7:=
-	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:=
-	>=sys-libs/zlib-1.2
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-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
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf="$myconf --enable-tls --disable-openssl"
-		else
-			myconf="$myconf --disable-tls --enable-openssl"
-		fi
-	else
-		myconf="$myconf --disable-tls --disable-openssl"
-	fi
-	myconf="$myconf $(use_enable icu)"
-	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
-}
-
-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
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.8-r2.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.8-r2.ebuild
new file mode 100644
index 000000000000..1df699636ace
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.24.8-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="+gnutls +icu +libffi libressl +ssl zeroconf"
+
+RDEPEND="${GNUSTEP_CORE_DEPEND}
+	>=gnustep-base/gnustep-make-2.6.0
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	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:=
+	>=sys-libs/zlib-1.2
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+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
+
+	if use ssl ; then
+		if use gnutls ; then
+			myconf="$myconf --enable-tls --disable-openssl"
+		else
+			myconf="$myconf --disable-tls --enable-openssl"
+		fi
+	else
+		myconf="$myconf --disable-tls --disable-openssl"
+	fi
+	myconf="$myconf $(use_enable icu)"
+	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
+}
+
+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
+}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild
new file mode 100644
index 000000000000..6bf97f6d1784
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils 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"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="+gnutls +icu +libffi libressl +ssl zeroconf"
+
+RDEPEND="${GNUSTEP_CORE_DEPEND}
+	>=gnustep-base/gnustep-make-2.6.0
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	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:=
+	>=sys-libs/zlib-1.2
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+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
+
+	if use ssl ; then
+		if use gnutls ; then
+			myconf="$myconf --enable-tls --disable-openssl"
+		else
+			myconf="$myconf --disable-tls --enable-openssl"
+		fi
+	else
+		myconf="$myconf --disable-tls --disable-openssl"
+	fi
+	myconf="$myconf $(use_enable icu)"
+	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
+}
+
+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
+}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.9.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.9.ebuild
deleted file mode 100644
index eb72c1b724e9..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils 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"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi libressl +ssl zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	>=dev-libs/openssl-0.9.7:=
-	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:=
-	>=sys-libs/zlib-1.2
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-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
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf="$myconf --enable-tls --disable-openssl"
-		else
-			myconf="$myconf --disable-tls --enable-openssl"
-		fi
-	else
-		myconf="$myconf --disable-tls --disable-openssl"
-	fi
-	myconf="$myconf $(use_enable icu)"
-	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
-}
-
-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
-}
-- 
cgit v1.2.3-65-gdbad