Drop old; fix repoman warning

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xD1F781EFF9F4A3B6)

7 files changed, 9 insertions, 195 deletions

diff --git a/dev-php/suhosin/ChangeLog b/dev-php/suhosin/ChangeLog
index aee93e4bb421..b7abc506c79b 100644
--- a/dev-php/suhosin/ChangeLog
+++ b/dev-php/suhosin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/suhosin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.25 2015/02/28 19:57:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.26 2015/02/28 20:16:14 grknight Exp $
+
+  28 Feb 2015; Brian Evans <grknight@gentoo.org>
+  -files/suhosin-0.9.33-fix-ZTS-compile-problem.patch,
+  -files/suhosin-0.9.33-libcrypt.patch, -files/suhosin-0.9.36-libcrypt.patch,
+  -suhosin-0.9.33.ebuild, -suhosin-0.9.36.ebuild, suhosin-0.9.37.1.ebuild:
+  Drop old; fix repoman warning
 
   28 Feb 2015; Markus Meier <maekke@gentoo.org> suhosin-0.9.37.1.ebuild:
   arm stable, bug #540328
diff --git a/dev-php/suhosin/files/suhosin-0.9.33-fix-ZTS-compile-problem.patch b/dev-php/suhosin/files/suhosin-0.9.33-fix-ZTS-compile-problem.patch
deleted file mode 100644
index 361d6f2091e6..000000000000
--- a/dev-php/suhosin/files/suhosin-0.9.33-fix-ZTS-compile-problem.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From af51a7f576f0cec1d2c94b9bbb3dfb46dd466a66 Mon Sep 17 00:00:00 2001
-From: Stefan Esser <stefan@nopiracy.de>
-Date: Sun, 12 Feb 2012 10:47:10 +0100
-Subject: [PATCH] Fix ZTS compile problem
-
----
- php_suhosin.h  |    2 +-
- post_handler.c |    2 +-
- suhosin.c      |    4 +++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/php_suhosin.h b/php_suhosin.h
-index 7d0a286..c3491d0 100644
---- a/php_suhosin.h
-+++ b/php_suhosin.h
-@@ -308,7 +308,7 @@
- char *suhosin_cookie_decryptor(TSRMLS_D);
- char *suhosin_getenv(char *name, size_t name_len TSRMLS_DC);
- void suhosin_hook_post_handlers(TSRMLS_D);
--void suhosin_unhook_post_handlers();
-+void suhosin_unhook_post_handlers(TSRMLS_D);
- void suhosin_hook_register_server_variables();
- void suhosin_hook_header_handler();
- void suhosin_unhook_header_handler();
-diff --git a/post_handler.c b/post_handler.c
-index b405ae2..96f4b4a 100644
---- a/post_handler.c
-+++ b/post_handler.c
-@@ -162,7 +162,7 @@ void suhosin_hook_post_handlers(TSRMLS_D)
- 	ini_entry->on_modify = suhosin_OnUpdate_mbstring_encoding_translation;
- }
- 
--void suhosin_unhook_post_handlers()
-+void suhosin_unhook_post_handlers(TSRMLS_D)
- {
- 	zend_ini_entry *ini_entry;
- 
-diff --git a/suhosin.c b/suhosin.c
-index 9829896..01f987c 100644
---- a/suhosin.c
-+++ b/suhosin.c
-@@ -189,9 +189,11 @@ static int suhosin_module_startup(zend_extension *extension)
- 
- static void suhosin_shutdown(zend_extension *extension)
- {
-+	TSRMLS_FETCH();
-+
- 	suhosin_unhook_execute();
- 	suhosin_unhook_header_handler();
--	suhosin_unhook_post_handlers();
-+	suhosin_unhook_post_handlers(TSRMLS_C);
-     
-     if (ze != NULL) {
-       ze->startup = orig_module_startup;
diff --git a/dev-php/suhosin/files/suhosin-0.9.33-libcrypt.patch b/dev-php/suhosin/files/suhosin-0.9.33-libcrypt.patch
deleted file mode 100644
index 19ffa153847f..000000000000
--- a/dev-php/suhosin/files/suhosin-0.9.33-libcrypt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: suhosin-0.9.32.1/config.m4
-===================================================================
---- suhosin-0.9.33.orig/config.m4
-+++ suhosin-0.9.33/config.m4
-@@ -6,4 +6,7 @@ PHP_ARG_ENABLE(suhosin, whether to enabl
- 
- if test "$PHP_SUHOSIN" != "no"; then
-   PHP_NEW_EXTENSION(suhosin, suhosin.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c log.c header.c execute.c ex_imp.c session.c aes.c compat_snprintf.c, $ext_shared)
-+  PHP_CHECK_LIBRARY(crypt, crypt, 
-+    [PHP_ADD_LIBRARY(crypt,, SUHOSIN_SHARED_LIBADD)])
-+  PHP_SUBST(SUHOSIN_SHARED_LIBADD)
- fi
diff --git a/dev-php/suhosin/files/suhosin-0.9.36-libcrypt.patch b/dev-php/suhosin/files/suhosin-0.9.36-libcrypt.patch
deleted file mode 100644
index cce84c1aa364..000000000000
--- a/dev-php/suhosin/files/suhosin-0.9.36-libcrypt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: suhosin-0.9.32.1/config.m4
-===================================================================
---- suhosin-0.9.33.orig/config.m4
-+++ suhosin-0.9.33/config.m4
-@@ -6,4 +6,7 @@ PHP_ARG_ENABLE(suhosin, whether to enabl
- 
- if test "$PHP_SUHOSIN" != "no"; then
-   PHP_NEW_EXTENSION(suhosin, suhosin.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c rfc1867_new.c log.c header.c execute.c ex_imp.c session.c aes.c compat_snprintf.c, $ext_shared)
-+  PHP_CHECK_LIBRARY(crypt, crypt,
-+    [PHP_ADD_LIBRARY(crypt,, SUHOSIN_SHARED_LIBADD)])
-+  PHP_SUBST(SUHOSIN_SHARED_LIBADD)
- fi
diff --git a/dev-php/suhosin/suhosin-0.9.33.ebuild b/dev-php/suhosin/suhosin-0.9.33.ebuild
deleted file mode 100644
index 6cfecd985a9e..000000000000
--- a/dev-php/suhosin/suhosin-0.9.33.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.33.ebuild,v 1.13 2014/08/10 21:06:05 slyfox Exp $
-
-EAPI="5"
-
-PHP_EXT_NAME="suhosin"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-source-r2
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
-
-DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
-HOMEPAGE="http://www.suhosin.org/"
-SRC_URI="http://download.suhosin.org/${P}.tgz"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/php[unicode]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		epatch "${FILESDIR}"/${P}-libcrypt.patch
-		epatch "${FILESDIR}"/${P}-fix-ZTS-compile-problem.patch
-	done
-	php-ext-source-r2_src_prepare
-}
-
-src_install() {
-	php-ext-source-r2_src_install
-	dodoc CREDITS
-
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		for inifile in ${PHPINIFILELIST} ; do
-			insinto "${inifile/${PHP_EXT_NAME}.ini/}"
-			insopts -m644
-			doins "suhosin.ini"
-		done
-	done
-}
-
-src_test() {
-	# Makefile passes a hard-coded -d extension_dir=./modules, we move the lib
-	# away from there in src_compile
-	for slot in `php_get_slots`; do
-		php_init_slot_env ${slot}
-		NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
-	done
-}
diff --git a/dev-php/suhosin/suhosin-0.9.36.ebuild b/dev-php/suhosin/suhosin-0.9.36.ebuild
deleted file mode 100644
index 6c10c78dbdc8..000000000000
--- a/dev-php/suhosin/suhosin-0.9.36.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.36.ebuild,v 1.1 2014/10/08 13:39:30 grknight Exp $
-
-EAPI="5"
-
-PHP_EXT_NAME="suhosin"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-source-r2
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
-HOMEPAGE="http://www.suhosin.org/"
-SRC_URI="http://download.suhosin.org/${P}.tgz"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/php[unicode]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		epatch "${FILESDIR}"/${P}-libcrypt.patch
-	done
-	php-ext-source-r2_src_prepare
-}
-
-src_install() {
-	php-ext-source-r2_src_install
-	dodoc CREDITS
-
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		for inifile in ${PHPINIFILELIST} ; do
-			insinto "${inifile/${PHP_EXT_NAME}.ini/}"
-			insopts -m644
-			doins "suhosin.ini"
-		done
-	done
-}
-
-src_test() {
-	# Makefile passes a hard-coded -d extension_dir=./modules, we move the lib
-	# away from there in src_compile
-	for slot in `php_get_slots`; do
-		php_init_slot_env ${slot}
-		NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
-	done
-}
diff --git a/dev-php/suhosin/suhosin-0.9.37.1.ebuild b/dev-php/suhosin/suhosin-0.9.37.1.ebuild
index 15e8b34c2d51..002d9a3499c4 100644
--- a/dev-php/suhosin/suhosin-0.9.37.1.ebuild
+++ b/dev-php/suhosin/suhosin-0.9.37.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.37.1.ebuild,v 1.8 2015/02/28 19:57:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.37.1.ebuild,v 1.9 2015/02/28 20:16:14 grknight Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-lang/php[unicode]"
+DEPEND="dev-lang/php:*[unicode]"
 RDEPEND="${DEPEND}"
 
 src_prepare() {