[gentoo-commits] repo/gentoo:master commit in: gnustep-libs/sope/files/, gnustep-libs/sope/

[Bernard Cafarelli]

commit:     a7a65517a7ec02a2067e75a6a7dd6e9736e661a9
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 20:23:31 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 20:23:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a65517

gnustep-libs/sope: drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 gnustep-libs/sope/Manifest                         |   4 -
 .../sope/files/sope-2.3.2-mysql-preamble.patch     |  35 ------
 .../sope/files/sope-2.3.2-optional-deps.patch      | 138 ---------------------
 gnustep-libs/sope/sope-2.3.2.ebuild                |  70 -----------
 gnustep-libs/sope/sope-3.0.1.ebuild                |  67 ----------
 gnustep-libs/sope/sope-3.0.2.ebuild                |  67 ----------
 gnustep-libs/sope/sope-3.2.0.ebuild                |  63 ----------
 7 files changed, 444 deletions(-)

diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
index 77f528c..13fba31 100644
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@@ -1,6 +1,2 @@
-DIST sope-2.3.2.tar.gz 2184555 SHA256 f37877eb5915d5a6a3bc831a4d38ef2bd60e7fdaa40354056b10c4cfbc0ecdc1 SHA512 17d0ee6474410692c6b81bf32b730f4352e7d9c367f18c4a53d7aebbbe65aa2ca2f6eeaea8c722c8367835973b96395b932c9fdb81f08fdf79f299a926e14c9d WHIRLPOOL 17ca7912056d6d6a33c70af56c44819eaff8f640a87de76aa8858f2cd85114026ce108d6d424d50b6fa4085649c1873aee1854482379708785a9162fdc94daf1
-DIST sope-3.0.1.tar.gz 2190373 SHA256 83dd4568ecc1ce25e31eab90d672b43051c35713b36dcfd3d06282ca4288f98e SHA512 d94c40a425a16e04d1b841b0845e8cd3f4a960978464affaa846a8ef5c2540234ced655069b25a31221af31b3febc9b8c887a89ef43b3129e2a886c1b8fc2f50 WHIRLPOOL 1346684d22a644e95b0fccf59649ad79dc0f9f15eeb37903b056354d561278f2aacae996805f653bd17485c34a13aa447f9b2d67a50f9a65e8d63dcdee772922
-DIST sope-3.0.2.tar.gz 2190909 SHA256 91470e213514412e73aa43852ad3d19a759fba8397ea4edab270547332eb5511 SHA512 2385f49ccd97666cf323e452d8ba54084d4248aea14bc3fe85458e05d41143375df0df2d0b27e7ddc884809e5b9242eee75624956abbf4cfadbbee2b55780ad9 WHIRLPOOL b82ddff2678c0e9ccd45415dcb2934fd85444e3dfdedb8e15b8e6dbb296bf279a240016029c65791c28d54dcac323e59b66268efe43068c02e5ab169403c7a97
-DIST sope-3.2.0.tar.gz 2194701 SHA256 a13ceeea28c0009e6ceb674f02327325a0ff7b20b43ec2972af1f544be9f7083 SHA512 74fa6285c141ad109d7e64b3577e35bb622b3e6310db029fa8bb8620e9158f93d4cccc701d302c3dad1881c364e1ba902e629b5ff04000ae4df139c7c54ac389 WHIRLPOOL b691b729bed725481222a2f65c661a047f536f1e211e65ea65e35dd92a044fca8bd29a985ae96df94b61ed587fa3eb96985cc3c7721785d98becdadb30e3e383
 DIST sope-3.2.1.tar.gz 2195142 SHA256 654b72d87207568808665603557b9e7d311b558eee4ae9229479eb9918362d4c SHA512 bf1ead8bc8759d7fd6acf8b7fbff91718070e6f6a1e4fff24b1c0b37128ebf9542e8158e80ca12e8e60770ac1207c5825b8e0032a175ef6f102392f5f8cd7e09 WHIRLPOOL 10949992319dc45eaeeaaa03090997767b2b3bf9f2001a6804e6beae8038b87a4c14d30ffb7754f027d77f8631dea1c6414462870ac4f690860710d92da3bd0e
 DIST sope-3.2.6a.tar.gz 2196322 SHA256 b01e2fdadfa8db81af462fd4622251de0547359af706bbe7b7cf958b0eed350a SHA512 b1f56f7fb61ee9b95cb5cfcc362cfe72312f9e90fe669904b2f341f42fb2f4299a2449437b6c23c1db316005dfa05ef8d163cadbc271f9821e64d7269afb73ef WHIRLPOOL c13825861ee8a49e03dfaef0cb3b6bc93015d287253753cf288348128831827ca99f59854f40b740180f7634a2a2c6af2cb8008a62afcb66954027bd71053139

diff --git a/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch b/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch
deleted file mode 100644
index 86bcc7a..00000000
--- a/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/sope-gdl1/MySQL/GNUmakefile.preamble	2015-09-07 17:52:21.244429620 +0100
-+++ b/sope-gdl1/MySQL/GNUmakefile.preamble	2015-09-07 17:54:16.586770809 +0100
-@@ -33,12 +33,12 @@
- 
- MySQL_BUNDLE_LIBS += \
- 	-lGDLAccess	\
--	`mysql_config --libs`
-+	$(shell mysql_config --libs)
- 
- MySQLD_BUNDLE_LIBS += \
- 	-lGDLAccess	\
- 	-lEOControl	\
--	`mysql_config --libs`
-+	$(shell mysql_config --libs)
- 
- gdltest_TOOL_LIBS += \
- 	-lGDLAccess	\
-@@ -46,14 +46,15 @@
- 
- # set compile flags and go
- 
--ADDITIONAL_CFLAGS += `mysql_config --cflags`
-+ADDITIONAL_CFLAGS += $(shell mysql_config --cflags)
- 
- ADDITIONAL_INCLUDE_DIRS += \
- 	-I../GDLAccess -I.. -I$(SOPE_ROOT)
- 
- ADDITIONAL_INCLUDE_DIRS += \
- 	-I$(SOPE_ROOT)/sope-core/		\
--	-I$(SOPE_ROOT)/sope-core/NGExtensions
-+	-I$(SOPE_ROOT)/sope-core/NGExtensions   \
-+	$(shell mysql_config --cflags)
- 
- 
- # dependencies

diff --git a/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch b/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch
deleted file mode 100644
index ffe369e..00000000
--- a/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 36e3816a89fd03261d7a50163a4b36a1fa4baded Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@××××××××.de>
-Date: Tue, 3 Nov 2015 17:09:02 +0100
-Subject: [PATCH] configure: allow more explicit control over dependencies
-
-Previously the 'checkLinking <lib> optional' strings caused
-trouble for distributions, because these checks are automagic, as in:
-even if the user doesn't want ldap support, but ldap exists on the
-system, it will still be used, possibly causing problems if
-ldap is removed afterwards.
-
-Making these things explicit fixes those problems. Default is
-still automagic, unless --enable-<feature> or --disable-<feature>
-is passed.
----
- configure | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 66 insertions(+), 6 deletions(-)
-
-diff --git a/configure b/configure
-index 0c4b5cf..90ee783 100755
---- a/configure
-+++ b/configure
-@@ -22,6 +22,10 @@ ARG_FHSMAKE="$PWD/fhs-postinstall.make"
- ARG_WITH_GNUSTEP=0
- ARG_WITH_DEBUG=1
- ARG_WITH_STRIP=1
-+ARG_WITH_MYSQL=auto
-+ARG_WITH_POSTGRESQL=auto
-+ARG_WITH_OPENLDAP=auto
-+ARG_WITH_XML=auto
- 
- DARG_GNUSTEP_SH="$ARG_GSMAKE/GNUstep.sh"
- DARG_IS_FHS=1
-@@ -65,10 +69,16 @@ Installation directories:
-   --frameworks=DIR        build frameworks and install in DIR
-   --gsmake=PATH           path to gnustep-make tree
-   --configmake=PATH       path to the config file being created
-+
-+Build flags:
-   --with-gnustep          install in GNUstep tree
-   --enable-debug          turn on debugging and compile time warnings
-   --enable-strip          turn on stripping of debug symbols
-   --with-ssl=SSL          specify ssl library (none, libssl, gnutls, auto) [auto]
-+  --enable-xml            Enable xml support (auto if unspecified)
-+  --enable-mysql          Enable mysql support (auto if unspecified)
-+  --enable-postgresql     Enable postgresql support (auto if unspecified)
-+  --enable-openldap       Enable ldap support (auto if unspecified)
- 
- _ACEOF
- 
-@@ -475,9 +485,22 @@ checkDependencies() {
-   cfgwrite ""
-   cfgwrite "# library dependencies"
-   cfgwrite "BASE_LIBS := `gnustep-config --base-libs`"
--  
--  checkLinking "xml2"        optional;
--  checkLinking "ldap"        optional;
-+
-+  if test "x$ARG_WITH_XML" = "xauto" ; then
-+    checkLinking "xml2"        optional;
-+  elif test $ARG_WITH_XML = 1 ; then
-+    checkLinking "xml2"        required;
-+  else
-+    cfgwrite "HAS_LIBRARY_xml2=no"
-+  fi
-+
-+  if test "x$ARG_WITH_OPENLDAP" = "xauto" ; then
-+    checkLinking "ldap"        optional;
-+  elif test $ARG_WITH_OPENLDAP = 1 ; then
-+    checkLinking "ldap"        required;
-+  else
-+    cfgwrite "HAS_LIBRARY_ldap=no"
-+  fi
- 
-   if test "x$ARG_CFGSSL" = "xauto"; then
-       checkLinking "ssl"     optional;
-@@ -490,10 +513,24 @@ checkDependencies() {
-       checkLinking "gnutls"  required;
-   fi
- 
--  checkLinking "pq"          optional;
-+  if test "x$ARG_WITH_POSTGRESQL" = "xauto" ; then
-+    checkLinking "pq"          optional;
-+  elif test $ARG_WITH_POSTGRESQL = 1 ; then
-+    checkLinking "pq"          required;
-+  else
-+    cfgwrite "HAS_LIBRARY_pq=no"
-+  fi
-+
- #  checkLinking "sqlite3"     optional;
-   cfgwrite "HAS_LIBRARY_sqlite3=no"
--  checkLinking "mysqlclient" optional;
-+
-+  if test "x$ARG_WITH_MYSQL" = "xauto" ; then
-+    checkLinking "mysqlclient"          optional;
-+  elif test $ARG_WITH_MYSQL = 1 ; then
-+    checkLinking "mysqlclient" required;
-+  else
-+    cfgwrite "HAS_LIBRARY_mysqlclient=no"
-+  fi
- }
- 
- runIt() {
-@@ -575,7 +612,30 @@ processOption() {
-         extractFuncValue $1;
-         ARG_CFGSSL="$VALUE"
- 	;;
--
-+    "x--enable-mysql")
-+        ARG_WITH_MYSQL=1
-+	;;
-+    "x--enable-postgresql")
-+        ARG_WITH_POSTGRESQL=1
-+	;;
-+    "x--enable-openldap")
-+        ARG_WITH_OPENLDAP=1
-+	;;
-+    "x--enable-xml")
-+        ARG_WITH_XML=1
-+	;;
-+    "x--disable-mysql")
-+        ARG_WITH_MYSQL=0
-+	;;
-+    "x--disable-postgresql")
-+        ARG_WITH_POSTGRESQL=0
-+	;;
-+    "x--disable-openldap")
-+        ARG_WITH_OPENLDAP=0
-+	;;
-+    "x--disable-xml")
-+        ARG_WITH_XML=0
-+	;;
-     *) echo "error: cannot process argument: $1"; exit 1; ;;
-   esac
- }
--- 
-2.6.1
-

diff --git a/gnustep-libs/sope/sope-2.3.2.ebuild b/gnustep-libs/sope/sope-2.3.2.ebuild
deleted file mode 100644
index f042ec9..00000000
--- a/gnustep-libs/sope/sope-2.3.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-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_prepare() {
-	# https://github.com/inverse-inc/sope/pull/33
-	epatch "${FILESDIR}"/${P}-optional-deps.patch
-	epatch "${FILESDIR}"/${P}-mysql-preamble.patch
-	gnustep-base_src_prepare
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}

diff --git a/gnustep-libs/sope/sope-3.0.1.ebuild b/gnustep-libs/sope/sope-3.0.1.ebuild
deleted file mode 100644
index f714000..00000000
--- a/gnustep-libs/sope/sope-3.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.2-mysql-preamble.patch
-)
-
-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() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}

diff --git a/gnustep-libs/sope/sope-3.0.2.ebuild b/gnustep-libs/sope/sope-3.0.2.ebuild
deleted file mode 100644
index f714000..00000000
--- a/gnustep-libs/sope/sope-3.0.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.2-mysql-preamble.patch
-)
-
-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() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}

diff --git a/gnustep-libs/sope/sope-3.2.0.ebuild b/gnustep-libs/sope/sope-3.2.0.ebuild
deleted file mode 100644
index 06fd5e2..00000000
--- a/gnustep-libs/sope/sope-3.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-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() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}