proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

2 files changed, 86 insertions, 0 deletions

diff --git a/dev-php/pecl-memcached/files/libmc-1.09-fix.diff b/dev-php/pecl-memcached/files/libmc-1.09-fix.diff
new file mode 100644
index 00000000000..1b014dfd642
--- /dev/null
+++ b/dev-php/pecl-memcached/files/libmc-1.09-fix.diff
@@ -0,0 +1,71 @@
+This patch is fixes to compile with newer versions of libmemcached ported from the fork at:
+https://github.com/paravoid/php-memcached/commit/37069e18ad399a8cc03d5fe9757e1481814ecb44
+
+X-Ported-By: Allen Parker <infowolfe@gmail.com>
+Signed-off-by: Allen Parker <infowolfe@gmail.com>
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nurw memcached-2.1.0/php_memcached.c memcached-2.1.0-fixed/php_memcached.c
+--- memcached-2.1.0-broken/php_memcached.c	2012-08-07 05:02:46.000000000 +0000
++++ memcached-2.1.0/php_memcached.c	2013-12-16 06:14:17.420837278 +0000
+@@ -315,9 +315,15 @@
+ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key);
+ static memcached_return php_memc_do_cache_callback(zval *memc_obj, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char *key, size_t key_len, zval *value TSRMLS_DC);
+ static int php_memc_do_result_callback(zval *memc_obj, zend_fcall_info *fci, zend_fcall_info_cache *fcc, memcached_result_st *result TSRMLS_DC);
++#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context);
++static memcached_return php_memc_do_stats_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context);
++static memcached_return php_memc_do_version_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context);
++#else
+ static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context);
+ static memcached_return php_memc_do_stats_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context);
+ static memcached_return php_memc_do_version_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context);
++#endif
+ static void php_memc_destroy(struct memc_obj *m_obj, zend_bool persistent TSRMLS_DC);
+ 
+ /****************************************
+@@ -1855,7 +1861,7 @@
+ 	zval **z_host, **z_port, **z_weight = NULL;
+ 	uint32_t weight = 0;
+ 	int   entry_size, i = 0;
+-	memcached_server_st *list = NULL;
++	memcached_server_list_st list = NULL;
+ 	memcached_return status;
+ 	MEMC_METHOD_INIT_VARS;
+ 
+@@ -2573,7 +2579,11 @@
+ /* }}} */
+ 
+ /* {{{ internal API functions */
++#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context)
++#else
+ static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context)
++#endif
+ {
+ 	struct callbackContext* context = (struct callbackContext*) in_context;
+ 	zval *array;
+@@ -2590,7 +2600,11 @@
+ 	return MEMCACHED_SUCCESS;
+ }
+ 
++#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++static memcached_return php_memc_do_stats_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context)
++#else
+ static memcached_return php_memc_do_stats_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context)
++#endif
+ {
+ 	char *hostport = NULL;
+ 	int hostport_len;
+@@ -2634,7 +2648,11 @@
+ 	return MEMCACHED_SUCCESS;
+ }
+ 
++#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++static memcached_return php_memc_do_version_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context)
++#else
+ static memcached_return php_memc_do_version_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context)
++#endif
+ {
+ 	char *hostport = NULL;
+ 	char version[16];
diff --git a/dev-php/pecl-memcached/files/pecl-memcached-1.0.2-php54_zend.patch b/dev-php/pecl-memcached/files/pecl-memcached-1.0.2-php54_zend.patch
new file mode 100644
index 00000000000..22d550f2997
--- /dev/null
+++ b/dev-php/pecl-memcached/files/pecl-memcached-1.0.2-php54_zend.patch
@@ -0,0 +1,15 @@
+--- a/php_memcached.c	1970-01-01 04:13:08.000000000 -0500
++++ b/php_memcached.c	2015-02-16 20:46:34.849201777 -0500
+@@ -1862,8 +1862,11 @@
+ 
+     i_obj = ecalloc(1, sizeof(*i_obj));
+ 	zend_object_std_init( &i_obj->zo, ce TSRMLS_CC );
++#if PHP_VERSION_ID < 50399
+     zend_hash_copy(i_obj->zo.properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+-
++#else
++    object_properties_init((zend_object*) &(i_obj->zo), ce);
++#endif
+ 	i_obj->compression = 1;
+ 
+     retval.handle = zend_objects_store_put(i_obj, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t)php_memc_free_storage, NULL TSRMLS_CC);