Moving dev-php5/suhosin to dev-php/suhosin

diff --git a/dev-php5/suhosin/ChangeLog b/dev-php5/suhosin/ChangeLog
deleted file mode 100644 (file)
index d5fecc0..0000000
--- a/dev-php5/suhosin/ChangeLog
+++ /dev/null
@@ -1,261 +0,0 @@
-# ChangeLog for dev-php5/suhosin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/suhosin/ChangeLog,v 1.67 2011/08/22 06:59:33 olemarkus Exp $
-
-  22 Aug 2011; Ole Markus With <olemarkus@gentoo.org> -suhosin-0.9.31.ebuild,
-  -suhosin-0.9.32.1.ebuild, -suhosin-0.9.32.1-r1.ebuild:
-  Remove older versions of suhosin
-
-  30 Jan 2011; Raúl Porcel <armin76@gentoo.org> suhosin-0.9.32.1-r2.ebuild:
-  ia64/s390/sh/sparc stable
-
-  08 Jan 2011; Markus Meier <maekke@gentoo.org> suhosin-0.9.32.1-r2.ebuild:
-  arm stable, bug #349659
-
-  08 Jan 2011; Brent Baude <ranger@gentoo.org> suhosin-0.9.32.1-r2.ebuild:
-  Marking suhosin-0.9.32.1-r2 ~ppc for bug 349659
-
-  06 Jan 2011; Markus Meier <maekke@gentoo.org> suhosin-0.9.32.1-r2.ebuild:
-  add ~arm, bug #349659
-
-  04 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
-  suhosin-0.9.32.1-r2.ebuild:
-  Stable on amd64 wrt bug #349659
-
-  04 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
-  suhosin-0.9.32.1-r2.ebuild:
-  stable x86, bug 349659
-
-  02 Jan 2011; Tobias Klausmann <klausman@gentoo.org>
-  suhosin-0.9.32.1-r2.ebuild:
-  Stable on alpha, bug #349659
-
-  28 Dec 2010; Brent Baude <ranger@gentoo.org> suhosin-0.9.32.1-r2.ebuild:
-  Marking suhosin-0.9.32.1-r2 ~ppc64 for bug 349659
-
-  25 Dec 2010; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.32.1-r2.ebuild:
-  Stable for HPPA (bug #349659).
-
-  26 Nov 2010; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.32.1-r1.ebuild:
-  Stable for HPPA (bug #343007).
-
-*suhosin-0.9.32.1-r2 (02 Nov 2010)
-
-  02 Nov 2010; <olemarkus@gentoo.org> +suhosin-0.9.32.1-r2.ebuild:
-  Revbump supporting minor version slotting
-
-  11 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
-  suhosin-0.9.32.1-r1.ebuild:
-  Make it more EAPI=2 friendly.
-
-*suhosin-0.9.32.1-r1 (11 Oct 2010)
-
-  11 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
-  +suhosin-0.9.32.1-r1.ebuild, +files/suhosin-0.9.32.1-libcrypt.patch:
-  QA: ensure that libcrypt is linked in the extension, or it'll abort at
-  runtime, or fail to load depending on binding settings. Closes bug #332161
-  by Hanno Boeck, thanks to klondike for the diagnosis.
-
-  19 Sep 2010; Matti Bickel <mabi@gentoo.org> suhosin-0.9.32.1.ebuild:
-  use php-ext-pecl-r1_src_test-like src_test method to make tests actually
-  work (bug #333123)
-
-*suhosin-0.9.32.1 (02 Aug 2010)
-
-  02 Aug 2010; Matti Bickel <mabi@gentoo.org> -suhosin-0.9.29.ebuild,
-  +suhosin-0.9.32.1.ebuild:
-  version bump (bug #330467)
-
-  04 Jul 2010; Matti Bickel <mabi@gentoo.org> suhosin-0.9.31.ebuild:
-  version bump (bug #324181)
-
-*suhosin-0.9.31 (22 Jun 2010)
-
-  22 Jun 2010; Matti Bickel <mabi@gentoo.org> -suhosin-0.9.22.ebuild,
-  -suhosin-0.9.24.ebuild, -suhosin-0.9.25.ebuild, -suhosin-0.9.27.ebuild,
-  +suhosin-0.9.31.ebuild:
-  version bump & remove old
-
-  18 Oct 2009; Brent Baude <ranger@gentoo.org> suhosin-0.9.29.ebuild:
-  Marking suhosin-0.9.29 ppc64 for bug 276583
-
-  09 Oct 2009; Christian Hoffmann <hoffie@gentoo.org> suhosin-0.9.29.ebuild:
-  amd64 stable #276583
-
-  07 Oct 2009; nixnut <nixnut@gentoo.org> suhosin-0.9.29.ebuild:
-  ppc stable #276583
-
-  07 Oct 2009; Raúl Porcel <armin76@gentoo.org> suhosin-0.9.29.ebuild:
-  alpha/arm/ia64/s390/sh/sparc stable wrt #285434
-
-  06 Oct 2009; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.29.ebuild:
-  Stable for HPPA (bug #276583).
-
-  06 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
-  suhosin-0.9.29.ebuild:
-  stable x86, bug 276583
-
-*suhosin-0.9.29 (11 Sep 2009)
-
-  11 Sep 2009; Hanno Boeck <hanno@gentoo.org> +suhosin-0.9.29.ebuild:
-  Version bump.
-
-  29 Aug 2008; Markus Rothe <corsair@gentoo.org> suhosin-0.9.27.ebuild:
-  Stable on ppc64; bug #235676
-
-  26 Aug 2008; Raúl Porcel <armin76@gentoo.org> suhosin-0.9.27.ebuild:
-  alpha/ia64/sparc stable wrt #235676
-
-  25 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  suhosin-0.9.27.ebuild:
-  ppc stable, bug #235676
-
-  25 Aug 2008; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.27.ebuild:
-  Stable for HPPA (bug #235676).
-
-  25 Aug 2008; Markus Meier <maekke@gentoo.org> suhosin-0.9.27.ebuild:
-  x86 stable, bug #235676
-
-  25 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> suhosin-0.9.27.ebuild:
-  stable on amd64
-
-*suhosin-0.9.27 (23 Aug 2008)
-
-  23 Aug 2008; Christian Hoffmann <hoffie@gentoo.org>
-  +suhosin-0.9.27.ebuild:
-  version bump
-
-*suhosin-0.9.25 (07 Aug 2008)
-
-  07 Aug 2008; Christian Hoffmann <hoffie@gentoo.org>
-  -suhosin-0.9.23.ebuild, +suhosin-0.9.25.ebuild:
-  version bump
-
-  17 Jul 2008; Markus Rothe <corsair@gentoo.org> suhosin-0.9.24.ebuild:
-  Stable on ppc64; bug #230816
-
-  14 Jul 2008; nixnut <nixnut@gentoo.org> suhosin-0.9.24.ebuild:
-  Stable on ppc wrt bug 230816
-
-  08 Jul 2008; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.24.ebuild:
-  Stable for HPPA (bug #230816).
-
-  08 Jul 2008; Raúl Porcel <armin76@gentoo.org> suhosin-0.9.24.ebuild:
-  alpha/ia64/sparc stable wrt #230816
-
-  08 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
-  suhosin-0.9.24.ebuild:
-  x86 stable, bug 230816
-
-  07 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> suhosin-0.9.24.ebuild:
-  stable on amd64, bug 230816
-
-*suhosin-0.9.24 (15 May 2008)
-
-  15 May 2008; Christian Hoffmann <hoffie@gentoo.org>
-  -suhosin-0.9.17.ebuild, -suhosin-0.9.18.ebuild, -suhosin-0.9.20.ebuild,
-  +suhosin-0.9.24.ebuild:
-  version bump to 0.9.24 (bug 222087), removing old
-
-  13 May 2008; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.23.ebuild:
-  Stable for HPPA (LuckyLuke).
-
-*suhosin-0.9.23 (06 Feb 2008)
-
-  06 Feb 2008; Christian Hoffmann <hoffie@gentoo.org>
-  +suhosin-0.9.23.ebuild:
-  bump to 0.9.23, bug 209070
-
-  16 Jan 2008; Hanno Boeck <hanno@gentoo.org> suhosin-0.9.22.ebuild:
-  Stable on amd64.
-
-  08 Jan 2008; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.22.ebuild:
-  Stable for HPPA (bug #204290).
-
-  08 Jan 2008; Raúl Porcel <armin76@gentoo.org> suhosin-0.9.22.ebuild:
-  alpha/ia64 stable wrt #204290
-
-  05 Jan 2008; Markus Ullmann <jokey@gentoo.org> suhosin-0.9.22.ebuild:
-  SPARC/x86 stable wrt bug #204290
-
-  04 Jan 2008; Brent Baude <ranger@gentoo.org> suhosin-0.9.22.ebuild:
-  Marking suhosin-0.9.22 ppc64 for bug 204290
-
-  04 Jan 2008; nixnut <nixnut@gentoo.org> suhosin-0.9.22.ebuild:
-  Stable on ppc wrt bug 204290
-
-*suhosin-0.9.22 (04 Dec 2007)
-
-  04 Dec 2007; Christian Hoffmann <hoffie@gentoo.org>
-  +suhosin-0.9.22.ebuild:
-  bump to 0.9.22, bug #200921
-
-  15 Oct 2007; Markus Rothe <corsair@gentoo.org> suhosin-0.9.18.ebuild:
-  Stable on ppc64
-
-  13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  suhosin-0.9.18.ebuild:
-  ppc. stable
-
-*suhosin-0.9.20 (23 Jul 2007)
-
-  23 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  +suhosin-0.9.20.ebuild:
-  Import 0.9.20 from php-experimental overlay, proxy-committing for Christian
-  Hoffmann
-
-  16 Jul 2007; Raúl Porcel <armin76@gentoo.org> suhosin-0.9.18.ebuild:
-  alpha/ia64/x86 stable
-
-  08 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> suhosin-0.9.18.ebuild:
-  Stable on sparc
-
-  11 Apr 2007; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.18.ebuild:
-  Stable for HPPA too.
-
-  31 Mar 2007; Raúl Porcel <armin76@gentoo.org> suhosin-0.9.17.ebuild:
-  ia64 stable wrt bug 153911
-
-*suhosin-0.9.18 (18 Mar 2007)
-
-  18 Mar 2007; Luca Longinotti <chtekk@gentoo.org> +suhosin-0.9.18.ebuild:
-  Version bump, fix session module integration.
-
-  10 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> suhosin-0.9.17.ebuild:
-  Stable on alpha wrt security #153911
-
-  08 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> ChangeLog:
-  Fix manifest
-
-  08 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> suhosin-0.9.17.ebuild:
-  Stable on sparc wrt security #153911
-
-  06 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  suhosin-0.9.17.ebuild:
-  Stable on ppc wrt bug #153911.
-
-  06 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  suhosin-0.9.17.ebuild:
-  stable x86; security bug 153911
-
-  06 Mar 2007; Markus Rothe <corsair@gentoo.org> suhosin-0.9.17.ebuild:
-  Stable on ppc64; bug #153911
-
-  06 Mar 2007; Jeroen Roovers <jer@gentoo.org> suhosin-0.9.17.ebuild:
-  Stable for HPPA (bug #153911).
-
-  05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> suhosin-0.9.17.ebuild:
-  Keyword on amd64 wrt bug #153911.
-
-*suhosin-0.9.17 (05 Mar 2007)
-
-  05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> -suhosin-0.9.16.ebuild,
-  +suhosin-0.9.17.ebuild:
-  Version bump.
-
-*suhosin-0.9.16 (04 Mar 2007)
-
-  04 Mar 2007; Luca Longinotti <chtekk@gentoo.org> +metadata.xml,
-  +suhosin-0.9.16.ebuild:
-  Add Suhosin.
-

diff --git a/dev-php5/suhosin/Manifest b/dev-php5/suhosin/Manifest
deleted file mode 100644 (file)
index 51f3179..0000000
--- a/dev-php5/suhosin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX suhosin-0.9.32.1-libcrypt.patch 626 RMD160 4a0cf0bb547e793217a844f7ee5a1624ba5cb202 SHA1 9f1940e17c3bc3d995dcc835f69c1b78dfa4a563 SHA256 9556ee1159ed93f720c471d7121dbcaa949b153fc0372fc7ada3f8f5712d8029
-DIST suhosin-0.9.32.1.tar.gz 119117 RMD160 6184eef336b9d3d5c885a7d1dcbf20d97b055e8d SHA1 93fcb1d5f96691c4c50808a14dd3d6d4bbfea451 SHA256 d283abcbd1803eaa11bbd91cb5aae727b2bbab3a00a1de8510f85d8cc598e490
-EBUILD suhosin-0.9.32.1-r2.ebuild 1366 RMD160 84832613a66ad5a9671f330a18343d5343d0c122 SHA1 4b7c2b2708bceda1532153061494f72578c48527 SHA256 0ce4e8d00ad44d796ed1eebc09ce9bcce1368def610e61055c8b600ce038754f
-MISC ChangeLog 8415 RMD160 92406d04605a7ca5aca4d81e2a6f31232ecbfd3c SHA1 7694fdd71953f00d28f5b014a298efc4203d67a0 SHA256 54065ac7520b327e1a6d89bffd18353e01a64633d3c8d6dda0450faf0dd0c415
-MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1

diff --git a/dev-php5/suhosin/files/suhosin-0.9.32.1-libcrypt.patch b/dev-php5/suhosin/files/suhosin-0.9.32.1-libcrypt.patch
deleted file mode 100644 (file)
index bf0d1a4..0000000
--- a/dev-php5/suhosin/files/suhosin-0.9.32.1-libcrypt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: suhosin-0.9.32.1/config.m4
-===================================================================
---- suhosin-0.9.32.1.orig/config.m4
-+++ suhosin-0.9.32.1/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 crypt.c crypt_blowfish.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-php5/suhosin/metadata.xml b/dev-php5/suhosin/metadata.xml
deleted file mode 100644 (file)
index fd3dbe3..0000000
--- a/dev-php5/suhosin/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <herd>php</herd>
-</pkgmetadata>

diff --git a/dev-php5/suhosin/suhosin-0.9.32.1-r2.ebuild b/dev-php5/suhosin/suhosin-0.9.32.1-r2.ebuild
deleted file mode 100644 (file)
index 0051f5e..0000000
--- a/dev-php5/suhosin/suhosin-0.9.32.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/suhosin/suhosin-0.9.32.1-r2.ebuild,v 1.10 2011/01/30 16:41:20 armin76 Exp $
-
-EAPI="2"
-
-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}.tar.gz"
-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
-       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
-}