summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-php/PEAR-PEAR/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
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
Diffstat (limited to 'dev-php/PEAR-PEAR/files')
-rw-r--r--dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch15
-rw-r--r--dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch31
-rw-r--r--dev-php/PEAR-PEAR/files/pear.conf2
-rw-r--r--dev-php/PEAR-PEAR/files/pear.conf-r12
-rw-r--r--dev-php/PEAR-PEAR/files/pear.conf-r22
5 files changed, 52 insertions, 0 deletions
diff --git a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
new file mode 100644
index 000000000000..0a7effe96fda
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
@@ -0,0 +1,15 @@
+diff -aruN PEAR.orig/Builder.php PEAR/Builder.php
+--- PEAR.orig/Builder.php 2014-07-12 08:25:32.000000000 -0400
++++ PEAR/Builder.php 2015-01-16 13:43:14.927894013 -0500
+@@ -340,6 +340,11 @@
+ }
+ // }}} end of interactive part
+
++ if (file_exists('aclocal.m4')) {
++ $this->_runCommand('rm aclocal.m4');
++ $this->_runCommand('autoreconf');
++ }
++
+ // FIXME make configurable
+ if (!$user=getenv('USER')) {
+ $user='defaultuser';
diff --git a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch
new file mode 100644
index 000000000000..53a33b833f7d
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch
@@ -0,0 +1,31 @@
+Fixed libtool mismatch issues.
+Gentoo bug: 344605
+
+*** PEAR/Builder.php.old Mon Nov 8 16:22:52 2010
+--- PEAR/Builder.php Mon Nov 8 16:20:22 2010
+***************
+*** 326,331 ****
+--- 326,336 ----
+ }
+ // }}} end of interactive part
+
++ if (file_exists('aclocal.m4')) {
++ $this->_runCommand('rm aclocal.m4');
++ $this->_runCommand('autoreconf');
++ }
++
+ // FIXME make configurable
+ if(!$user=getenv('USER')){
+ $user='defaultuser';
+***************
+*** 471,474 ****
+ }
+ return PEAR_Common::log($level, $msg);
+ }
+! }
+\ No newline at end of file
+--- 476,479 ----
+ }
+ return PEAR_Common::log($level, $msg);
+ }
+! }
diff --git a/dev-php/PEAR-PEAR/files/pear.conf b/dev-php/PEAR-PEAR/files/pear.conf
new file mode 100644
index 000000000000..5a3c5298db6e
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/pear.conf
@@ -0,0 +1,2 @@
+#PEAR_Config 0.9
+a:7:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:PHPCLILEN:"PHPCLI";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";}
diff --git a/dev-php/PEAR-PEAR/files/pear.conf-r1 b/dev-php/PEAR-PEAR/files/pear.conf-r1
new file mode 100644
index 000000000000..78f69818940f
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/pear.conf-r1
@@ -0,0 +1,2 @@
+#PEAR_Config 0.9
+a:9:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:PHPCLILEN:"PHPCLI";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";s:12:"download_dir";s:DOWNLOADDIRLEN:"DOWNLOADDIR";s:8:"temp_dir";s:TEMPDIRLEN:"TEMPDIR";} \ No newline at end of file
diff --git a/dev-php/PEAR-PEAR/files/pear.conf-r2 b/dev-php/PEAR-PEAR/files/pear.conf-r2
new file mode 100644
index 000000000000..277227b4a47b
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/pear.conf-r2
@@ -0,0 +1,2 @@
+#PEAR_Config 0.9
+a:9:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:12:"/usr/bin/php";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";s:12:"download_dir";s:DOWNLOADDIRLEN:"DOWNLOADDIR";s:8:"temp_dir";s:TEMPDIRLEN:"TEMPDIR";}