[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2019-11-12 Thread Brian Evans
commit: 163c38d6672e4004836561f564437dc74d0b3e4c
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 12 14:08:03 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Nov 12 14:08:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163c38d6

dev-db/mariadb: Fix galera_recovery script location

Closes: https://bugs.gentoo.org/699424
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/mariadb-10.3.20.ebuild | 4 
 dev-db/mariadb/mariadb-10.4.10.ebuild | 4 
 2 files changed, 8 insertions(+)

diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild 
b/dev-db/mariadb/mariadb-10.3.20.ebuild
index 35694b80036..7fb13269e69 100644
--- a/dev-db/mariadb/mariadb-10.3.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.20.ebuild
@@ -300,6 +300,10 @@ src_prepare() {
-e 's/ perror.1//' \
"${S}"/man/CMakeLists.txt || die
 
+   # Fix galera_recovery.sh script
+   sed -i -e 
"s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~"
 \
+   scripts/galera_recovery.sh || die
+
cmake-utils_src_prepare
java-pkg-opt-2_src_prepare
 }

diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild 
b/dev-db/mariadb/mariadb-10.4.10.ebuild
index 70ab47d3b62..c479a1ae70d 100644
--- a/dev-db/mariadb/mariadb-10.4.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.10.ebuild
@@ -307,6 +307,10 @@ src_prepare() {
-e 's/ perror.1//' \
"${S}"/man/CMakeLists.txt || die
 
+   # Fix galera_recovery.sh script
+   sed -i -e 
"s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~"
 \
+   scripts/galera_recovery.sh || die
+
sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
"${S}"/scripts/mysql_install_db.sh || die
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/

2019-11-12 Thread Brian Evans
commit: e71231e36dc2daf85584b930da13f062b00d2e38
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 12 14:11:04 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Nov 12 14:11:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71231e3

dev-db/mariadb: Fix references to character sets in 5.5

Closes: https://bugs.gentoo.org/692482
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/files/my.cnf-5.5 | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
index dec0c4cb8ee..289af8a24d0 100644
--- a/dev-db/mariadb/files/my.cnf-5.5
+++ b/dev-db/mariadb/files/my.cnf-5.5
@@ -7,34 +7,34 @@ port  = 3306
 socket = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
 
 [mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
 
 [myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
 
 # use [safe_mysqld] with mysql-3
 [mysqld_safe]
@@ -59,7 +59,7 @@ net_buffer_length = 8K
 read_buffer_size   = 256K
 read_rnd_buffer_size   = 512K
 myisam_sort_buffer_size= 8M
-lc_messages_dir= 
@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+lc_messages_dir= 
@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb
 #Set this to your desired error message language
 lc_messages= en_US
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/

2019-11-11 Thread Brian Evans
commit: 766bfd2d48a369055c57670543781609e48faeb6
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 12 02:13:28 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Nov 12 02:13:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766bfd2d

sys-cluster/galera: Version bump for 26.4.3

Include new garbd script

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans  gentoo.org>

 sys-cluster/galera/Manifest |  1 +
 sys-cluster/galera/files/garb.init  | 35 +++
 sys-cluster/galera/galera-26.4.3.ebuild | 80 +
 3 files changed, 116 insertions(+)

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 3b62210d7fc..0e33ea8055b 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,4 +1,5 @@
 DIST galera-25.3.26.tar.gz 3386588 BLAKE2B 
ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4
 SHA512 
c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
 DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
 SHA512 
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
 DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 
4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115
 SHA512 
6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
+DIST galera-26.4.3.tar.gz 3507925 BLAKE2B 
fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976
 SHA512 
857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 
892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216
 SHA512 
bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03

diff --git a/sys-cluster/galera/files/garb.init 
b/sys-cluster/galera/files/garb.init
new file mode 100644
index 000..5bf57a7a683
--- /dev/null
+++ b/sys-cluster/galera/files/garb.init
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/garbd"
+pidfile="${PIDFILE:-/var/run/garbd}"
+command_background="yes"
+command_args=""
+command_user="nobody"
+
+depend() {
+   use net
+   after mysql
+}
+
+start_pre() {
+   if [ -z "${GALERA_NODES}" ]; then
+   eerror "List of GALERA_NODES is not configured"
+   return 1
+   fi
+
+   if [ -z "${GALERA_GROUP}" ]; then
+   eerror "GALERA_GROUP name is not configured"
+   return 1
+   fi
+
+   GALERA_PORT=${GALERA_PORT:-4567}
+
+   local OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
+   [ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
+   [ -n "${LOG_FILE}" ]   && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
+   [ -n "${NODE_NAME}" ]  && OPTIONS="${OPTIONS} -n ${NODE_NAME}"
+
+   command_args="${OPTIONS}"
+}

diff --git a/sys-cluster/galera/galera-26.4.3.ebuild 
b/sys-cluster/galera/galera-26.4.3.ebuild
new file mode 100644
index 000..0e03a25d79f
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the 
wsrep API"
+HOMEPAGE="http://galeracluster.com;
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.10/${P}/src/${P}.tar.gz;
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+CDEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.41:0=
+   "
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
+   ${CDEPEND}
+   dev-libs/check
+   >=dev-cpp/asio-1.10.1[ssl]
+   

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/

2019-11-11 Thread Brian Evans
commit: 7f27377b74cdc627508f36fca48386eb56a7b2b6
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 12 01:32:33 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Nov 12 02:08:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f27377b

sys-cluster/galera: Version bump for 25.3.28

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans  gentoo.org>

 sys-cluster/galera/Manifest  |  1 +
 sys-cluster/galera/galera-25.3.28.ebuild | 89 
 2 files changed, 90 insertions(+)

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 71bea6fd46a..3b62210d7fc 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,3 +1,4 @@
 DIST galera-25.3.26.tar.gz 3386588 BLAKE2B 
ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4
 SHA512 
c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
+DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
 SHA512 
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
 DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 
4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115
 SHA512 
6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 
892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216
 SHA512 
bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03

diff --git a/sys-cluster/galera/galera-25.3.28.ebuild 
b/sys-cluster/galera/galera-25.3.28.ebuild
new file mode 100644
index 000..65546b1b23a
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.28.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+MY_P="${PN}-3-${PV}"
+
+inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides the 
wsrep API"
+HOMEPAGE="http://galeracluster.com;
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/${P}/src/${P}.tar.gz;
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+CDEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.41:0=
+   "
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
+   ${CDEPEND}
+   dev-libs/check
+   >=dev-cpp/asio-1.10.1[ssl]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2019-11-11 Thread Brian Evans
commit: a6d1fde2919b47cf72b016f3fb852e3a5a2ff06a
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Nov 11 20:57:59 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Nov 11 20:57:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d1fde2

dev-db/mariadb: Version bump for 10.1.43

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest   |   1 +
 dev-db/mariadb/mariadb-10.1.43.ebuild | 897 ++
 2 files changed, 898 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 3d0eb9bca8e..2882bc8aa37 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,6 @@
 DIST mariadb-10.1.38.tar.gz 63535685 BLAKE2B 
c179ea2f60287c2bc1c0d1c47ae989ac2653a24063e8344cef2f3062fc6798e18b969e8f9aa8287104ce2518e6c644cb8d3a4650b5a0bc5dfde973e76e618955
 SHA512 
184582f3a902a989ba3d9c4d21288c014c8b469adbbb4cbabc621c5006022cef29baed8c1140ed4476b124da83b76dfa414295ed0c3374be826e75aca953a77b
 DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 
91ebc6d24c80ad9651c42a2f4553ce3ec3b7beb17493f90ebbf02ab23f425b0f729766cf2c81202832dfbca0a5e285f94a4daf794fcf4d445730fbe4fcc88871
 SHA512 
4a18b06fda49c5c3627b4e7cd32fb460e73762273a0c3d09098e34c71e63caa8fad03cdd92ae4a391cdfdb3719934688f0bdf312fa4af7ac3b9e5f5d90f404be
+DIST mariadb-10.1.43.tar.gz 63635313 BLAKE2B 
60617d3021bb478633a995b93a3659a287ecab49bb1997efc430e2f453a8145307f0db02799b43560a51c92ef528060f93fb82fd0362ea34052f68590144bff0
 SHA512 
47e9693c6c1d25d2c3541efe001569c17e70721edcbfc3d0ccc96f3638820123436c18d2cbc3c2ad252adf1eda446feff0370eb97f9e57b6711757ac899b47e8
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B 
e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b
 SHA512 
cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
 DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 
54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c
 SHA512 
1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124
 DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 
7e4ae229040b3136ad107979864bc391556c1ba83847addd89e09f3757cd01203503e07832abe496a7f560048ed704f273607da3a114afa59ceb13cbb3b89c14
 SHA512 
9ea7ea30f964d022d16c662c18ac40ea50ef5b6592d02ba739ad81f9dfa9e60be90ea6d4706b43b07402c4cbc8c0280633b6e21bda6daf5bbc1d3c540993e4d6

diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild 
b/dev-db/mariadb/mariadb-10.1.43.ebuild
new file mode 100644
index 000..e900614ec03
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.43.ebuild
@@ -0,0 +1,897 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190305-2052Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs java-pkg-opt-2 user 
cmake-utils multilib-build
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+   SRC_URI="${SRC_URI}
+   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+fi
+
+HOMEPAGE="https://mariadb.org/;
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc 
jemalloc kerberos
+   innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc 
oqgraph pam
+   +perl profiling selinux +server sphinx sst-rsync sst-mariabackup 
sst-xtrabackup
+   systemd systemtap static static-libs tcmalloc test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+   server? ( tokudb? ( jemalloc !tcmalloc ) )
+   ?? ( tcmalloc jemalloc )
+   static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2019-11-11 Thread Brian Evans
commit: b5511e8ec559a8b2e688502fb0639ef7d723ffea
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Nov 11 20:52:45 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Nov 11 20:52:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5511e8e

dev-db/mariadb: Version bump for 5.5.66

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest  |   1 +
 dev-db/mariadb/mariadb-5.5.66.ebuild | 836 +++
 2 files changed, 837 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0e4e7b28e7d..3d0eb9bca8e 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -11,6 +11,7 @@ DIST mariadb-10.4.10.tar.gz 78352896 BLAKE2B 
c0e448fba455feb9385b7d57e1a727e84ea
 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B 
b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f
 SHA512 
cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce
 DIST mariadb-10.4.8.tar.gz 78262897 BLAKE2B 
357dfd8db702d30c30173cb4ee0bbbda8e54a77a8f726cdc529cbaeebd390fe11fd05c108dde54b029b7e311ebbf9a610dc2c6e4015c9a198d816deaaec5831e
 SHA512 
1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42
 DIST mariadb-5.5.65.tar.gz 45957577 BLAKE2B 
9ed27349d008d2001ed4059370505064918ef3586f89157f5f28892bceabd3073b7070f4054c0a700f1504dde3a4077e274111d5b8cb3713bc5db0910b752628
 SHA512 
5dbaa2ba7a829a0d5ae6ab8394c31a58753cd93da2637cd83d1e055e78b0796d63214418ddc91a65cefdd791aad4f01b0743aa8c7c40ecbb404cb81fd0138443
+DIST mariadb-5.5.66.tar.gz 45962591 BLAKE2B 
41befba24abec2af876168a11fc205d328c137baa49e5e521787898e4b973d1dc548ef459228811caa99fa3c2b7a9fe96f3eb7a04bf62f0bb20966e4ffd2ea9b
 SHA512 
403f3bc67018e01eb2277a88d3a7ac673d50df8f7a67607f9d14e3167d1bdd4ca202983df69c97688ff51edbd6d6b43af3541c75e968d1d01713a7b6495e4c8c
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 
8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970
 SHA512 
fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 
1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43
 SHA512 
ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
 DIST mysql-extras-20190731-2258Z.tar.bz2 332111 BLAKE2B 
cc144c9af852bfdd4149b96bdc22f8afb2d0aa92f95ebd272a244f0fb7743dc03f9244871d5c195260bac5d9ed20583093257ee2c95a5a4d0a4dae488d781adf
 SHA512 
d4428a1128cd5aef62c463b659992b110090b1602cdcb6b8d922d570c6b946fde325bfcf5a9a955a8dcc61f3ccd3d612d8517ebf63e316f98ca9ff2cd8a807aa

diff --git a/dev-db/mariadb/mariadb-5.5.66.ebuild 
b/dev-db/mariadb/mariadb-5.5.66.ebuild
new file mode 100644
index 000..2cd8c6360ff
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.66.ebuild
@@ -0,0 +1,836 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180809-1700Z"
+SUBSLOT="18"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils 
multilib-build
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+   SRC_URI="${SRC_URI}
+   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+fi
+
+HOMEPAGE="https://mariadb.org/;
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
+   oqgraph pam +perl profiling selinux +server sphinx
+   static static-libs systemtap tcmalloc
+   test tokudb yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+
+REQUIRED_USE="server? ( tokudb? ( jemallo

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2019-11-11 Thread Brian Evans
commit: 76ffeaddc67c51ddd413c39fb85732b2815eb17a
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Nov 11 20:41:15 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Nov 11 20:41:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ffeadd

dev-db/mariadb: Version bump for 10.4.10

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest   |1 +
 dev-db/mariadb/mariadb-10.4.10.ebuild | 1012 +
 2 files changed, 1013 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ba4fc88b70c..0e4e7b28e7d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,6 +7,7 @@ DIST mariadb-10.2.29.tar.gz 73087972 BLAKE2B 
aa3fe880f00b02846b26f16fcd37d18ebe2
 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 
8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826
 SHA512 
6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e
 DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B 
d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940
 SHA512 
817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
 DIST mariadb-10.3.20.tar.gz 71990355 BLAKE2B 
f950f0eb836751d0eebb9ae561fe3b5aefade04a0d389465918aa2a887e4f717ab4e6bd835dea8f9a88aacfe10c0b091fc2a59882a1781a3f2903ef07a759f5d
 SHA512 
8080cb6db85c587f39f128e98b00c3e6428bf3e828271a227bb2c61c97683c965802baa6e5f825317f7e2963683c0f81699642853deeca6977faa2b6932044a3
+DIST mariadb-10.4.10.tar.gz 78352896 BLAKE2B 
c0e448fba455feb9385b7d57e1a727e84eaf4cfa52ce0dbd6ff062aa0b5abc42005680fb185416d04fbd7bb62d9bbd6c93e4cb77b145418cf6be92747f8b1c2a
 SHA512 
4a9b9a37bc3a273de4bd781dac3636256364dae6efbba45765d6b28995da3d64e180422cd10418d1c7acd7fd8843fe2a2638c07e0f56b0c09170c58812cc6b71
 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B 
b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f
 SHA512 
cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce
 DIST mariadb-10.4.8.tar.gz 78262897 BLAKE2B 
357dfd8db702d30c30173cb4ee0bbbda8e54a77a8f726cdc529cbaeebd390fe11fd05c108dde54b029b7e311ebbf9a610dc2c6e4015c9a198d816deaaec5831e
 SHA512 
1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42
 DIST mariadb-5.5.65.tar.gz 45957577 BLAKE2B 
9ed27349d008d2001ed4059370505064918ef3586f89157f5f28892bceabd3073b7070f4054c0a700f1504dde3a4077e274111d5b8cb3713bc5db0910b752628
 SHA512 
5dbaa2ba7a829a0d5ae6ab8394c31a58753cd93da2637cd83d1e055e78b0796d63214418ddc91a65cefdd791aad4f01b0743aa8c7c40ecbb404cb81fd0138443

diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild 
b/dev-db/mariadb/mariadb-10.4.10.ebuild
new file mode 100644
index 000..70ab47d3b62
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.4.10.ebuild
@@ -0,0 +1,1012 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MY_EXTRAS_VER="20190731-2258Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+   java-pkg-opt-2 cmake-utils
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+   SRC_URI="${SRC_URI}
+   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+fi
+
+HOMEPAGE="https://mariadb.org/;
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
+   innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+   numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+   sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+   test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
+RESTRICT=&q

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2019-11-10 Thread Brian Evans
commit: 0d8b9a149e322debd51bf5920ed446d4b5fdf3cf
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Nov  9 19:05:37 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sat Nov  9 19:07:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8b9a14

dev-db/mariadb: Version bump for 10.3.20

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest   |   1 +
 dev-db/mariadb/mariadb-10.3.20.ebuild | 982 ++
 2 files changed, 983 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2b4d7cf7034..ba4fc88b70c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,6 +6,7 @@ DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 
7e4ae229040b3136ad107979864bc391556
 DIST mariadb-10.2.29.tar.gz 73087972 BLAKE2B 
aa3fe880f00b02846b26f16fcd37d18ebe217a2c9680c8c535042d2759852c929cd649d662c6a2bc603d934a6ba770ef945752c99d150f539e1fdd0d9be0ad51
 SHA512 
cee4e0d1a2b203cadaaa5678c5ce17302f18ffa55d07c8329392b1ea84740340c006eb9ab5920beef80835c2a399d5fffca409b8288e10ae62d290af62ec4ab8
 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 
8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826
 SHA512 
6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e
 DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B 
d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940
 SHA512 
817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
+DIST mariadb-10.3.20.tar.gz 71990355 BLAKE2B 
f950f0eb836751d0eebb9ae561fe3b5aefade04a0d389465918aa2a887e4f717ab4e6bd835dea8f9a88aacfe10c0b091fc2a59882a1781a3f2903ef07a759f5d
 SHA512 
8080cb6db85c587f39f128e98b00c3e6428bf3e828271a227bb2c61c97683c965802baa6e5f825317f7e2963683c0f81699642853deeca6977faa2b6932044a3
 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B 
b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f
 SHA512 
cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce
 DIST mariadb-10.4.8.tar.gz 78262897 BLAKE2B 
357dfd8db702d30c30173cb4ee0bbbda8e54a77a8f726cdc529cbaeebd390fe11fd05c108dde54b029b7e311ebbf9a610dc2c6e4015c9a198d816deaaec5831e
 SHA512 
1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42
 DIST mariadb-5.5.65.tar.gz 45957577 BLAKE2B 
9ed27349d008d2001ed4059370505064918ef3586f89157f5f28892bceabd3073b7070f4054c0a700f1504dde3a4077e274111d5b8cb3713bc5db0910b752628
 SHA512 
5dbaa2ba7a829a0d5ae6ab8394c31a58753cd93da2637cd83d1e055e78b0796d63214418ddc91a65cefdd791aad4f01b0743aa8c7c40ecbb404cb81fd0138443

diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild 
b/dev-db/mariadb/mariadb-10.3.20.ebuild
new file mode 100644
index 000..35694b80036
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.3.20.ebuild
@@ -0,0 +1,982 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190305-2052Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+   java-pkg-opt-2 user cmake-utils
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+   SRC_URI="${SRC_URI}
+   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+fi
+
+HOMEPAGE="https://mariadb.org/;
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+   innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+   numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+   sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+   test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/

2019-11-08 Thread Brian Evans
commit: 7d72270ea9bda5054790247fa85392e3b2fd105f
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Nov  8 19:58:09 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Nov  8 19:58:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d72270e

dev-db/mariadb: Version bump for 10.2.29

Upstream recommends immediate removal of 10.2.28
Despite the fact that it was published with the patch 10.2.29 fixed,
this comforts users.

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest|   2 +-
 dev-db/mariadb/files/MDEV-20987-fulltext.patch | 185 -
 ...riadb-10.2.28.ebuild => mariadb-10.2.29.ebuild} |   1 -
 3 files changed, 1 insertion(+), 187 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 7958d696b60..2b4d7cf7034 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,7 +3,7 @@ DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 
91ebc6d24c80ad9651c42a2f4553ce3ec3b
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B 
e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b
 SHA512 
cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
 DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 
54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c
 SHA512 
1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124
 DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 
7e4ae229040b3136ad107979864bc391556c1ba83847addd89e09f3757cd01203503e07832abe496a7f560048ed704f273607da3a114afa59ceb13cbb3b89c14
 SHA512 
9ea7ea30f964d022d16c662c18ac40ea50ef5b6592d02ba739ad81f9dfa9e60be90ea6d4706b43b07402c4cbc8c0280633b6e21bda6daf5bbc1d3c540993e4d6
-DIST mariadb-10.2.28.tar.gz 73078014 BLAKE2B 
cd1f11c35538590f0e864d1ab4696e1eaa3e239fc9760e00c3ad09aa054bb58f425931516e2ec2ef88869ab79039a95aec14d28e430e9a14169ec7d305ea
 SHA512 
4fdad47cdbe0643c8a9d40210aef0c135ee42b1696f6b9903e155522c8481f284d14dd96b21f06eb64f7b0dbb7591844109a03a2836cfb8a187b7aac8037c815
+DIST mariadb-10.2.29.tar.gz 73087972 BLAKE2B 
aa3fe880f00b02846b26f16fcd37d18ebe217a2c9680c8c535042d2759852c929cd649d662c6a2bc603d934a6ba770ef945752c99d150f539e1fdd0d9be0ad51
 SHA512 
cee4e0d1a2b203cadaaa5678c5ce17302f18ffa55d07c8329392b1ea84740340c006eb9ab5920beef80835c2a399d5fffca409b8288e10ae62d290af62ec4ab8
 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 
8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826
 SHA512 
6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e
 DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B 
d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940
 SHA512 
817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B 
b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f
 SHA512 
cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce

diff --git a/dev-db/mariadb/files/MDEV-20987-fulltext.patch 
b/dev-db/mariadb/files/MDEV-20987-fulltext.patch
deleted file mode 100644
index 4052938b052..000
--- a/dev-db/mariadb/files/MDEV-20987-fulltext.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 5c3bbbd845fe38a125553c62976c1165b2d9b8d7 Mon Sep 17 00:00:00 2001
-From: Thirunarayanan Balathandayuthapani 
-Date: Wed, 6 Nov 2019 10:20:32 +0530
-Subject: [PATCH] MDEV-20987 InnoDB fails to start when fts table has FK
- relation
-
-InnoDB: Assertion failure in file .../dict/dict0dict.cc line ...
-InnoDB: Failing assertion: table->can_be_evicted
-
-This fixes a regression that was caused by the fix of MDEV-20621
-(commit a41d429765c7ddb528b9b438c68b25ff55d3bd55).
-MySQL 5.6 (and MariaDB 10.0) introduced eviction of tables from
-the InnoDB data dictionary cache. Tables that are connected to
-FOREIGN KEY constraints or FULLTEXT INDEX are exempt of the eviction.
-With the problematic change, a table that would already be exempt
-from eviction due to FOREIGN KEY would cause the problem if there
-also was a FULLTEXT INDEX defined on it.
-
-dict_load_table(): Only prevent eviction if table->can_be_evicted holds.

- .../suite/innodb_fts/r/innodb_fts_misc.result | 21 ++--
- .../suite/innodb_fts/t/innodb_fts_misc.test   | 24 +++
- storage/innobase/dict/dict0load.cc|  2 +-
- s

[gentoo-commits] proj/devmanual:master commit in: bin/

2019-11-07 Thread Brian Evans
commit: 6c930dc94691fd01d5d5d5096c8ab92e66a40064
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Nov  7 15:05:10 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Nov  7 15:05:10 2019 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6c930dc9

bin/gen-eclass-html.sh: Work for all common compression methods

Signed-off-by: Brian Evans  gentoo.org>

 bin/gen-eclass-html.sh | 23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/bin/gen-eclass-html.sh b/bin/gen-eclass-html.sh
index d3b0cf2..8c9c337 100755
--- a/bin/gen-eclass-html.sh
+++ b/bin/gen-eclass-html.sh
@@ -35,13 +35,28 @@ IFS='' read -r -d '' FOOTER << 'EOF'
 
 EOF
 
+guesscompress() {
+   case "$1" in
+   *.gz|*.z)   echo "gunzip -c" ;;
+   *.bz2|*.bz) echo "bunzip2 -c" ;;
+   *.lz)   echo "lzip -dc" ;;
+   *.lzma) echo "unlzma -c" ;;
+   *.lzo)  echo "lzop -dc" ;;
+   *.xz)   echo "xzdec" ;;
+   *.zst)  echo "zstd -dc" ;;
+   *)  echo "cat" ;;
+   esac
+}
+
 # We also need the ebuild man page
-for i in $(/usr/bin/qlist eclass-manpages) /usr/share/man/man5/ebuild.5.bz2; do
-   BASENAME="$(basename $i .5.bz2)"
-   [[ ${BASENAME} != "${i##*/}" ]] || continue
+for i in $(/usr/bin/qlist eclass-manpages) /usr/share/man/man5/ebuild.5*; do
+   FILEBASE=${i##*/}
+   BASENAME="${FILEBASE%.5*}"
+   [[ ${BASENAME} != "${FILEBASE}" ]] || continue
DIRNAME="${OUTPUTDIR}/${BASENAME}"
TMP="${DIRNAME}/index.html.tmp"
FINAL="${DIRNAME}/index.html"
+   DECOMPRESS=$(guesscompress "${i}")
[[ -d ${DIRNAME} ]] || mkdir -p ${DIRNAME}
# rebuild the man page each time
cat << EOF > ${FINAL}
@@ -89,7 +104,7 @@ for i in $(/usr/bin/qlist eclass-manpages) 
/usr/share/man/man5/ebuild.5.bz2; do

 EOF
 # generate html pages and fix hyperlinks for eclass and ebuild man pages
-/bin/bunzip2 -c $i | /usr/bin/man2html -r - | \
+$DECOMPRESS "$i" | /usr/bin/man2html -r - | \
 sed -e "/:=../\1/index.html>:" \
 -e "/<\/BODY>/d" -e "/<\/HTML>/d"  \
 -e "/:=../\1/\index.html>:" >> 
${TMP}



[gentoo-commits] proj/devmanual:master commit in: bin/

2019-11-07 Thread Brian Evans
commit: 1c4eb888a7745e793e34f34dbc741cb04a70e204
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Nov  7 14:08:42 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Nov  7 14:08:42 2019 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1c4eb888

bin/gen-eclass-html.sh: Fix BASENAME test

Signed-off-by: Brian Evans  gentoo.org>

 bin/gen-eclass-html.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/gen-eclass-html.sh b/bin/gen-eclass-html.sh
index 1aa57f6..d3b0cf2 100755
--- a/bin/gen-eclass-html.sh
+++ b/bin/gen-eclass-html.sh
@@ -38,7 +38,7 @@ EOF
 # We also need the ebuild man page
 for i in $(/usr/bin/qlist eclass-manpages) /usr/share/man/man5/ebuild.5.bz2; do
BASENAME="$(basename $i .5.bz2)"
-   [[ ${BASENAME} != "${i}" ]] || continue
+   [[ ${BASENAME} != "${i##*/}" ]] || continue
DIRNAME="${OUTPUTDIR}/${BASENAME}"
TMP="${DIRNAME}/index.html.tmp"
FINAL="${DIRNAME}/index.html"



[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/

2019-11-06 Thread Brian Evans
commit: f60a97d01ed72dfd406403a7f58ec0f422e1c85d
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov  6 18:07:20 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Nov  6 18:12:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60a97d0

dev-db/mariadb: Version bump for 10.2.28

Bug: https://bugs.gentoo.org/699424
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest|   1 +
 dev-db/mariadb/files/MDEV-20987-fulltext.patch | 185 +
 dev-db/mariadb/mariadb-10.2.28.ebuild  | 987 +
 3 files changed, 1173 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 9a19448ee76..7958d696b60 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,6 +3,7 @@ DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 
91ebc6d24c80ad9651c42a2f4553ce3ec3b
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B 
e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b
 SHA512 
cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
 DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 
54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c
 SHA512 
1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124
 DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 
7e4ae229040b3136ad107979864bc391556c1ba83847addd89e09f3757cd01203503e07832abe496a7f560048ed704f273607da3a114afa59ceb13cbb3b89c14
 SHA512 
9ea7ea30f964d022d16c662c18ac40ea50ef5b6592d02ba739ad81f9dfa9e60be90ea6d4706b43b07402c4cbc8c0280633b6e21bda6daf5bbc1d3c540993e4d6
+DIST mariadb-10.2.28.tar.gz 73078014 BLAKE2B 
cd1f11c35538590f0e864d1ab4696e1eaa3e239fc9760e00c3ad09aa054bb58f425931516e2ec2ef88869ab79039a95aec14d28e430e9a14169ec7d305ea
 SHA512 
4fdad47cdbe0643c8a9d40210aef0c135ee42b1696f6b9903e155522c8481f284d14dd96b21f06eb64f7b0dbb7591844109a03a2836cfb8a187b7aac8037c815
 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 
8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826
 SHA512 
6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e
 DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B 
d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940
 SHA512 
817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B 
b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f
 SHA512 
cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce

diff --git a/dev-db/mariadb/files/MDEV-20987-fulltext.patch 
b/dev-db/mariadb/files/MDEV-20987-fulltext.patch
new file mode 100644
index 000..4052938b052
--- /dev/null
+++ b/dev-db/mariadb/files/MDEV-20987-fulltext.patch
@@ -0,0 +1,185 @@
+From 5c3bbbd845fe38a125553c62976c1165b2d9b8d7 Mon Sep 17 00:00:00 2001
+From: Thirunarayanan Balathandayuthapani 
+Date: Wed, 6 Nov 2019 10:20:32 +0530
+Subject: [PATCH] MDEV-20987 InnoDB fails to start when fts table has FK
+ relation
+
+InnoDB: Assertion failure in file .../dict/dict0dict.cc line ...
+InnoDB: Failing assertion: table->can_be_evicted
+
+This fixes a regression that was caused by the fix of MDEV-20621
+(commit a41d429765c7ddb528b9b438c68b25ff55d3bd55).
+MySQL 5.6 (and MariaDB 10.0) introduced eviction of tables from
+the InnoDB data dictionary cache. Tables that are connected to
+FOREIGN KEY constraints or FULLTEXT INDEX are exempt of the eviction.
+With the problematic change, a table that would already be exempt
+from eviction due to FOREIGN KEY would cause the problem if there
+also was a FULLTEXT INDEX defined on it.
+
+dict_load_table(): Only prevent eviction if table->can_be_evicted holds.
+---
+ .../suite/innodb_fts/r/innodb_fts_misc.result | 21 ++--
+ .../suite/innodb_fts/t/innodb_fts_misc.test   | 24 +++
+ storage/innobase/dict/dict0load.cc|  2 +-
+ storage/xtradb/dict/dict0load.cc  |  2 +-
+ 4 files changed, 17 insertions(+), 32 deletions(-)
+
+diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result 
b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
+index 71eded74be46..a2a73840723d 100644
+--- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
 b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
+@@ -1,4 +1,3 @@
+-drop table if exists t1;
+ CREATE TABL

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-11-01 Thread Brian Evans
commit: cc0cc430854ac3b5e03c7b37afc8cf35042a415e
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Nov  1 17:28:45 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Nov  1 17:28:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0cc430

dev-lang/php: Version bump for 7.4.0_rc5

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-7.4.0_rc5.ebuild | 724 ++
 2 files changed, 725 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 98993e40aac..907a11e612a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -12,4 +12,5 @@ DIST php-7.3.8.tar.xz 12064620 BLAKE2B 
cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c9
 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 
2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1
 SHA512 
017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490
 DIST php-7.4.0RC3.tar.xz 10220844 BLAKE2B 
dc3912533dc52234c5733c89e9353391ddffebe0f08e0de4b9155707d49db43700bfffb91d27391f56fbb2663752742346d7b2947ea77c4175322003b53d1bb4
 SHA512 
433f5bdafe753948f9ea837205988ae3c779a03c23505795f4c7c71a6cc62354cf61a2f30aa3480a588b9b44faa184664322616025af74627784d5b64b1e8dfb
 DIST php-7.4.0RC4.tar.xz 10223780 BLAKE2B 
03c19129fbe6e7326144660321769a31b832afbf9c468a4502e8e055be049bc39407003799f1c86bc96141d112571f3f12efb7c8d1d65acf96baae21c8a17423
 SHA512 
473bd7dd021d2377957799b36b410b29b6650c4813431ff27884e6b0511d4af32ed0500f241b449fefeb562538b0db81df76c14d84654c1d6faaee6e4c560a70
+DIST php-7.4.0RC5.tar.xz 10229964 BLAKE2B 
0525553bbcd948ea76177b433a9ab56f9e5f62866a9e8065a2c061aad54bc962515aa0ff77cce8f38ec799c07cda53f8d23acabf62bd218e4ffe3bda41b270e1
 SHA512 
a95c1c786ccaa4aac5d1cabc3831775a10b69e806031ddd495d271fafab54c54c3013f2193b4dabedde05047bb18f7d8491e7dee44afcb9a045c049df7ade5ee
 DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 
4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401
 SHA512 
eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e

diff --git a/dev-lang/php/php-7.4.0_rc5.ebuild 
b/dev-lang/php/php-7.4.0_rc5.ebuild
new file mode 100644
index 000..ececc5cc430
--- /dev/null
+++ b/dev-lang/php/php-7.4.0_rc5.ebuild
@@ -0,0 +1,724 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/;
+SRC_URI="https://downloads.php.net/~derick/${PN}-${MY_PV}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+   coverage +ctype curl debug
+   enchant exif ffi +fileinfo +filter firebird
+   +flatfile ftp gd gdbm gmp +iconv imap inifile
+   intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+   >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+   >=dev-libs/libpcre2-10.30[unicode]
+   fpm? ( acl? ( sys-apps/acl ) )
+   apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+   argon2? ( app-crypt/argon2:= )
+   berkdb? ( || (  sys-libs/db:5.3
+   sys-libs/db:5.1
+   sys-libs/db:4.8
+

[gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/

2019-10-25 Thread Brian Evans
commit: bd529668785ccde6d2b74600b9410512776b8d40
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct 25 18:17:17 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct 25 18:17:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd529668

net-irc/inspircd: Drop illegal symlinks

Non-maintainer commit

Remove symlinks from files/ which are banned by policy.
Adjust ebuilds to patch the intended files.

This prevents infra problems popping up like in the last 14 hours

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch | 1 -
 net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch  | 1 -
 net-irc/inspircd/inspircd-2.0.25.ebuild  | 4 ++--
 net-irc/inspircd/inspircd-2.0.28.ebuild  | 2 +-
 net-irc/inspircd/inspircd-3.2.0.ebuild   | 2 +-
 net-irc/inspircd/inspircd-3.3.0.ebuild   | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch 
b/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
deleted file mode 12
index a7b0dc06184..000
--- a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
+++ /dev/null
@@ -1 +0,0 @@
-inspircd-2.0.27-fix-path-builds.patch
\ No newline at end of file

diff --git a/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch 
b/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
deleted file mode 12
index 61ed4ed2c2a..000
--- a/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
+++ /dev/null
@@ -1 +0,0 @@
-inspircd-3.2.0-fix-path-builds.patch
\ No newline at end of file

diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild 
b/net-irc/inspircd/inspircd-2.0.25.ebuild
index 792cca4e9ae..7258f2c4e9f 100644
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.25-fix-path-builds.patch )
 
 pkg_setup() {
enewgroup ${PN}

diff --git a/net-irc/inspircd/inspircd-2.0.28.ebuild 
b/net-irc/inspircd/inspircd-2.0.28.ebuild
index 41581c0c6c1..86ef749f122 100644
--- a/net-irc/inspircd/inspircd-2.0.28.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.28.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.27-fix-path-builds.patch )
 
 src_prepare() {
default

diff --git a/net-irc/inspircd/inspircd-3.2.0.ebuild 
b/net-irc/inspircd/inspircd-3.2.0.ebuild
index 90aad649918..021dc47d8a8 100644
--- a/net-irc/inspircd/inspircd-3.2.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.2.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-fix-path-builds.patch )
 
 pkg_setup() {
enewgroup ${PN}

diff --git a/net-irc/inspircd/inspircd-3.3.0.ebuild 
b/net-irc/inspircd/inspircd-3.3.0.ebuild
index bf6ae574977..4661639e589 100644
--- a/net-irc/inspircd/inspircd-3.3.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.3.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-fix-path-builds.patch )
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: dev-python/mysql-connector-python/

2019-10-21 Thread Brian Evans
commit: 6975479c4068bae4640c4c6f9ff653a00dbe5f62
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 21 13:58:22 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Oct 21 13:58:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6975479c

dev-python/mysql-connector-python: Version bump for 8.0.18

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-python/mysql-connector-python/Manifest |  1 +
 .../mysql-connector-python-8.0.18.ebuild   | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/dev-python/mysql-connector-python/Manifest 
b/dev-python/mysql-connector-python/Manifest
index 8f82b30b7a1..5303f1d0a97 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1 +1,2 @@
 DIST mysql-connector-python-2.1.7.tar.gz 11781659 BLAKE2B 
332092059a32249e449f99540beb9eebf80e9381cef4560208412a19385894eb2193f02d5a20aceafe9644b8a225926a02d57c3acc89ba7d321b6d0f9c7c4d76
 SHA512 
f88c3a6dd3c3c1cd5c16165daef801dbcc7ea9163406273dd751e25687a57dcdf4ffbcdb65bb107e8cd9d7c91029823f625dc19ab34116398263fa074598880a
+DIST mysql-connector-python-8.0.18.tar.gz 12037201 BLAKE2B 
54dc45c9ecc09bad755bafec2b3b73e35368f742f30c8644764c8c892c6f79c3b6b438cf38dd9ebc878cd76d5d74d71be6668a903b57b3d0feaba9ff6f5b58cc
 SHA512 
cb441a6388de8609b56e4d9885ae2491d207c7b1e3bb387341d55853d383eff6e268e34feb32b42797c7b210d35f9d6dbc302ea4c9ed2441a76b91ea66d504b2

diff --git 
a/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild 
b/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
new file mode 100644
index 000..af4e24caa31
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Python client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/python/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test"
+
+BDEPEND=">=dev-libs/protobuf-3.6.1"
+
+RDEPEND="
+   >=dev-db/mysql-connector-c-8.0
+   >=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
+"
+# tests/mysqld.py does not like MariaDB version strings.
+# See the regex MySQLServerBase._get_version.
+DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
+
+# Tests currently fail.
+# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character 
string: ''
+RESTRICT="test"
+
+DOCS=( README.txt CHANGES.txt README.rst )
+
+python_test() {
+   "${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" 
--unix-socket="${T}" --mysql-topdir="${T}"
+}
+
+# Yeah, this is really broken, but the extension will only build this way 
during "install"
+python_install() {
+   distutils-r1_python_install \
+   --with-mysql-capi="${EPREFIX}/usr" \
+   
--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
+   --with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+   --with-protoc="${EPREFIX}/usr/bin/protoc"
+}
+
+python_install_all(){
+   distutils-r1_python_install_all
+   if use examples ; then
+   dodoc -r examples
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: profiles/

2019-10-21 Thread Brian Evans
commit: bbfaf2342e3d403a646d75a0a3e0685ab572deb3
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 21 12:53:32 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Oct 21 12:53:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfaf234

profiles: Limit mask for dev-php/xhprof below 0.9.10

Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index d1d6ee74e1f..8404b45a81e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -426,7 +426,7 @@ dev-php/pecl-svn
 dev-php/pecl-xrange
 dev-php/suhosin
 dev-php/xcache
-dev-php/xhprof
+ (2019-09-28)
 # Merged into Mesa. No reverse dependencies. Bug #654464



[gentoo-commits] proj/mysql-extras:master commit in: /

2019-10-17 Thread Brian Evans
commit: 5bda8618c55ed07f5652107d7b76ddc88454ee06
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Oct 17 18:34:23 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Oct 17 18:34:23 2019 +
URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=5bda8618

Fix 8.0.18 libressl patch

Signed-off-by: Brian Evans  gentoo.org>

 20018_all_mysql-8.0.18-fix-libressl-support.patch | 31 +--
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/20018_all_mysql-8.0.18-fix-libressl-support.patch 
b/20018_all_mysql-8.0.18-fix-libressl-support.patch
index f6dc74f..e7e1a79 100644
--- a/20018_all_mysql-8.0.18-fix-libressl-support.patch
+++ b/20018_all_mysql-8.0.18-fix-libressl-support.patch
@@ -250,9 +250,24 @@ diff -aurN a/vio/viossl.cc b/vio/viossl.cc
DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
  #else  /* OPENSSL_VERSION_NUMBER < 0x1010L */
DBUG_PRINT("info",
+diff -aurN a/include/violite.h b/include/violite.h
+--- a/include/violite.h2019-09-20 04:30:51.0 -0400
 b/include/violite.h2019-10-17 14:31:39.045842844 -0400
+@@ -269,9 +269,11 @@
+ 
+ long process_tls_version(const char *tls_version);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int set_fips_mode(const uint fips_mode, char *err_string);
+ 
+ uint get_fips_mode();
++#endif
+ 
+ struct st_VioSSLFd *new_VioSSLAcceptorFd(
+ const char *key_file, const char *cert_file, const char *ca_file,
 diff -aurN a/vio/viosslfactories.cc b/vio/viosslfactories.cc
 a/vio/viosslfactories.cc   2019-09-20 04:30:51.0 -0400
-+++ b/vio/viosslfactories.cc   2019-10-15 12:34:15.145676646 -0400
+--- a/vio/viosslfactories.cc   2019-10-17 14:27:32.672896538 -0400
 b/vio/viosslfactories.cc   2019-10-17 14:27:47.776954552 -0400
 @@ -420,6 +420,7 @@
}
  }
@@ -261,11 +276,11 @@ diff -aurN a/vio/viosslfactories.cc 
b/vio/viosslfactories.cc
  /**
Set fips mode in openssl library,
When we set fips mode ON/STRICT, it will perform following operations:
-@@ -466,6 +467,7 @@
- EXIT:
-   return rc;
- }
+@@ -473,6 +474,7 @@
+   @returns openssl current fips mode
+ */
+ uint get_fips_mode() { return FIPS_mode(); }
 +#endif
  
- /**
-   Get fips mode from openssl library,
+ long process_tls_version(const char *tls_version) {
+   const char *separator = ",";



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/

2019-10-16 Thread Brian Evans
commit: 64a7ec625f74ee03eccfed61921b0ece07ac26c8
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Oct 16 17:33:00 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Oct 16 17:33:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a7ec62

dev-db/mysql: Version bump for 8.0.l8

Restore server USE as well

Closes: https://bugs.gentoo.org/697640
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mysql/Manifest|2 +
 dev-db/mysql/mysql-8.0.18.ebuild | 1119 ++
 2 files changed, 1121 insertions(+)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ef3ead138dc..1a194d5ea31 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,5 +3,7 @@ DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B 
3c629aed1de808acdea6654c7413e6851507c9
 DIST mysql-boost-5.7.26.tar.gz 51098338 BLAKE2B 
1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26
 SHA512 
a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd
 DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 
6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497
 SHA512 
573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52
 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B 
f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a
 SHA512 
a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
+DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B 
e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc
 SHA512 
180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5
 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B 
dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830
 SHA512 
c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B 
bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb
 SHA512 
be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
+DIST mysql-extras-20191016-1722Z.tar.bz2 340442 BLAKE2B 
fa38fc455693b940cfb96f69a35c190f7edb3fdfa7bf0e3f4e444032843ca1ad1d4767fecaf3b080f7f8885335ffe81f2355e9fe0fdebe77ac90d7fb1a0d2121
 SHA512 
1b4d3fb1cda63471807e37ecdd6a663672149a9eac9497d6b864a9ecdd57d179950176da2db0668892567994bd2fc1e98ea499f16dc689738331a1e319c9131c

diff --git a/dev-db/mysql/mysql-8.0.18.ebuild b/dev-db/mysql/mysql-8.0.18.ebuild
new file mode 100644
index 000..450b754c297
--- /dev/null
+++ b/dev-db/mysql/mysql-8.0.18.ebuild
@@ -0,0 +1,1119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MY_EXTRAS_VER="20191016-1722Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake-utils flag-o-matic linux-info \
+   multiprocessing prefix toolchain-funcs check-reqs
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
+   https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz
+   
http://downloads.mysql.com/archives/MySQL-8.0/${PN}-boost-${MY_PV}.tar.gz;
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]] ; then
+   SRC_URI="${SRC_URI}
+   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+fi
+
+HOMEPAGE="https://www.mysql.com/;
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+   router selinux +server tcmalloc test"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
+RESTRICT="libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~

[gentoo-commits] proj/mysql-extras: New tag: mysql-extras-20191016-1722Z

2019-10-16 Thread Brian Evans
commit: 
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Oct 16 17:22:09 2019 +

New tag: mysql-extras-20191016-1722Z




[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmDownload/, app-arch/cksfv/, net-im/vacuum/

2019-10-16 Thread Brian Evans
commit: d6015a726d08bf9b047f4d4018aad9578f3070c2
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Oct 16 14:00:16 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Oct 16 14:00:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6015a72

Update metadata typos in 3 packages.

app-arch/cksfv net-im/vacuum x11-plugins/wmDownload

Signed-off-by: Brian Evans  gentoo.org>

 app-arch/cksfv/metadata.xml | 2 +-
 net-im/vacuum/metadata.xml  | 2 +-
 x11-plugins/wmDownload/metadata.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/cksfv/metadata.xml b/app-arch/cksfv/metadata.xml
index d776c6cd250..2f043d06aa4 100644
--- a/app-arch/cksfv/metadata.xml
+++ b/app-arch/cksfv/metadata.xml
@@ -2,5 +2,5 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
 
-A Simple file verification tool to ensure that the files you 
recieve are the same as the originals.
+A Simple file verification tool to ensure that the files you 
receive are the same as the originals.
 

diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 7cef94a3a3a..69557bbd0f9 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/metadata.xml
@@ -40,7 +40,7 @@
Enable saving the communication 
history both locally and on the server
Allows to keep all user IM clients 
engaged in a conversation
Enable Jabber multi-user 
conferences
-   Allows other plugins to recieve and 
publish PEP events
+   Allows other plugins to receive and 
publish PEP events
Enable blocking the undesirable 
contacts
Allow other modules to store 
arbitrary data on the server
Displays a recently used 
contacts

diff --git a/x11-plugins/wmDownload/metadata.xml 
b/x11-plugins/wmDownload/metadata.xml
index fe66716a8a3..91ce9775a21 100644
--- a/x11-plugins/wmDownload/metadata.xml
+++ b/x11-plugins/wmDownload/metadata.xml
@@ -7,7 +7,7 @@


wmDownload is a small WindowMaker dockapp that sits there and 
displays how much
-   data you've recieved on each eth and ppp device installed on 
your machine.
+   data you've received on each eth and ppp device installed on 
your machine.


wmdownload



[gentoo-commits] proj/mysql-extras:master commit in: /

2019-10-15 Thread Brian Evans
commit: 721fdd555ee2d436c1a2bf7a00af7742e6d8
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct 15 16:59:47 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct 15 16:59:47 2019 +
URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=721fdd55

Fix typo from last patch

Signed-off-by: Brian Evans  gentoo.org>

 20018_all_mysql-8.0.18-fix-libressl-support.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/20018_all_mysql-8.0.18-fix-libressl-support.patch 
b/20018_all_mysql-8.0.18-fix-libressl-support.patch
index 9bcbd3e..f6dc74f 100644
--- a/20018_all_mysql-8.0.18-fix-libressl-support.patch
+++ b/20018_all_mysql-8.0.18-fix-libressl-support.patch
@@ -47,7 +47,7 @@ diff -aurN a/mysys/my_md5.cc b/mysys/my_md5.cc
int fips_mode = 0;
 +#ifndef LIBRESSL_VERSION_NUMBER
fips_mode = FIPS_mode();
-+#endif /* LIBRESSL_VERSION_NUMBER 8?
++#endif /* LIBRESSL_VERSION_NUMBER */
/* If fips mode is ON/STRICT restricted method calls will result into abort,
 * skipping call. */
if (fips_mode == 0) {



[gentoo-commits] proj/mysql-extras:master commit in: /

2019-10-15 Thread Brian Evans
commit: 4c93355a539343e6ca6c88945c21a8ff94ef1d65
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct 15 16:47:52 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct 15 16:47:52 2019 +
URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=4c93355a

Fix duplicated patch from previous commit

Signed-off-by: Brian Evans  gentoo.org>

 20018_all_mysql-8.0.18-fix-libressl-support.patch | 258 --
 1 file changed, 258 deletions(-)

diff --git a/20018_all_mysql-8.0.18-fix-libressl-support.patch 
b/20018_all_mysql-8.0.18-fix-libressl-support.patch
index 72a2472..9bcbd3e 100644
--- a/20018_all_mysql-8.0.18-fix-libressl-support.patch
+++ b/20018_all_mysql-8.0.18-fix-libressl-support.patch
@@ -1,261 +1,3 @@
-From: Stefan Strogin 
-Date: Sat, 8 Jun 2019 15:52:26 +0300
-Subject: [PATCH] Fix build with LibreSSL
-
-- Fix version checks as OPENSSL_VERSION_NUMBER in OpenSSL is always
-  0x2000L.
-- FIPS support is removed from LibreSSL, do not use it.
-- Check for TLS1_3_VERSION define, not OpenSSL/LibreSSL version.
-  Theoretically even OpenSSL >=1.1.1 can be built with TLS 1.3 disabled.
-
-
 a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -304,13 +304,14 @@ MACRO (MYSQL_CHECK_SSL)
- OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
- )
- ENDIF()
--
IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" 
VERSION_GREATER "1.1.0")
-+CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+IF(HAVE_TLS1_3_VERSION)
-ADD_DEFINITIONS(-DHAVE_TLSv13)
- ENDIF()
- IF(OPENSSL_INCLUDE_DIR AND
-OPENSSL_LIBRARY   AND
-CRYPTO_LIBRARY  AND
--   OPENSSL_MAJOR_VERSION STREQUAL "1"
-+   OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-   )
-   SET(OPENSSL_FOUND TRUE)
-   FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
 a/extra/libevent/openssl-compat.h
-+++ b/extra/libevent/openssl-compat.h
-@@ -24,7 +24,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char 
*name)
- #define BIO_set_init(b, val) (b)->init = (val)
- #define BIO_set_data(b, val) (b)->ptr = (val)
- #define BIO_set_shutdown(b, val) (b)->shutdown = (val)
--#define BIO_get_init(b) (b)->init
- #define BIO_get_data(b) (b)->ptr
- #define BIO_get_shutdown(b) (b)->shutdown
- 
-@@ -32,4 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char 
*name)
- 
- #endif /* OPENSSL_VERSION_NUMBER < 0x1010L */
- 
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
-+
- #endif /* OPENSSL_COMPAT_H */
 a/mysys/my_md5.cc
-+++ b/mysys/my_md5.cc
-@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigned 
const char *buf,
- int compute_md5_hash(char *digest, const char *buf, int len) {
-   int retval = 0;
-   int fips_mode = 0;
--#if !defined(HAVE_WOLFSSL)
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   fips_mode = FIPS_mode();
- #endif /* HAVE_WOLFSSL */
-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
 
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
-+++ 
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
-@@ -297,7 +297,7 @@ error:
-   return 1;
- }
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- #define OPENSSL_ERROR_LENGTH 512
- static int configure_ssl_fips_mode(const uint fips_mode) {
-   int rc = -1;
-@@ -521,7 +521,7 @@ int xcom_init_ssl(const char *server_key_file, const char 
*server_cert_file,
-   int verify_server = SSL_VERIFY_NONE;
-   int verify_client = SSL_VERIFY_NONE;
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
- G_ERROR("Error setting the ssl fips mode");
- goto error;
 a/plugin/x/client/xconnection_impl.cc
-+++ b/plugin/x/client/xconnection_impl.cc
-@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_id) {
-   return XError(CR_SSL_CONNECTION_ERROR, buffer);
- }
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -573,7 +573,7 @@ XError Connection_impl::activate_tls() {
-   if (!m_context->m_ssl_config.is_configured())
- return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) 
!=
-   1) {
 a/router/src/htt

[gentoo-commits] proj/mysql-extras:master commit in: /

2019-10-15 Thread Brian Evans
commit: 355217b0b03e04b1f9257f7d685c66e91d0b91f6
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct 15 16:39:49 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct 15 16:39:49 2019 +
URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=355217b0

Respin libressl patch for 8.0.18 which removed WOLFSSL

Signed-off-by: Brian Evans  gentoo.org>

 20018_all_mysql-8.0.18-fix-libressl-support.patch | 529 ++
 1 file changed, 529 insertions(+)

diff --git a/20018_all_mysql-8.0.18-fix-libressl-support.patch 
b/20018_all_mysql-8.0.18-fix-libressl-support.patch
new file mode 100644
index 000..72a2472
--- /dev/null
+++ b/20018_all_mysql-8.0.18-fix-libressl-support.patch
@@ -0,0 +1,529 @@
+From: Stefan Strogin 
+Date: Sat, 8 Jun 2019 15:52:26 +0300
+Subject: [PATCH] Fix build with LibreSSL
+
+- Fix version checks as OPENSSL_VERSION_NUMBER in OpenSSL is always
+  0x2000L.
+- FIPS support is removed from LibreSSL, do not use it.
+- Check for TLS1_3_VERSION define, not OpenSSL/LibreSSL version.
+  Theoretically even OpenSSL >=1.1.1 can be built with TLS 1.3 disabled.
+
+
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -304,13 +304,14 @@ MACRO (MYSQL_CHECK_SSL)
+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
+ )
+ ENDIF()
+-
IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" 
VERSION_GREATER "1.1.0")
++CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
++IF(HAVE_TLS1_3_VERSION)
+ADD_DEFINITIONS(-DHAVE_TLSv13)
+ ENDIF()
+ IF(OPENSSL_INCLUDE_DIR AND
+OPENSSL_LIBRARY   AND
+CRYPTO_LIBRARY  AND
+-   OPENSSL_MAJOR_VERSION STREQUAL "1"
++   OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+   )
+   SET(OPENSSL_FOUND TRUE)
+   FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
+--- a/extra/libevent/openssl-compat.h
 b/extra/libevent/openssl-compat.h
+@@ -24,7 +24,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char 
*name)
+ #define BIO_set_init(b, val) (b)->init = (val)
+ #define BIO_set_data(b, val) (b)->ptr = (val)
+ #define BIO_set_shutdown(b, val) (b)->shutdown = (val)
+-#define BIO_get_init(b) (b)->init
+ #define BIO_get_data(b) (b)->ptr
+ #define BIO_get_shutdown(b) (b)->shutdown
+ 
+@@ -32,4 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char 
*name)
+ 
+ #endif /* OPENSSL_VERSION_NUMBER < 0x1010L */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
++#define BIO_get_init(b) (b)->init
++#endif
++
+ #endif /* OPENSSL_COMPAT_H */
+--- a/mysys/my_md5.cc
 b/mysys/my_md5.cc
+@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigned 
const char *buf,
+ int compute_md5_hash(char *digest, const char *buf, int len) {
+   int retval = 0;
+   int fips_mode = 0;
+-#if !defined(HAVE_WOLFSSL)
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+   fips_mode = FIPS_mode();
+ #endif /* HAVE_WOLFSSL */
+   /* If fips mode is ON/STRICT restricted method calls will result into abort,
+--- 
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
 
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
+@@ -297,7 +297,7 @@ error:
+   return 1;
+ }
+ 
+-#ifndef HAVE_WOLFSSL
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+ #define OPENSSL_ERROR_LENGTH 512
+ static int configure_ssl_fips_mode(const uint fips_mode) {
+   int rc = -1;
+@@ -521,7 +521,7 @@ int xcom_init_ssl(const char *server_key_file, const char 
*server_cert_file,
+   int verify_server = SSL_VERIFY_NONE;
+   int verify_client = SSL_VERIFY_NONE;
+ 
+-#ifndef HAVE_WOLFSSL
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+   if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
+ G_ERROR("Error setting the ssl fips mode");
+ goto error;
+--- a/plugin/x/client/xconnection_impl.cc
 b/plugin/x/client/xconnection_impl.cc
+@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_id) {
+   return XError(CR_SSL_CONNECTION_ERROR, buffer);
+ }
+ 
+-#ifndef HAVE_WOLFSSL
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+ /**
+   Set fips mode in openssl library,
+   When we set fips mode ON/STRICT, it will perform following operations:
+@@ -573,7 +573,7 @@ XError Connection_impl::activate_tls() {
+   if (!m_context->m_ssl_config.is_configured())
+ return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};
+ 
+-#ifndef HAVE_WOLFSSL
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
+   if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) 
!=
+   1) {
+--- a/router/src/http/src/tls_client_

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-amqp/

2019-10-15 Thread Brian Evans
commit: e12a3c8645212c47dc1d08846c3218c3d5267af5
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 14 13:58:44 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct 15 13:12:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12a3c86

dev-php/pecl-amqp: Drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-amqp/Manifest   |  3 ---
 dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild | 18 --
 dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild | 19 ---
 dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild | 19 ---
 4 files changed, 59 deletions(-)

diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest
index afe2d2b51fc..31d5078db8c 100644
--- a/dev-php/pecl-amqp/Manifest
+++ b/dev-php/pecl-amqp/Manifest
@@ -1,4 +1 @@
-DIST amqp-1.8.0.tgz 91850 BLAKE2B 
35a0f44ce770f3d20adcbacf7a6bfd014014f1a09c2bb006e9e50c6f8f97f6d564f5db5adf0d3bceb08611d1cf3f7a95f5e6256977ed1ed134791c92a01addf6
 SHA512 
a70873e2f9ad47c2e6b028727e9746e1eee8bb1007c7272e422f14527ee3e980c6ffc9a94671c548082c380cee4d9a27ac5c4adce382fdcf9251ac6eb7c7
-DIST amqp-1.9.0.tgz 98248 BLAKE2B 
2bf13a72eedb0d46bfba3c5d2ec01d1a85cfd60b2dadfaa8e0475eda52ee6650f8757d7521f808043464f3a32a33e4143153136f08f9c4484316ca06785b5888
 SHA512 
ce77266d9c95d87c7ddf177c531540e05f9120417e645f4595f204fad2d2ecd9f388f0e1e55d69bee845333b5b5976960cc2a603ea6860708df1eafe0aef9a10
-DIST amqp-1.9.3.tgz 101342 BLAKE2B 
1e9702cfd44035fe8c923cd2766ce49309310da11655e96246133bb7d8f686a661703f5c35053c19dc607a1c6d1afe515c87ceeecc1cdf93acfa6b211c6802bd
 SHA512 
d4731ed5dc760a01621889e8518b5d1258a8335f701d241c453fd553924d83507a0a918b9733e249955fa11b43a1bdacf65c1f1cb55b8ed3c5b661277f5798b9
 DIST amqp-1.9.4.tgz 102604 BLAKE2B 
34bed57e2aa3044ac02949ef0d700af71114fc4dd0007ac7a90fadfe267063d8defd6f0e1fe076aa3680187035b1596c283f3cdab8b27f8d3e59f6abf7246147
 SHA512 
53f8893c2fdb6f41467c9af4a5e48810d39201150a94dd9d32f542d53387ef5e6d8c614ebe2d82b3ab9febd39aa8759a86975d0dc45092a2772f08cd86d7f739

diff --git a/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild 
b/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild
deleted file mode 100644
index 5960e89908b..000
--- a/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=net-libs/rabbitmq-c-0.5.2 virtual/pkgconfig"
-RDEPEND=">=net-libs/rabbitmq-c-0.5.2:="

diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild 
b/dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild
deleted file mode 100644
index 20df124580c..000
--- a/dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=net-libs/rabbitmq-c-0.5.2[ssl] virtual/pkgconfig"
-RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
-PHP_EXT_ECONF_ARGS=()

diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild 
b/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild
deleted file mode 100644
index 060b5164a62..000
--- a/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=net-libs/rabbitmq-c-0.5.2[ssl] virtual/pkgconfig"
-RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
-PHP_EXT_ECONF_ARGS=()



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-amqp/

2019-10-15 Thread Brian Evans
commit: 9267419cc7ed191bf69f93b9dbfd0418263b8834
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 14 13:38:01 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct 15 13:12:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9267419c

dev-php/pecl-amqp: Revbump adding 7.4, dropping 5.6 and 7.0

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild | 24 
 1 file changed, 24 insertions(+)

diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild 
b/dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild
new file mode 100644
index 000..f60903763b8
--- /dev/null
+++ b/dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+# Tests require running rabbitmq-server on localhost which requires epmd
+# which only accepts /var/run/epmd.pid as pidfile.
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
+DEPEND="${RDEPEND}"
+PHP_EXT_ECONF_ARGS=()



[gentoo-commits] proj/mysql-extras:master commit in: /

2019-10-14 Thread Brian Evans
commit: d7f9cfd3c4f6aabcbe92c0e4a76712d9a42e08a2
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 14 19:14:58 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Oct 14 19:14:58 2019 +
URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=d7f9cfd3

Add another section to 8.0.18 without-clientlibs patch

Signed-off-by: Brian Evans  gentoo.org>

 20018_all_mysql-8.0.18-without-clientlibs-tools.patch | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/20018_all_mysql-8.0.18-without-clientlibs-tools.patch 
b/20018_all_mysql-8.0.18-without-clientlibs-tools.patch
index b3d7d23..bd6c1ad 100644
--- a/20018_all_mysql-8.0.18-without-clientlibs-tools.patch
+++ b/20018_all_mysql-8.0.18-without-clientlibs-tools.patch
@@ -178,3 +178,22 @@
  
  IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
MYSQL_ADD_EXECUTABLE(zlib_decompress
+diff -aurN a/man/CMakeLists.txt b/man/CMakeLists.txt
+--- a/man/CMakeLists.txt   2019-10-14 14:23:01.188087069 -0400
 b/man/CMakeLists.txt   2019-10-14 14:43:18.723648241 -0400
+@@ -26,7 +26,6 @@
+   ibd2sdi.1
+   innochecksum.1
+   lz4_decompress.1
+-  my_print_defaults.1
+   myisam_ftdump.1
+   myisamchk.1
+   myisamlog.1
+@@ -51,7 +50,5 @@
+   mysqlpump.1
+   mysqlshow.1
+   mysqlslap.1
+-  perror.1
+-  zlib_decompress.1
+   )
+ SET(MAN1_NDB



[gentoo-commits] proj/mysql-extras:master commit in: /

2019-10-14 Thread Brian Evans
commit: c183824a35fe6a198a712af7ca2d0f0bc7de8eba
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 14 18:27:24 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Oct 14 18:27:24 2019 +
URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=c183824a

Respin 2 patches for 8.0.18 - libressl still needs rewrite

Signed-off-by: Brian Evans  gentoo.org>

 20007_all_cmake-debug-werror-8.0.18.patch  |  15 ++
 ...all_mysql-8.0.18-without-clientlibs-tools.patch | 180 +
 2 files changed, 195 insertions(+)

diff --git a/20007_all_cmake-debug-werror-8.0.18.patch 
b/20007_all_cmake-debug-werror-8.0.18.patch
new file mode 100644
index 000..c2c1573
--- /dev/null
+++ b/20007_all_cmake-debug-werror-8.0.18.patch
@@ -0,0 +1,15 @@
+--- a/cmake/maintainer.cmake
 b/cmake/maintainer.cmake
+@@ -207,12 +207,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   # -Wzero-as-null-pointer-constant
+ ENDIF()
+ 
+-# Turn on Werror (warning => error) when using maintainer mode.
+-IF(MYSQL_MAINTAINER_MODE)
+-  STRING_APPEND(MY_C_WARNING_FLAGS   " -Werror")
+-  STRING_APPEND(MY_CXX_WARNING_FLAGS " -Werror")
+-ENDIF()
+-
+ # Set warning flags for gcc/g++/clang/clang++
+ IF(MY_COMPILER_IS_GNU_OR_CLANG)
+   STRING_APPEND(CMAKE_C_FLAGS " ${MY_C_WARNING_FLAGS}")

diff --git a/20018_all_mysql-8.0.18-without-clientlibs-tools.patch 
b/20018_all_mysql-8.0.18-without-clientlibs-tools.patch
new file mode 100644
index 000..b3d7d23
--- /dev/null
+++ b/20018_all_mysql-8.0.18-without-clientlibs-tools.patch
@@ -0,0 +1,180 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1114,8 +1114,6 @@ ENDIF()
+ MYSQL_CHECK_SSL()
+ MYSQL_CHECK_SSL_DLLS()
+ 
+-# Add system/bundled editline.
+-MYSQL_CHECK_EDITLINE()
+ # Add libevent
+ IF(NOT WITHOUT_SERVER)
+   MYSQL_CHECK_LIBEVENT()
+@@ -1207,7 +1205,9 @@ IF(WITH_UNIT_TESTS)
+  INCLUDE(googletest)
+ ENDIF()
+ 
+-ADD_SUBDIRECTORY(include)
++IF(NOT WITHOUT_CLIENTLIBS)
++  ADD_SUBDIRECTORY(include)
++ENDIF(NOT WITHOUT_CLIENTLIBS)
+ ADD_SUBDIRECTORY(strings)
+ ADD_SUBDIRECTORY(vio)
+ ADD_SUBDIRECTORY(mysys)
+@@ -1250,7 +1250,6 @@ IF(WITH_UNIT_TESTS)
+   ADD_SUBDIRECTORY(unittest/mytap/t)
+ ENDIF()
+ 
+-ADD_SUBDIRECTORY(client)
+ ADD_SUBDIRECTORY(utilities)
+ ADD_SUBDIRECTORY(share)
+ ADD_SUBDIRECTORY(libservices)
+@@ -1295,6 +1294,12 @@ IF(UNIX)
+   ADD_SUBDIRECTORY(man)
+ ENDIF()
+ 
++IF(NOT WITHOUT_TOOLS)
++  # Add system/bundled editline
++  MYSQL_CHECK_EDITLINE()
++  ADD_SUBDIRECTORY(client)
++ENDIF(NOT WITHOUT_TOOLS)
++
+ IF(NOT WITHOUT_SERVER)
+   ADD_SUBDIRECTORY(packaging/rpm-common)
+   ADD_SUBDIRECTORY(packaging/rpm-oel)
+--- a/libmysql/CMakeLists.txt
 b/libmysql/CMakeLists.txt
+@@ -240,12 +240,17 @@ IF(WIN32)
+   LIST(APPEND LIBS_TO_MERGE auth_win_client)
+ ENDIF()
+ 
+-# LDAP authentication SASL client plugin
+-MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
+-ADD_SUBDIRECTORY(authentication_ldap)
+-  
+-# Merge several convenience libraries into one big mysqlclient
+-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT 
Development)
++IF(WITHOUT_CLIENTLIBS)
++  # Merge several convenience libraries into one big mysqlclient
++  MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT 
Development SKIP_INSTALL)
++ELSE(WITHOUT_CLIENTLIBS)
++  # LDAP authentication SASL client plugin
++  MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
++  ADD_SUBDIRECTORY(authentication_ldap)
++
++  # Merge several convenience libraries into one big mysqlclient
++  MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT 
Development)
++ENDIF(WITHOUT_CLIENTLIBS)
+ TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
+ 
+ # Visual Studio users need debug  static library for debug projects
+@@ -286,12 +286,22 @@
+ 
+ # Merge several convenience libraries into one big mysqlclient
+ # and link them together into shared library.
++IF(WITHOUT_CLIENTLIBS)
++MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
++  EXPORTS
++  ${CLIENT_API_FUNCTIONS}
++  ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
++  ${CLIENT_API_NONBLOCKING_FUNCTIONS}
++  COMPONENT SharedLibraries
++  SKIP_INSTALL )
++ELSE(WITHOUT_CLIENTLIBS)
+ MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
+   EXPORTS
+   ${CLIENT_API_FUNCTIONS}
+   ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
+   ${CLIENT_API_NONBLOCKING_FUNCTIONS}
+   COMPONENT SharedLibraries)
++ENDIF(WITHOUT_CLIENTLIBS)
+ TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
+ 
+ IF(WIN32)
+--- a/scripts/CMakeLists.txt
 b/scripts/CMakeLists.txt
+@@ -459,18 +459,23 @@ ELSE()
+ 
+   IF(WITH_SYSTEMD)
+ SET(BIN_SCRIPTS
+-  mysql_config
+   mysqldumpslow
+   )
+   ELSE()
+ SET(BIN_SCRIPTS
+-  mysql_config
+   mysqldumpslow
+   mysqld_multi
+   mysqld_safe
+   )
+   ENDIF()
+ 
++  IF(NOT WITHOUT_CLIENTLIBS)
++SET(BIN_SCRIPTS
++  ${BIN_SCRIPTS}
+

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-mailparse/

2019-10-14 Thread Brian Evans
commit: 8e438862337483ab6463d40f03645ffd45bd66ca
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 14 13:06:46 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Oct 14 13:06:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e438862

dev-php/pecl-mailparse: Revbump adding 7.4, dropping 5.6 and 7.0

Closes: https://bugs.gentoo.org/697682
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 .../pecl-mailparse/pecl-mailparse-3.0.3-r1.ebuild  | 28 ++
 1 file changed, 28 insertions(+)

diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.3-r1.ebuild 
b/dev-php/pecl-mailparse/pecl-mailparse-3.0.3-r1.ebuild
new file mode 100644
index 000..ba94254281a
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="unicode"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME 
compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+src_prepare() {
+   # Missing test source files in archive.  Fixed upstream in next release.
+   rm tests/011.phpt tests/bug001.phpt || die
+   php-ext-source-r3_src_prepare
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-mailparse/

2019-10-14 Thread Brian Evans
commit: 7d6aa908f102f7f9f01a7392b7eabfc42bf60536
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 14 13:09:32 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Oct 14 13:09:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d6aa908

dev-php/pecl-mailparse: Drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-mailparse/pecl-mailparse-3.0.2.ebuild | 50 --
 dev-php/pecl-mailparse/pecl-mailparse-3.0.3.ebuild | 49 -
 2 files changed, 99 deletions(-)

diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2.ebuild 
b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2.ebuild
deleted file mode 100644
index 8d774c1f57c..000
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mailparse"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-DOCS=( README )
-
-USE_PHP="php7-0 php7-1 php5-6"
-
-inherit php-ext-pecl-r3
-
-# Only build for 7.x
-USE_PHP="php7-0 php7-1"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME 
compliant messages"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-
-for target in ${USE_PHP}; do
-   phpslot=${target/php}
-   phpslot=${phpslot/-/.}
-   PHPUSEDEPEND="${PHPUSEDEPEND}
-   php_targets_${target}? ( dev-lang/php:${phpslot}[unicode] )"
-done
-unset target phpslot
-
-DEPEND="${PHPUSEDEPEND}
-   dev-util/re2c"
-RDEPEND="${PHPUSEDEPEND} php_targets_php5-6? ( 
dev-php/pecl-mailparse:0[php_targets_php5-6] )"
-
-src_prepare() {
-   if use php_targets_php7-0 || use php_targets_php7-1 ; then
-   php-ext-source-r3_src_prepare
-   else
-   default_src_prepare
-   fi
-}
-
-src_install() {
-   if use php_targets_php7-0 || use php_targets_php7-1 ; then
-   php-ext-pecl-r3_src_install
-   fi
-}

diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.3.ebuild 
b/dev-php/pecl-mailparse/pecl-mailparse-3.0.3.ebuild
deleted file mode 100644
index 0caa08eb4a8..000
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mailparse"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-DOCS=( README.md )
-
-USE_PHP="php7-0 php7-1 php5-6 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-# Only build for 7.x
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME 
compliant messages"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-
-PHPUSEDEPEND="
-   php_targets_php7-0? ( dev-lang/php:7.0[unicode] )
-   php_targets_php7-1? ( dev-lang/php:7.1[unicode] )
-   php_targets_php7-2? ( dev-lang/php:7.2[unicode] )
-"
-DEPEND="${PHPUSEDEPEND}
-   dev-util/re2c"
-RDEPEND="${PHPUSEDEPEND} php_targets_php5-6? ( 
dev-php/pecl-mailparse:0[php_targets_php5-6] )"
-
-src_prepare() {
-   if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 ; then
-   # Missing test source files in archive.  Fixed upstream in next 
release.
-   rm tests/011.phpt tests/bug001.phpt || die
-   php-ext-source-r3_src_prepare
-   else
-   default
-   fi
-}
-
-src_install() {
-   if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 ; then
-   php-ext-pecl-r3_src_install
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/

2019-10-04 Thread Brian Evans
commit: 07d6fa53d29eb348ac1ef0f553e509e89c7eb2c2
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct  4 17:58:13 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct  4 17:58:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d6fa53

profiles: Remove stale USE mask on sasl for dev-libs/memcached

Packages were stabled since this was added

Closes: https://bugs.gentoo.org/691994
Signed-off-by: Brian Evans  gentoo.org>

 profiles/arch/arm/package.use.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/arch/arm/package.use.mask 
b/profiles/arch/arm/package.use.mask
index 3a3a5d0d711..80147c78b4e 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -516,10 +516,6 @@ dev-qt/qtwebkit -jit
 # unkeyworded deps for bug 379657 and bug 379651
 app-admin/packagekit-base entropy
 
-# Robin H. Johnson  (2011-09-03)
-# Remove this for your arch after you keyword dev-utils/google-perftools and 
virtual/gsasl (bug #381737)
-dev-libs/libmemcached sasl
-
 # Sebastian Pipping  (2011-02-22)
 # No media-sound/lilypond here, yet (bug #356069)
 app-text/asciidoc test



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, profiles/arch/amd64/, profiles/base/

2019-10-04 Thread Brian Evans
commit: 85b92953c328cdd2a4022eeb167d6a1b41193164
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct  4 17:32:26 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct  4 17:32:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b92953

profiles: Remove USE mask on argon2 for dev-lang/php

Signed-off-by: Brian Evans  gentoo.org>

 profiles/arch/amd64/package.use.stable.mask | 4 
 profiles/arch/x86/package.use.stable.mask   | 4 
 profiles/base/package.use.stable.mask   | 4 
 3 files changed, 12 deletions(-)

diff --git a/profiles/arch/amd64/package.use.stable.mask 
b/profiles/arch/amd64/package.use.stable.mask
index 585c53362df..20224b09502 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -38,10 +38,6 @@ dev-qt/qtsql oci8
 # Mask experimental contrib repo
 media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm 
contrib_xfeatures2d gflags glog tesseract
 
-# Brian Evans  (2018-12-06)
-# Unmask argon2 for php
-dev-lang/php -argon2
-
 # Mikle Kolyada  (2018-11-07)
 # unmask sssd for sudo
 app-admin/sudo -sssd

diff --git a/profiles/arch/x86/package.use.stable.mask 
b/profiles/arch/x86/package.use.stable.mask
index 8b490590352..54afccee49a 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -38,10 +38,6 @@ dev-qt/qtsql oci8
 # Mask experimental contrib repo
 media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm 
contrib_xfeatures2d gflags glog tesseract
 
-# Brian Evans  (2018-12-06)
-# Unmask argon2 for php
-dev-lang/php -argon2
-
 # Mikle Kolyada  (2018-11-07)
 # unmask sssd for sudo
 app-admin/sudo -sssd

diff --git a/profiles/base/package.use.stable.mask 
b/profiles/base/package.use.stable.mask
index 0a00fc800bb..00abaa0407a 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -66,10 +66,6 @@ media-plugins/grilo-plugins chromaprint
 kde-apps/kipi-plugins mediawiki vkontakte
 media-gfx/digikam dnn vkontakte
 
-# Brian Evans  (2018-12-06)
-# Mask USE flag since argon2 dependency is not stable on most arches
-dev-lang/php argon2
-
 # Mikle Kolyada  (2018-11-07)
 # sssd is only stable for amd64 and x86
 app-admin/sudo sssd



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-redis/

2019-10-04 Thread Brian Evans
commit: 732acb31261ba6b1d2766e4dc6ee6217afe60c51
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct  4 17:04:00 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct  4 17:04:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732acb31

dev-php/pecl-redis: Version bump for 5.0.2

Closes: https://bugs.gentoo.org/692148
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-redis/Manifest|  1 +
 dev-php/pecl-redis/metadata.xml|  1 +
 dev-php/pecl-redis/pecl-redis-5.0.2.ebuild | 52 ++
 3 files changed, 54 insertions(+)

diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 71d9df410e0..2e665f2e0af 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,3 +1,4 @@
 DIST redis-3.1.6.tgz 199920 BLAKE2B 
00aa81cdbedc03b4a672a58be98d8f01d2076038622b9d1e9673c0628c096152f12f9f5ff540af639da73b4458fcb1fce9c1c8b49a95db48970bab07806ac8d0
 SHA512 
4263d150c93f11dd06587925ad9a3cd8fbba2e4a18b2f23e6adfaeb25d566a1c2d256551a50ae1b9c770fd0f9bc4c92f483c46d60be9d4f5b5ba056231b7d527
 DIST redis-4.2.0.tgz 235569 BLAKE2B 
14089171b9654affeb8c2b3861a698a3ba8d6ac235238fed7e6799cf3f2f74b240facb408acbbc987cc2d5383f197564aa81d828bfe84f91fd1bbff8dbdf563c
 SHA512 
b6325e5e1f9209a3431cbc236dab4578f796aa748481f9a3fcda6d297bf544b0f77269bc56c6e9ff32430dbe74bd08f6d22e9b04b0ecfb735aa562f680f56f8b
 DIST redis-4.3.0.tgz 241883 BLAKE2B 
3f3ef7f67ba1167cb031e6816ee9f90d24eecc002064720e68a65bf8db16b0f826c90a5f3b7bed771f535aca8cbc9b62654fa2c234a42af8168baf0315a25c17
 SHA512 
30ce5863540485463704e6f90cff3a8d1f5bda34360c987e848ab290c8240f323b6eb2df1e90cc4c0922b3413652132d937488943f5db4e242c460c592da54ca
+DIST redis-5.0.2.tgz 243270 BLAKE2B 
5c01dc23d5c86f407bddd6a54455f37427a5cae3786e393afc34fae23771062cae9cbe1b55a3c0578b5ecc1ada97328f63fe10e8e91af8fcd0f4b275850f0b50
 SHA512 
ea5601a520a95443abf5b2f17516ffe047ce50df721519a82b68124b9a406d52628697b486e37cd1ea2798a5ddce82549a516835a9d348925adedbdf5ef2d2b0

diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml
index 2cc19020124..25557ad02e0 100644
--- a/dev-php/pecl-redis/metadata.xml
+++ b/dev-php/pecl-redis/metadata.xml
@@ -7,5 +7,6 @@


Enables igbinary serialisation 
support
+   Enables json serializer support

 

diff --git a/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild 
b/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild
new file mode 100644
index 000..61a6320308d
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="redis"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="json?,session?"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +json +session"
+
+DEPEND="
+   igbinary? ( 
dev-php/igbinary[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]
 )
+"
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   local PHP_EXT_ECONF_ARGS=(
+   --enable-redis
+   $(use_enable igbinary redis-igbinary)
+   $(use_enable json redis-json)
+   $(use_enable session redis-session)
+   )
+   php-ext-source-r3_src_configure
+}
+
+src_test(){
+   local slot
+   for slot in $(php_get_slots); do
+   php_init_slot_env "${slot}"
+   # Run tests for Redis class
+   ${PHPCLI} -d extension=modules/redis.so \
+ tests/TestRedis.php \
+ --class Redis \
+ --host ${PECL_REDIS_HOST} || die 'test suite 
failed'
+   done
+}



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-10-04 Thread Brian Evans
commit: c000558c4a65ea9a1604924932876045a0aed383
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct  4 16:11:07 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct  4 16:23:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c000558c

dev-lang/php: Remove old 7.4 RCs

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   2 -
 dev-lang/php/php-7.4.0_rc1.ebuild | 725 --
 dev-lang/php/php-7.4.0_rc2.ebuild | 725 --
 3 files changed, 1452 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index eabee33d873..9c50777fdf1 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,7 +7,5 @@ DIST php-7.2.23.tar.xz 12273340 BLAKE2B 
a3cad87bc23534953a71834347b4e2ff44512c2a
 DIST php-7.3.10.tar.xz 12086948 BLAKE2B 
0dec94952fde19619d2f27ec9e4076a41d51ba704a0d4ec818d33ecedab1b2fae445e5b6437e4a1a4f689db8b9e4b93ceaec55174f0b1c89670083f9b62522d3
 SHA512 
b6c5d439db015cf902cd1823a2cbd509221866a416fc02e0382322a15165fcd04d3fe5d6fa2a9efc37a69f2becf4453d5f1ccecf4b1f035b5be7a550f3f97fc9
 DIST php-7.3.8.tar.xz 12064620 BLAKE2B 
cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c94d0692e11bfe6722e50bd0b864d629a0ef6aed4ac5d9830ec4b4b214b9abdf917519a0c0cb70a4362fc8390
 SHA512 
9e9e13845350f3d4a8a80c3e2fe8291996e2749b2c862261b96346c01e5e24640cb81adad5e3b7668b56b2266c1fcbb713e8c38da4f9aa474f5f632f91378a8d
 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 
2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1
 SHA512 
017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490
-DIST php-7.4.0RC1.tar.xz 10212396 BLAKE2B 
5ec878ee88c1828f36e4f23d289813da14417a4f0f79ec743e7cb3171acaa37d0e6c5c217f2f1efceee87af23e134d2582e1a254e64d971e25e1d6f47273a348
 SHA512 
17e4641496a7503a4d7a1f658a2a0a4c2db8b3d459f32459c97a40370e71b687b8bd44cc397408788ef697e879d20e1de0c4a655c1da7bc1e82598267460f57a
-DIST php-7.4.0RC2.tar.xz 10217992 BLAKE2B 
d36329098f4e5e6a2bea732f14834c489149243f5adf04e0560151cea611be87399bde5a07111ed930de54e9a0ee75ce1c0f35e7e1de412f59a4272edd1952d5
 SHA512 
ea1c88ee6bf51ae44aa20bc23aa96db64a53d054003b1041a683388d94f4fbfe0da4b826b3a44295ee667c456eb709511fa1620e689c61a3c70a3524c34d
 DIST php-7.4.0RC3.tar.xz 10220844 BLAKE2B 
dc3912533dc52234c5733c89e9353391ddffebe0f08e0de4b9155707d49db43700bfffb91d27391f56fbb2663752742346d7b2947ea77c4175322003b53d1bb4
 SHA512 
433f5bdafe753948f9ea837205988ae3c779a03c23505795f4c7c71a6cc62354cf61a2f30aa3480a588b9b44faa184664322616025af74627784d5b64b1e8dfb
 DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 
4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401
 SHA512 
eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e

diff --git a/dev-lang/php/php-7.4.0_rc1.ebuild 
b/dev-lang/php/php-7.4.0_rc1.ebuild
deleted file mode 100644
index fafdcb64e83..000
--- a/dev-lang/php/php-7.4.0_rc1.ebuild
+++ /dev/null
@@ -1,725 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://php.net/;
-SRC_URI="https://downloads.php.net/~derick/${PN}-${MY_PV}.tar.xz;
-
-LICENSE="PHP-3.01
-   BSD
-   Zend-2.0
-   bcmath? ( LGPL-2.1+ )
-   fpm? ( BSD-2 )
-   gd? ( gd )
-   unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-   ${SAPIS/cli/+cli}
-   threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-   coverage +ctype curl debug
-   enchant exif ffi +fileinfo +filter firebird
-   +flatfile ftp gd gdbm gmp +iconv imap inifile
-   intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-   mhash mssql mysql mysqli nls
-   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-   readline selinux +session session-mm sharedmem
-   +simplexml snmp soap sockets sodium spell sqlite ssl
-   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-   +xml xmlreader xmlwriter xml

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-10-04 Thread Brian Evans
commit: 6df250126b847ab873cbe0e7fa8ce0de794d2697
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct  4 16:23:30 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct  4 16:23:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df25012

dev-lang/php: Convert apache dependency to work on all versions

The conditional dependency on www-servers/apache can be simplifed
so that it works on all versions and still be equal in existing installed VDB

Modify all current ebuilds to close the bug

Closes: https://bugs.gentoo.org/692090
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/php-5.6.40-r6.ebuild | 3 +--
 dev-lang/php/php-7.1.31.ebuild| 3 +--
 dev-lang/php/php-7.1.32.ebuild| 3 +--
 dev-lang/php/php-7.2.21.ebuild| 3 +--
 dev-lang/php/php-7.2.22.ebuild| 3 +--
 dev-lang/php/php-7.2.23.ebuild| 3 +--
 dev-lang/php/php-7.3.10.ebuild| 3 +--
 dev-lang/php/php-7.3.8.ebuild | 3 +--
 dev-lang/php/php-7.3.9.ebuild | 3 +--
 9 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/dev-lang/php/php-5.6.40-r6.ebuild 
b/dev-lang/php/php-5.6.40-r6.ebuild
index 9a3ebaa2a5f..8f5ff1a11f2 100644
--- a/dev-lang/php/php-5.6.40-r6.ebuild
+++ b/dev-lang/php/php-5.6.40-r6.ebuild
@@ -50,8 +50,7 @@ COMMON_DEPEND="
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
>=dev-libs/libpcre-8.32[unicode]
fpm? ( acl? ( sys-apps/acl ) )
-   apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-   =app-eselect/eselect-php-0.9.1[apache2?,fpm?]
>=dev-libs/libpcre-8.32[unicode]
fpm? ( acl? ( sys-apps/acl ) )
-   apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-   =app-eselect/eselect-php-0.9.1[apache2?,fpm?]
>=dev-libs/libpcre-8.32[unicode]
fpm? ( acl? ( sys-apps/acl ) )
-   apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-   =app-eselect/eselect-php-0.9.1[apache2?,fpm?]
>=dev-libs/libpcre2-10.30[unicode]
fpm? ( acl? ( sys-apps/acl ) )
-   apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-   =app-eselect/eselect-php-0.9.1[apache2?,fpm?]
>=dev-libs/libpcre2-10.30[unicode]
fpm? ( acl? ( sys-apps/acl ) )
-   apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-   

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-10-04 Thread Brian Evans
commit: ab8c4f8b521b3cc1ab30c31c7c2cb79cf3800e03
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct  4 14:57:07 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct  4 16:23:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8c4f8b

dev-lang/php: Version bump for 7.4.0_rc3

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-7.4.0_rc3.ebuild | 724 ++
 2 files changed, 725 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fd0cd3424ff..eabee33d873 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -9,4 +9,5 @@ DIST php-7.3.8.tar.xz 12064620 BLAKE2B 
cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c9
 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 
2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1
 SHA512 
017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490
 DIST php-7.4.0RC1.tar.xz 10212396 BLAKE2B 
5ec878ee88c1828f36e4f23d289813da14417a4f0f79ec743e7cb3171acaa37d0e6c5c217f2f1efceee87af23e134d2582e1a254e64d971e25e1d6f47273a348
 SHA512 
17e4641496a7503a4d7a1f658a2a0a4c2db8b3d459f32459c97a40370e71b687b8bd44cc397408788ef697e879d20e1de0c4a655c1da7bc1e82598267460f57a
 DIST php-7.4.0RC2.tar.xz 10217992 BLAKE2B 
d36329098f4e5e6a2bea732f14834c489149243f5adf04e0560151cea611be87399bde5a07111ed930de54e9a0ee75ce1c0f35e7e1de412f59a4272edd1952d5
 SHA512 
ea1c88ee6bf51ae44aa20bc23aa96db64a53d054003b1041a683388d94f4fbfe0da4b826b3a44295ee667c456eb709511fa1620e689c61a3c70a3524c34d
+DIST php-7.4.0RC3.tar.xz 10220844 BLAKE2B 
dc3912533dc52234c5733c89e9353391ddffebe0f08e0de4b9155707d49db43700bfffb91d27391f56fbb2663752742346d7b2947ea77c4175322003b53d1bb4
 SHA512 
433f5bdafe753948f9ea837205988ae3c779a03c23505795f4c7c71a6cc62354cf61a2f30aa3480a588b9b44faa184664322616025af74627784d5b64b1e8dfb
 DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 
4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401
 SHA512 
eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e

diff --git a/dev-lang/php/php-7.4.0_rc3.ebuild 
b/dev-lang/php/php-7.4.0_rc3.ebuild
new file mode 100644
index 000..10eb1ce2343
--- /dev/null
+++ b/dev-lang/php/php-7.4.0_rc3.ebuild
@@ -0,0 +1,724 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/;
+SRC_URI="https://downloads.php.net/~derick/${PN}-${MY_PV}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+   coverage +ctype curl debug
+   enchant exif ffi +fileinfo +filter firebird
+   +flatfile ftp gd gdbm gmp +iconv imap inifile
+   intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+   >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+   >=dev-libs/libpcre2-10.30[unicode]
+   fpm? ( acl? ( sys-apps/acl ) )
+   apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+   argon2? ( app-crypt/argon2:= )
+   berkdb? ( || (  sys-libs/db:5.3
+   sys-libs/db:5.1
+

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-apcu/

2019-10-01 Thread Brian Evans
commit: 5d54c1127dca5e68dbf71d512217e3b66825ae62
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct  1 18:15:05 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct  1 19:05:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d54c112

dev-php/pecl-apcu: Fix USE naming to not include an underscore

Closes: https://bugs.gentoo.org/695080
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-apcu/metadata.xml|  8 
 dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild |  8 
 dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild | 10 +-
 dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild |  8 
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dev-php/pecl-apcu/metadata.xml b/dev-php/pecl-apcu/metadata.xml
index 4d7374447c6..6344b62d774 100644
--- a/dev-php/pecl-apcu/metadata.xml
+++ b/dev-php/pecl-apcu/metadata.xml
@@ -6,9 +6,9 @@
PHP


-   Enable semaphore locks instead of 
fcntl
-   Enable pthread mutex 
locking
-   Enable pthread read/write 
locking
-   Enable spin locks 
(EXPERIMENTAL)
+   Enable semaphore locks instead of 
fcntl
+   Enable pthread mutex 
locking
+   Enable pthread read/write 
locking
+   Enable spin locks 
(EXPERIMENTAL)

 

diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
index f755261e918..c808e24e787 100644
--- a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
@@ -32,10 +32,10 @@ LOCKS="pthreadmutex pthreadrw spinlock semaphore"
 
 LUSE=""
 for l in ${LOCKS}; do
-   LUSE+="lock_${l} "
+   LUSE+="lock-${l} "
 done
 
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+IUSE+=" ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
 
 REQUIRED_USE="^^ ( $LUSE )"
 
@@ -52,8 +52,8 @@ src_configure() {
local PHP_EXT_ECONF_ARGS=(
--enable-apcu
$(use_enable mmap apcu-mmap)
-   $(use_enable lock_pthreadrw apcu-rwlocks)
-   $(use_enable lock_spinlock apcu-spinlocks)
+   $(use_enable lock-pthreadrw apcu-rwlocks)
+   $(use_enable lock-spinlock apcu-spinlocks)
)
 
php-ext-source-r3_src_configure

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
index 675490a1e85..da6a7f85c52 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,10 +31,10 @@ LOCKS="pthreadmutex pthreadrw spinlock semaphore"
 
 LUSE=""
 for l in ${LOCKS}; do
-   LUSE+="lock_${l} "
+   LUSE+="lock-${l} "
 done
 
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+IUSE+=" ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
 
 REQUIRED_USE="^^ ( $LUSE )"
 
@@ -51,8 +51,8 @@ src_configure() {
local PHP_EXT_ECONF_ARGS=(
--enable-apcu
$(use_enable mmap apcu-mmap)
-   $(use_enable lock_pthreadrw apcu-rwlocks)
-   $(use_enable lock_spinlock apcu-spinlocks)
+   $(use_enable lock-pthreadrw apcu-rwlocks)
+   $(use_enable lock-spinlock apcu-spinlocks)
)
 
php-ext-source-r3_src_configure

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
index 39a64219bf7..f204ffcad33 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
@@ -31,10 +31,10 @@ LOCKS="pthreadmutex pthreadrw spinlock semaphore"
 
 LUSE=""
 for l in ${LOCKS}; do
-   LUSE+="lock_${l} "
+   LUSE+="lock-${l} "
 done
 
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+IUSE+=" ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
 
 REQUIRED_USE="^^ ( $LUSE )"
 
@@ -51,8 +51,8 @@ src_configure() {
local PHP_EXT_ECONF_ARGS=(
--enable-apcu
$(use_enable mmap apcu-mmap)
-   $(use_enable lock_pthreadrw apcu-rwlocks)
-   $(use_enable lock_spinlock apcu-spinlocks)
+   $(use_enable lock-pthreadrw apcu-rwlocks)
+   $(use_enable lock-spinlock apcu-spinlocks)
)
 
php-ext-source-r3_src_configure



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-apcu/

2019-10-01 Thread Brian Evans
commit: 41d563f15c78b07562bdf0e329085b52b6b72d60
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct  1 19:03:16 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct  1 19:05:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d563f1

dev-php/pecl-apcu: Revbump for 5.1.17-r1

Add PHP 7.4, drop 5.6 and 7.0
Fix bogus test failures in 7.4
Fix bad autoconf usage from upstream

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild | 67 
 1 file changed, 67 insertions(+)

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild
new file mode 100644
index 000..19f8e009175
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+   LUSE+="lock-${l} "
+done
+
+IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+   php-ext-source-r3_src_prepare
+   # Remove broken tests from php 7.4 due to trivial output differences
+   if use php_targets_php7-4 ; then
+   php_init_slot_env "php7.4"
+   rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
+   fi
+}
+
+src_configure() {
+   local PHP_EXT_ECONF_ARGS=(
+   --enable-apcu
+   $(use_enable mmap apcu-mmap)
+   $(use_enable lock-spinlock apcu-spinlocks)
+   )
+   # Broken upstream autoconf test disables if present at all
+   use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
+
+   php-ext-source-r3_src_configure
+}
+
+src_install() {
+   php-ext-pecl-r3_src_install
+
+   insinto /usr/share/php7/apcu
+   doins apc.php
+}
+
+pkg_postinst() {
+   elog "The apc.php file shipped with this release of pecl-apcu was"
+   elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
+   elog
+   elog "If you depend on the apc_* functions,"
+   elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+   elog "provides backwards compatibility."
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-apcu/

2019-10-01 Thread Brian Evans
commit: ef903afe3698296b18d320f596b7f3d817a306e1
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct  1 19:04:26 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct  1 19:05:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef903afe

dev-php/pecl-apcu: Drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild | 80 ---
 1 file changed, 80 deletions(-)

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
deleted file mode 100644
index f204ffcad33..000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt )
-
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( 
dev-php/pecl-apcu:0[php_targets_php5-6] )"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-   LUSE+="lock-${l} "
-done
-
-IUSE+=" ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-   if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 || use php_targets_php7-3 ; then
-   php-ext-source-r3_src_prepare
-   else
-   eapply_user
-   fi
-}
-
-src_configure() {
-   if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 || use php_targets_php7-3 ; then
-   local PHP_EXT_ECONF_ARGS=(
-   --enable-apcu
-   $(use_enable mmap apcu-mmap)
-   $(use_enable lock-pthreadrw apcu-rwlocks)
-   $(use_enable lock-spinlock apcu-spinlocks)
-   )
-
-   php-ext-source-r3_src_configure
-   fi
-}
-
-src_install() {
-   if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 || use php_targets_php7-3 ; then
-   php-ext-pecl-r3_src_install
-
-   insinto /usr/share/php7/apcu
-   doins apc.php
-   fi
-}
-
-pkg_postinst() {
-   if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 || use php_targets_php7-3 ; then
-   elog "The apc.php file shipped with this release of pecl-apcu 
was"
-   elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
-   elog
-   elog "If you depend on the apc_* functions,"
-   elog "please install dev-php/pecl-apcu_bc as this extension no 
longer"
-   elog "provides backwards compatibility."
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/igbinary/

2019-10-01 Thread Brian Evans
commit: 129cebb8661d5d3e7a2b89125f5744f96c0fd3a1
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct  1 17:43:11 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Oct  1 19:05:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=129cebb8

dev-php/igbinary: Revbump to add php7-4

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/igbinary/igbinary-3.0.1-r1.ebuild | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/dev-php/igbinary/igbinary-3.0.1-r1.ebuild 
b/dev-php/igbinary/igbinary-3.0.1-r1.ebuild
new file mode 100644
index 000..34cd861a88b
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.0.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="${PN}"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS NEWS README.md )
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+#IUSE=""
+
+#DEPEND=""
+#RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: profiles/, profiles/base/

2019-09-30 Thread Brian Evans
commit: e3c19aa07c006f1f556c6eb452a3c2287b68542b
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Sep 30 22:45:06 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Sep 30 22:45:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c19aa0

profiles: Fix issues with PHP 5.6 mask

Forgot virtual/httpd-php
Wrong USE mask for nginx-unit

Signed-off-by: Brian Evans  gentoo.org>

 profiles/base/package.use.mask | 2 +-
 profiles/package.mask  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 1cb868f67d7..aa5d61f3eea 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -13,7 +13,7 @@
 =dev-libs/xapian-bindings-1.2.25 php
 media-gfx/exact-image php
 sci-geosciences/mapserver php
-www-servers/nginx-unit php56
+www-servers/nginx-unit php5-6
 
 # Michał Górny  (2019-09-28)
 # media-fonts/hkscs-ming is slated for removal.

diff --git a/profiles/package.mask b/profiles/package.mask
index 7c3b8de4338..b8550222923 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,7 @@
 # End of life.  Please upgrade.
 # Removal in 90 days. Bug 651784
 dev-lang/php:5.6
+virtual/httpd-php:5.6
 
 # Brian Evans  (2019-10-01)
 # Requires end of life PHP 5.6.  Please upgrade.



[gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-MDB2/

2019-09-30 Thread Brian Evans
commit: b114de3be76c52b7c75aab4ba8ea3d2a7fbb
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Sep 30 19:03:10 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Sep 30 20:38:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b114de3b

dev-php/PEAR-MDB2: Drop old revision

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild | 26 ---
 1 file changed, 26 deletions(-)

diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild 
b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild
deleted file mode 100644
index 2e31770318b..000
--- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PEAR_PV=${PV/_beta/b}
-
-inherit php-pear-r2
-
-DESCRIPTION="Database Abstraction Layer"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
-
-RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"
-
-PDEPEND="mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 )
-   mysql? ( >=dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4 )
-   mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 )
-   oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
-   oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
-   postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4 )"
-
-DOCS=( docs/CONTRIBUTORS docs/MAINTAINERS docs/README docs/STATUS docs/TODO )
-HTML_DOCS=( docs/datatypes.html)



[gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-MDB2/

2019-09-30 Thread Brian Evans
commit: 36fc30fda1d8d8c3ac725c18cc74bc39bf2d98c2
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Sep 30 19:01:12 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Sep 30 20:38:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36fc30fd

dev-php/PEAR-MDB2: Mark stable on all arches

No code changes.  Pure dependency change

Package-Manager: Portage-2.3.76, Repoman-2.3.17
RepoMan-Options: --force
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild 
b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
index 00167744408..eee3f41aff5 100644
--- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
 
 RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"



[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/

2019-09-30 Thread Brian Evans
commit: 77ab0e12c0485d63cea19d06145218f5a1d17436
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Sep 30 18:55:42 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Sep 30 20:38:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ab0e12

profiles: Mask PHP 5.6 and dependencies

PHP 5.6 is End of life and we've kept it around long enough

Bug: https://bugs.gentoo.org/651094
Signed-off-by: Brian Evans  gentoo.org>

 profiles/base/package.use.mask |  8 +++
 profiles/base/use.mask |  4 
 profiles/package.mask  | 48 ++
 3 files changed, 60 insertions(+)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b16275bd071..1cb868f67d7 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,14 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans  (2019-10-01)
+# PHP support is broken with current version
+# Mask USE until they are fixed
+=dev-libs/xapian-bindings-1.2.25 php
+media-gfx/exact-image php
+sci-geosciences/mapserver php
+www-servers/nginx-unit php56
+
 # Michał Górny  (2019-09-28)
 # media-fonts/hkscs-ming is slated for removal.
 app-i18n/xcin unicode

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index fe8254ba5b7..38d493d6edc 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans  (2019-10-01)
+# Mask PHP 5.6 target for EOL
+php_targets_php5-6
+
 # Matt Turner  (2019-03-03)
 # Mask for testing. Bug 606924
 libglvnd

diff --git a/profiles/package.mask b/profiles/package.mask
index f017445f2ad..98723cd4d13 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,54 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans  (2019-10-01)
+# End of life.  Please upgrade.
+# Removal in 90 days. Bug 651784
+dev-lang/php:5.6
+
+# Brian Evans  (2019-10-01)
+# Old slots for support of PHP <7
+# Removal in 90 days. Bug 651784
+dev-php/pecl-apcu:0
+dev-php/pecl-dbase:0
+dev-php/pecl-http:2
+dev-php/pecl-mailparse:0
+dev-php/pecl-memcached:0
+dev-php/pecl-oauth:0
+dev-php/pecl-propro:0
+dev-php/pecl-ps:0
+dev-php/pecl-raphf:0
+dev-php/pecl-rrd:0
+dev-php/pecl-ssh2:0
+dev-php/pecl-stomp:0
+dev-php/pecl-xdiff:0
+dev-php/pecl-yaml:0
+
+# Brian Evans  (2019-10-01)
+# Old extensions which only work with PHP <7
+# pecl-memcache is replaced by pecl-memcachd (with code changes)
+# pecl-mongo is replaced by pecl-monogodb
+# Removal in 90 days. Bug 651784
+dev-php/PEAR-MDB2_Driver_mysql
+dev-php/magickwand
+dev-php/pecl-bbcode
+dev-php/pecl-cairo
+dev-php/pecl-dbx
+dev-php/haru
+dev-php/pecl-htscanner
+dev-php/pecl-libevent
+dev-php/pecl-memcache
+dev-php/pecl-mongo
+dev-php/pecl-mysqlnd_ms
+dev-php/pecl-mysqlnd_qc
+dev-php/pecl-sphinx
+dev-php/pecl-spl_types
+dev-php/pecl-svn
+dev-php/pecl-xrange
+dev-php/suhosin
+dev-php/xcache
+dev-php/xhprof
+
 # Matt Turner  (2019-09-28)
 # Merged into Mesa. No reverse dependencies. Bug #654464
 # Removal in 30 days



[gentoo-commits] repo/gentoo:master commit in: profiles/

2019-09-30 Thread Brian Evans
commit: a8ae9b8adcb2ec40f72fea876e88219613f68e0f
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Sep 30 19:14:59 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Sep 30 20:38:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ae9b8a

profiles: Include rutorrent in PHP mask

Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 98723cd4d13..7c3b8de4338 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,6 +34,11 @@
 # Removal in 90 days. Bug 651784
 dev-lang/php:5.6
 
+# Brian Evans  (2019-10-01)
+# Requires end of life PHP 5.6.  Please upgrade.
+# Removal in 90 days. Bug 651784
+=www-apps/rutorrent-3.4-r1
+
 # Brian Evans  (2019-10-01)
 # Old slots for support of PHP <7
 # Removal in 90 days. Bug 651784



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-09-26 Thread Brian Evans
commit: 80b25d09340cdb28d7b43541efd7133e60aabff4
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 27 00:32:12 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 27 00:32:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b25d09

dev-lang/php: Version bump for 7.2.23

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-7.2.23.ebuild | 749 +
 2 files changed, 750 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3a864e0711e..fd0cd3424ff 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,6 +3,7 @@ DIST php-7.1.31.tar.xz 12370928 BLAKE2B 
18b7d5398380324243321a39d337bd10a7eb8281
 DIST php-7.1.32.tar.xz 12369916 BLAKE2B 
26f3756bfa15d8caa9f99f48526eabe66cb389d0ecf534700dcf9e2514de12c1b9d45c634b8e5ce07d1e28cce4c5b5a9cda7780013a7af070fd5e3d250a92616
 SHA512 
090dd6d79514f97be125e86d741094c149250a11a4f7d5f8dd08e028ae5f0b347afc58787b2002cc7b183d08a56562042e33ef7f1eeb060aafaf6fef67646ab1
 DIST php-7.2.21.tar.xz 12298448 BLAKE2B 
f82b35fd3cdf45d8c84639d044729602340c2d34695b5603a194e2d504627c0e041ab156c3720d218d8d6ca51c9ef71d8d0ee37585142aa30ed0cce51fbcb91e
 SHA512 
c7fe01626c1e25e8882d8f2b69d77a5479567d2daa3bf25d1ce3f45314a882f79ce9914a2aa1b3052b6289b46873f466e457049ce1db6e31b60ba4995187507c
 DIST php-7.2.22.tar.xz 12271632 BLAKE2B 
be3089066ba1c25c479eedaf3e6dd8f7773a6d87a16ce49d8c5379bc9b25d073b497004ccb219795bcfdc3af1310570f94f109754120c254ea5bbaaf1a5e953f
 SHA512 
526dbcc03726d6e2f146adbdf8d89f0c8acb2575a3c21e5ef14ae256f29447d82154e0b1869c0143d831f81c2da0d943957c51144fb458457d3681cdfbc6d49b
+DIST php-7.2.23.tar.xz 12273340 BLAKE2B 
a3cad87bc23534953a71834347b4e2ff44512c2a0a5ef3ee9fcf8df6dde5c5903396cb746303131078ff8129e98e6515cd55f80a8f70faa34bcd43e93495
 SHA512 
8ba928ae8b5f5b698400fc2a10170c06763b3c300889e9b79618c58d40db05997def9eff715b276495172b50aadb46f43719a0635545b476c04cd3abea363b0b
 DIST php-7.3.10.tar.xz 12086948 BLAKE2B 
0dec94952fde19619d2f27ec9e4076a41d51ba704a0d4ec818d33ecedab1b2fae445e5b6437e4a1a4f689db8b9e4b93ceaec55174f0b1c89670083f9b62522d3
 SHA512 
b6c5d439db015cf902cd1823a2cbd509221866a416fc02e0382322a15165fcd04d3fe5d6fa2a9efc37a69f2becf4453d5f1ccecf4b1f035b5be7a550f3f97fc9
 DIST php-7.3.8.tar.xz 12064620 BLAKE2B 
cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c94d0692e11bfe6722e50bd0b864d629a0ef6aed4ac5d9830ec4b4b214b9abdf917519a0c0cb70a4362fc8390
 SHA512 
9e9e13845350f3d4a8a80c3e2fe8291996e2749b2c862261b96346c01e5e24640cb81adad5e3b7668b56b2266c1fcbb713e8c38da4f9aa474f5f632f91378a8d
 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 
2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1
 SHA512 
017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490

diff --git a/dev-lang/php/php-7.2.23.ebuild b/dev-lang/php/php-7.2.23.ebuild
new file mode 100644
index 000..4156c8c952e
--- /dev/null
+++ b/dev-lang/php/php-7.2.23.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/;
+SRC_URI="https://php.net/distributions/${P}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+   coverage +ctype curl debug
+   enchant exif +fileinfo +filter firebird
+   +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+   intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline recode selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx 
webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones th

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2019-09-24 Thread Brian Evans
commit: 6190b086e1b02301f74cd3cb8cbd4b4364f72d57
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Sep 24 14:11:51 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Sep 24 14:11:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6190b086

dev-db/mariadb: Verson bump for 10.4.8

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest  |1 +
 dev-db/mariadb/mariadb-10.4.8.ebuild | 1009 ++
 2 files changed, 1010 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b623c8495ec..9a19448ee76 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,6 +6,7 @@ DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 
7e4ae229040b3136ad107979864bc391556
 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 
8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826
 SHA512 
6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e
 DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B 
d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940
 SHA512 
817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B 
b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f
 SHA512 
cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce
+DIST mariadb-10.4.8.tar.gz 78262897 BLAKE2B 
357dfd8db702d30c30173cb4ee0bbbda8e54a77a8f726cdc529cbaeebd390fe11fd05c108dde54b029b7e311ebbf9a610dc2c6e4015c9a198d816deaaec5831e
 SHA512 
1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42
 DIST mariadb-5.5.65.tar.gz 45957577 BLAKE2B 
9ed27349d008d2001ed4059370505064918ef3586f89157f5f28892bceabd3073b7070f4054c0a700f1504dde3a4077e274111d5b8cb3713bc5db0910b752628
 SHA512 
5dbaa2ba7a829a0d5ae6ab8394c31a58753cd93da2637cd83d1e055e78b0796d63214418ddc91a65cefdd791aad4f01b0743aa8c7c40ecbb404cb81fd0138443
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 
8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970
 SHA512 
fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 
1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43
 SHA512 
ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c

diff --git a/dev-db/mariadb/mariadb-10.4.8.ebuild 
b/dev-db/mariadb/mariadb-10.4.8.ebuild
new file mode 100644
index 000..4ab8c38d372
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.4.8.ebuild
@@ -0,0 +1,1009 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MY_EXTRAS_VER="20190731-2258Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+   java-pkg-opt-2 cmake-utils
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+   SRC_URI="${SRC_URI}
+   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+fi
+
+HOMEPAGE="https://mariadb.org/;
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
+   innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+   numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+   sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+   test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
te

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2019-09-23 Thread Brian Evans
commit: f8254b164c1648879cfbaed6ab8981eb1239ab79
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Sep 23 16:21:50 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Sep 23 16:21:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8254b16

dev-db/mariadb: Version bump for 10.2.27

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest   |   1 +
 dev-db/mariadb/mariadb-10.2.27.ebuild | 981 ++
 2 files changed, 982 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5904318cf19..b623c8495ec 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -2,6 +2,7 @@ DIST mariadb-10.1.38.tar.gz 63535685 BLAKE2B 
c179ea2f60287c2bc1c0d1c47ae989ac265
 DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 
91ebc6d24c80ad9651c42a2f4553ce3ec3b7beb17493f90ebbf02ab23f425b0f729766cf2c81202832dfbca0a5e285f94a4daf794fcf4d445730fbe4fcc88871
 SHA512 
4a18b06fda49c5c3627b4e7cd32fb460e73762273a0c3d09098e34c71e63caa8fad03cdd92ae4a391cdfdb3719934688f0bdf312fa4af7ac3b9e5f5d90f404be
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B 
e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b
 SHA512 
cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
 DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 
54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c
 SHA512 
1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124
+DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 
7e4ae229040b3136ad107979864bc391556c1ba83847addd89e09f3757cd01203503e07832abe496a7f560048ed704f273607da3a114afa59ceb13cbb3b89c14
 SHA512 
9ea7ea30f964d022d16c662c18ac40ea50ef5b6592d02ba739ad81f9dfa9e60be90ea6d4706b43b07402c4cbc8c0280633b6e21bda6daf5bbc1d3c540993e4d6
 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 
8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826
 SHA512 
6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e
 DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B 
d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940
 SHA512 
817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B 
b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f
 SHA512 
cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce

diff --git a/dev-db/mariadb/mariadb-10.2.27.ebuild 
b/dev-db/mariadb/mariadb-10.2.27.ebuild
new file mode 100644
index 000..4121860d2c5
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.2.27.ebuild
@@ -0,0 +1,981 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190305-2052Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+   java-pkg-opt-2 user cmake-utils
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+   SRC_URI="${SRC_URI}
+   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+fi
+
+HOMEPAGE="https://mariadb.org/;
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+   innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+   numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+   sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap 
tcmalloc
+   test tokudb xml yassl"
+
+# Tests always fail when

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2019-09-20 Thread Brian Evans
commit: e52f91465cd4543eee91a3c36c6a8a7819bc690c
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 20 19:03:13 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 20 19:03:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52f9146

dev-db/mariadb: Version bump for 10.3.18

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb/Manifest   |   1 +
 dev-db/mariadb/mariadb-10.3.18.ebuild | 981 ++
 2 files changed, 982 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c9bff5bfe3f..5904318cf19 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,6 +3,7 @@ DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 
91ebc6d24c80ad9651c42a2f4553ce3ec3b
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B 
e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b
 SHA512 
cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
 DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 
54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c
 SHA512 
1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124
 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 
8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826
 SHA512 
6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e
+DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B 
d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940
 SHA512 
817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B 
b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f
 SHA512 
cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce
 DIST mariadb-5.5.65.tar.gz 45957577 BLAKE2B 
9ed27349d008d2001ed4059370505064918ef3586f89157f5f28892bceabd3073b7070f4054c0a700f1504dde3a4077e274111d5b8cb3713bc5db0910b752628
 SHA512 
5dbaa2ba7a829a0d5ae6ab8394c31a58753cd93da2637cd83d1e055e78b0796d63214418ddc91a65cefdd791aad4f01b0743aa8c7c40ecbb404cb81fd0138443
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 
8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970
 SHA512 
fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec

diff --git a/dev-db/mariadb/mariadb-10.3.18.ebuild 
b/dev-db/mariadb/mariadb-10.3.18.ebuild
new file mode 100644
index 000..d960aec7eba
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.3.18.ebuild
@@ -0,0 +1,981 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190305-2052Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+   java-pkg-opt-2 user cmake-utils
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+   SRC_URI="${SRC_URI}
+   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+fi
+
+HOMEPAGE="https://mariadb.org/;
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+   innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+   numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+   sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+   test tokudb xml yassl"
+
+# Tests always fail when libress

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-event/

2019-09-20 Thread Brian Evans
commit: 4f33d2626d89dd19f488df15ac4f2644babdbc81
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 20 13:52:10 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 20 13:52:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f33d262

dev-php/pecl-event: Fix double LICENSE declaration

All ebuilds includes the correct license, then redeclared
to the wrong license.  Correct that to be just PHP-3.01

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-event/pecl-event-2.2.1.ebuild| 3 +--
 dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild | 3 +--
 dev-php/pecl-event/pecl-event-2.4.0.ebuild| 3 +--
 dev-php/pecl-event/pecl-event-2.4.1.ebuild| 3 +--
 dev-php/pecl-event/pecl-event-2.4.3.ebuild| 3 +--
 dev-php/pecl-event/pecl-event-2.5.2.ebuild| 1 -
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dev-php/pecl-event/pecl-event-2.2.1.ebuild 
b/dev-php/pecl-event/pecl-event-2.2.1.ebuild
index b097acd6f6b..dcf3ce4cc87 100644
--- a/dev-php/pecl-event/pecl-event-2.2.1.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,6 @@ KEYWORDS="amd64 ia64 x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
-LICENSE="PHP-3"
 SLOT="0"
 
 DEPEND="

diff --git a/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild 
b/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
index 3fbf4fc20ca..312c4d1b906 100644
--- a/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
-LICENSE="PHP-3"
 SLOT="0"
 
 DEPEND="

diff --git a/dev-php/pecl-event/pecl-event-2.4.0.ebuild 
b/dev-php/pecl-event/pecl-event-2.4.0.ebuild
index 3fbf4fc20ca..312c4d1b906 100644
--- a/dev-php/pecl-event/pecl-event-2.4.0.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
-LICENSE="PHP-3"
 SLOT="0"
 
 DEPEND="

diff --git a/dev-php/pecl-event/pecl-event-2.4.1.ebuild 
b/dev-php/pecl-event/pecl-event-2.4.1.ebuild
index 148533773b8..cd49d9bdc6a 100644
--- a/dev-php/pecl-event/pecl-event-2.4.1.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
-LICENSE="PHP-3"
 SLOT="0"
 
 DEPEND="

diff --git a/dev-php/pecl-event/pecl-event-2.4.3.ebuild 
b/dev-php/pecl-event/pecl-event-2.4.3.ebuild
index c990f965da3..cd49d9bdc6a 100644
--- a/dev-php/pecl-event/pecl-event-2.4.3.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
-LICENSE="PHP-3"
 SLOT="0"
 
 DEPEND="

diff --git a/dev-php/pecl-event/pecl-event-2.5.2.ebuild 
b/dev-php/pecl-event/pecl-event-2.5.2.ebuild
index adee9104380..c7f3bf68bb9 100644
--- a/dev-php/pecl-event/pecl-event-2.5.2.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.5.2.ebuild
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
-LICENSE="PHP-3"
 SLOT="0"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-20 Thread Brian Evans
commit: 807c50548fe64456d6b7373cb1091675faaa0501
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 20 13:01:49 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 20 13:01:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807c5054

eclass: php-ext-source-r3 - Add support for building with PHP 7.4+

Signed-off-by: Brian Evans  gentoo.org>

 eclass/php-ext-source-r3.eclass | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index 5ef879a2be2..385bdb9dae0 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -15,7 +15,8 @@ inherit autotools
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
 
 case ${EAPI:-0} in
-   6|7) ;;
+   6) inherit eapi7-ver ;;
+   7) ;;
*)
die "${ECLASS} is not compatible with EAPI=${EAPI}"
 esac
@@ -183,10 +184,18 @@ php-ext-source-r3_phpize() {
# WANT_AUTOMAKE (see bugs #329071 and #549268).
autotools_run_tool "${PHPIZE}"
 
-   # Force libtoolize to run and regenerate autotools files (bug
-   # #220519).
-   rm aclocal.m4 || die "failed to remove aclocal.m4"
-   eautoreconf
+   # PHP >=7.4 no longer works with eautoreconf
+   if ver_test $PHP_CURRENTSLOT -ge 7.4 ; then
+   rm -fr aclocal.m4 autom4te.cache config.cache \
+   configure main/php_config.h.in || die
+   eautoconf --force
+   eautoheader
+   else
+   # Force libtoolize to run and regenerate autotools 
files (bug
+   # #220519).
+   rm aclocal.m4 || die "failed to remove aclocal.m4"
+   eautoreconf
+   fi
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-09-19 Thread Brian Evans
commit: 2dc5ae9c4d9efcc91facc6203a4f49065e270189
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Sep 19 17:29:25 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Sep 19 17:29:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc5ae9c

dev-lang/php: Version bump for 7.4.0_rc2

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-7.4.0_rc2.ebuild | 725 ++
 2 files changed, 726 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4183ac5c84c..fe9a1f1bb8b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,4 +6,5 @@ DIST php-7.2.22.tar.xz 12271632 BLAKE2B 
be3089066ba1c25c479eedaf3e6dd8f7773a6d87
 DIST php-7.3.8.tar.xz 12064620 BLAKE2B 
cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c94d0692e11bfe6722e50bd0b864d629a0ef6aed4ac5d9830ec4b4b214b9abdf917519a0c0cb70a4362fc8390
 SHA512 
9e9e13845350f3d4a8a80c3e2fe8291996e2749b2c862261b96346c01e5e24640cb81adad5e3b7668b56b2266c1fcbb713e8c38da4f9aa474f5f632f91378a8d
 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 
2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1
 SHA512 
017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490
 DIST php-7.4.0RC1.tar.xz 10212396 BLAKE2B 
5ec878ee88c1828f36e4f23d289813da14417a4f0f79ec743e7cb3171acaa37d0e6c5c217f2f1efceee87af23e134d2582e1a254e64d971e25e1d6f47273a348
 SHA512 
17e4641496a7503a4d7a1f658a2a0a4c2db8b3d459f32459c97a40370e71b687b8bd44cc397408788ef697e879d20e1de0c4a655c1da7bc1e82598267460f57a
+DIST php-7.4.0RC2.tar.xz 10217992 BLAKE2B 
d36329098f4e5e6a2bea732f14834c489149243f5adf04e0560151cea611be87399bde5a07111ed930de54e9a0ee75ce1c0f35e7e1de412f59a4272edd1952d5
 SHA512 
ea1c88ee6bf51ae44aa20bc23aa96db64a53d054003b1041a683388d94f4fbfe0da4b826b3a44295ee667c456eb709511fa1620e689c61a3c70a3524c34d
 DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 
4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401
 SHA512 
eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e

diff --git a/dev-lang/php/php-7.4.0_rc2.ebuild 
b/dev-lang/php/php-7.4.0_rc2.ebuild
new file mode 100644
index 000..fafdcb64e83
--- /dev/null
+++ b/dev-lang/php/php-7.4.0_rc2.ebuild
@@ -0,0 +1,725 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/;
+SRC_URI="https://downloads.php.net/~derick/${PN}-${MY_PV}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+   coverage +ctype curl debug
+   enchant exif ffi +fileinfo +filter firebird
+   +flatfile ftp gd gdbm gmp +iconv imap inifile
+   intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+   >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+   >=dev-libs/libpcre2-10.30[unicode]
+   fpm? ( acl? ( sys-apps/acl ) )
+   apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+   =net-misc/curl-7.10.5 )
+   enchant? ( =virtual/libffi-3.0.11 )
+   firebird? ( dev-db/firebird )
+   gd? ( virtual/jpeg:0 media-libs/libpng:0= )
+   gdbm? ( >=sys-libs/

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-yaz/

2019-09-18 Thread Brian Evans
commit: 00d3d0f687e3d40c5794409157795534739c1aa9
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Sep 18 20:28:16 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Sep 18 20:28:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d3d0f6

dev-php/pecl-yaz: Drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-yaz/Manifest  |  1 -
 dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild | 25 -
 2 files changed, 26 deletions(-)

diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 4ab5fd83f95..965b1c9bf6e 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,3 +1,2 @@
-DIST yaz-1.2.1.tgz 20147 BLAKE2B 
fa6c4b8d8d55ff734093950d1ddd2f24375aacce9d34e52680925874dafed5b0be769cb5768f02d89af573c7a1d5f1aa8290bff2cbd1c8a23a5de011bebd930a
 SHA512 
92525e485e5499f8b4ef8b1e9b21a3fa7004206f545a3a5b300ee11e3c5ff10d335645d5c42fe3b7523a55fe58ffb0a671c67dfc627bc4bd36aeab63dfe42bf1
 DIST yaz-1.2.2.tgz 20131 BLAKE2B 
7aa0729ba6033870099ed7c0d4961eac02d74d5aed6c7a58c0ccf59f57401cd7b438594c388ffc7c7b9d73cfc9f1c466c718ad685cc638651a9ac4e605b38ed5
 SHA512 
cb90d4ac9fcdadcb9215f7b795657dd3fdff69f2b2d399beb2afa6327a0be733d2a563863e2ca861182eadcc2faccfbe64e72d108662afc68d393a6bc5cc4bb2
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 
3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60
 SHA512 
5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a

diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild 
b/dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild
deleted file mode 100644
index bc9e0744851..000
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="yaz"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( README )
-
-USE_PHP="php7-0 php5-6"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-
-DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ 
toolkit"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/yaz-3.0.2:0="
-RDEPEND="${DEPEND}"
-
-PHP_EXT_ECONF_ARGS="--with-yaz=/usr"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-09-17 Thread Brian Evans
commit: d021621e343e8f247c92e48c00dc3f604299928d
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Sep 17 17:40:33 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Sep 17 17:40:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d021621e

dev-lang/php: Emulate PHP ./buildconf in PHP 7.4

Upstream has changed how macros are defined by the autoconf system
This breaks eautoreconf with latest libtool.
Previously we attempted to copy in new libtool, but this breaks external
extensions.  Instead, do what upstream expects using our own tools
to ensure cross-compliation support.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/php-7.4.0_rc1.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-lang/php/php-7.4.0_rc1.ebuild 
b/dev-lang/php/php-7.4.0_rc1.ebuild
index 4c04d93e4d4..fafdcb64e83 100644
--- a/dev-lang/php/php-7.4.0_rc1.ebuild
+++ b/dev-lang/php/php-7.4.0_rc1.ebuild
@@ -218,9 +218,11 @@ src_prepare() {
sapi/fpm/php-fpm.conf.in \
|| die 'failed to move the include directory in php-fpm.conf'
 
-   # Bug 669566 - necessary so that build tools are updated for commands 
like pecl
-   cp "${BROOT}/usr/share/aclocal/libtool.m4" build/ || die
-   eautoreconf
+   # Emulate buildconf to support cross-compilation
+   rm -fr aclocal.m4 autom4te.cache config.cache \
+   configure main/php_config.h.in || die
+   eautoconf --force
+   eautoheader
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-09-17 Thread Brian Evans
commit: 7155584d406f1da153cbd7285f380b75be14d539
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Sep 17 17:45:35 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Sep 17 17:45:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7155584d

dev-lang/php: Drop old 7.4 betas

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest   |   2 -
 dev-lang/php/php-7.4.0_beta1.ebuild | 723 
 dev-lang/php/php-7.4.0_beta4.ebuild | 723 
 3 files changed, 1448 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d69f9c0e344..4183ac5c84c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,6 +6,4 @@ DIST php-7.2.22.tar.xz 12271632 BLAKE2B 
be3089066ba1c25c479eedaf3e6dd8f7773a6d87
 DIST php-7.3.8.tar.xz 12064620 BLAKE2B 
cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c94d0692e11bfe6722e50bd0b864d629a0ef6aed4ac5d9830ec4b4b214b9abdf917519a0c0cb70a4362fc8390
 SHA512 
9e9e13845350f3d4a8a80c3e2fe8291996e2749b2c862261b96346c01e5e24640cb81adad5e3b7668b56b2266c1fcbb713e8c38da4f9aa474f5f632f91378a8d
 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 
2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1
 SHA512 
017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490
 DIST php-7.4.0RC1.tar.xz 10212396 BLAKE2B 
5ec878ee88c1828f36e4f23d289813da14417a4f0f79ec743e7cb3171acaa37d0e6c5c217f2f1efceee87af23e134d2582e1a254e64d971e25e1d6f47273a348
 SHA512 
17e4641496a7503a4d7a1f658a2a0a4c2db8b3d459f32459c97a40370e71b687b8bd44cc397408788ef697e879d20e1de0c4a655c1da7bc1e82598267460f57a
-DIST php-7.4.0beta1.tar.xz 10200060 BLAKE2B 
f49c49fcebe0309bbe266dec5c468037499fc96908a4130454403e57caa3ef7da3c46dbc83829bb290c46edfc14921f71fafddb8b0777c23adec35fbb57ad68c
 SHA512 
3e4307201c91cec238c9bc6c27a629a93de8baba0307f2e61cb4bb242720178382dd50b38e7a18fbd65baf25068b358faf571dcb895e7cd6fb292038dee3ed6b
-DIST php-7.4.0beta4.tar.xz 10207868 BLAKE2B 
b7fe60ec6b98c00e58b88e59aeddee7750df4480e505eab78f6ad4268bbcdba53fea36a4a0fb4e2b4e140247adc68946dcdcbc13ae339fe85570b91145025201
 SHA512 
c87c519453a8ba7f06b921b214b3315938b77c7d6f4f88f173f9c1e48a578937e4aa9bdb4d5a23c922b5cedaafc4d6bc29067dc55103fdecaa3a8ab4b381f203
 DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 
4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401
 SHA512 
eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e

diff --git a/dev-lang/php/php-7.4.0_beta1.ebuild 
b/dev-lang/php/php-7.4.0_beta1.ebuild
deleted file mode 100644
index 4e86c019721..000
--- a/dev-lang/php/php-7.4.0_beta1.ebuild
+++ /dev/null
@@ -1,723 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_/}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://php.net/;
-SRC_URI="https://downloads.php.net/~derick/${P/_/}.tar.xz;
-
-LICENSE="PHP-3.01
-   BSD
-   Zend-2.0
-   bcmath? ( LGPL-2.1+ )
-   fpm? ( BSD-2 )
-   gd? ( gd )
-   unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-   ${SAPIS/cli/+cli}
-   threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-   coverage +ctype curl debug
-   enchant exif ffi +fileinfo +filter firebird
-   +flatfile ftp gd gdbm gmp +iconv imap inifile
-   intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-   mhash mssql mysql mysqli nls
-   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-   readline selinux +session session-mm sharedmem
-   +simplexml snmp soap sockets sodium spell sqlite ssl
-   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-   >=app-eselect/eselect-php-0.9.1

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-09-04 Thread Brian Evans
commit: e506599f5f8c711f7596ef6e576e59595a6116c7
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Sep  4 14:02:23 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Sep  4 14:02:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e506599f

dev-lang/php: Add explicit RESTRICT on 7.2.22

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/php-7.2.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-7.2.22.ebuild b/dev-lang/php/php-7.2.22.ebuild
index 3163c80e3d4..4156c8c952e 100644
--- a/dev-lang/php/php-7.2.22.ebuild
+++ b/dev-lang/php/php-7.2.22.ebuild
@@ -156,7 +156,7 @@ PATCHES=(
"${FILESDIR}/php-freetype-2.9.1.patch"
"${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
 )
-
+RESTRICT="!test? ( test )"
 PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2019-09-04 Thread Brian Evans
commit: c5c1e2606b3d318cb9f969ce36ae94fa86ad836c
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Sep  4 13:38:42 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Sep  4 13:38:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c1e260

dev-lang/php: Version bump for 7.2.22

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-7.2.22.ebuild | 749 +
 2 files changed, 750 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2af4d8b8e8d..f5caf1eb9cf 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,7 @@
 DIST php-5.6.40.tar.xz 12472236 BLAKE2B 
f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc
 SHA512 
997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
 DIST php-7.1.31.tar.xz 12370928 BLAKE2B 
18b7d5398380324243321a39d337bd10a7eb82812f3dbb9b2ea9eb4808ef585d6452cc5953b56d24bcf817994e249b8b20cd9b4658e1df6c77de78eecb48a3a7
 SHA512 
989cd157e0d67c6f03192ce9e1afaa01ff72ccc83f3e6b94ac8dc3d4c2717258a46bd64fb20e4649baec1fe2545805013eedc1de78e556d09c2b0ae64d4272d8
 DIST php-7.2.21.tar.xz 12298448 BLAKE2B 
f82b35fd3cdf45d8c84639d044729602340c2d34695b5603a194e2d504627c0e041ab156c3720d218d8d6ca51c9ef71d8d0ee37585142aa30ed0cce51fbcb91e
 SHA512 
c7fe01626c1e25e8882d8f2b69d77a5479567d2daa3bf25d1ce3f45314a882f79ce9914a2aa1b3052b6289b46873f466e457049ce1db6e31b60ba4995187507c
+DIST php-7.2.22.tar.xz 12271632 BLAKE2B 
be3089066ba1c25c479eedaf3e6dd8f7773a6d87a16ce49d8c5379bc9b25d073b497004ccb219795bcfdc3af1310570f94f109754120c254ea5bbaaf1a5e953f
 SHA512 
526dbcc03726d6e2f146adbdf8d89f0c8acb2575a3c21e5ef14ae256f29447d82154e0b1869c0143d831f81c2da0d943957c51144fb458457d3681cdfbc6d49b
 DIST php-7.3.8.tar.xz 12064620 BLAKE2B 
cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c94d0692e11bfe6722e50bd0b864d629a0ef6aed4ac5d9830ec4b4b214b9abdf917519a0c0cb70a4362fc8390
 SHA512 
9e9e13845350f3d4a8a80c3e2fe8291996e2749b2c862261b96346c01e5e24640cb81adad5e3b7668b56b2266c1fcbb713e8c38da4f9aa474f5f632f91378a8d
 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 
2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1
 SHA512 
017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490
 DIST php-7.4.0beta1.tar.xz 10200060 BLAKE2B 
f49c49fcebe0309bbe266dec5c468037499fc96908a4130454403e57caa3ef7da3c46dbc83829bb290c46edfc14921f71fafddb8b0777c23adec35fbb57ad68c
 SHA512 
3e4307201c91cec238c9bc6c27a629a93de8baba0307f2e61cb4bb242720178382dd50b38e7a18fbd65baf25068b358faf571dcb895e7cd6fb292038dee3ed6b

diff --git a/dev-lang/php/php-7.2.22.ebuild b/dev-lang/php/php-7.2.22.ebuild
new file mode 100644
index 000..3163c80e3d4
--- /dev/null
+++ b/dev-lang/php/php-7.2.22.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/;
+SRC_URI="https://php.net/distributions/${P}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+   coverage +ctype curl debug
+   enchant exif +fileinfo +filter firebird
+   +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+   intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline recode selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx 
webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+  

[gentoo-commits] data/gentoo-news:master commit in: 2019-08-30-php-5_6-deprecation/

2019-08-30 Thread Brian Evans
commit: 2c5c3a82795da5d340bd4ccd3e2c9b14ab25b82d
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 30 20:42:38 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 30 20:42:38 2019 +
URL:https://gitweb.gentoo.org/data/gentoo-news.git/commit/?id=2c5c3a82

PHP 5.6 - recommended package misspelled

Signed-off-by: Brian Evans  gentoo.org>

 2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt 
b/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt
index 84562be..5e7218b 100644
--- a/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt
+++ b/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt
@@ -1,7 +1,7 @@
 Title: Deprecation and removal of PHP 5.6
 Author: Brian Evans 
 Posted: 2019-08-30
-Revision: 1
+Revision: 2
 News-Item-Format: 2.0
 Display-If-Installed: dev-lang/php:5.6
 Display-If-Installed: dev-php/haru
@@ -62,7 +62,7 @@ slots which are included as reminders to upgrade.
 Some packages do have replacements:
 dev-php/pecl-memcache can be replaced by dev-php/pecl-memcached with
   some small code modifications
-dev-php/pecl-mongo has been superceded by dev-php/mongodb
+dev-php/pecl-mongo has been superceded by dev-php/pecl-mongodb
 dev-php/pecl-libevent should be replaced by dev-php/pecl-event
   with code changes
 dev-php/PEAR-MDB2_Driver_mysql should be easily replaced by



[gentoo-commits] data/gentoo-news:master commit in: 2019-08-30-php-5_6-deprecation/

2019-08-30 Thread Brian Evans
commit: fb27e94bd393e3f670ec9018528920539829fa56
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 30 20:02:27 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 30 20:02:27 2019 +
URL:https://gitweb.gentoo.org/data/gentoo-news.git/commit/?id=fb27e94b

Deprecation announcement of PHP 5.6 branch

This is a potential major change for older software so a news item will
promptly alert our users.  Other major distros have dropped it in their
LTS and this is the next step for us as well.

Signed-off-by: Brian Evans  gentoo.org>

 .../2019-08-30-php-5_6-deprecation.en.txt  | 69 ++
 1 file changed, 69 insertions(+)

diff --git 
a/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt 
b/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt
new file mode 100644
index 000..84562be
--- /dev/null
+++ b/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt
@@ -0,0 +1,69 @@
+Title: Deprecation and removal of PHP 5.6
+Author: Brian Evans 
+Posted: 2019-08-30
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: dev-lang/php:5.6
+Display-If-Installed: dev-php/haru
+Display-If-Installed: dev-php/magickwand
+Display-If-Installed: dev-php/pecl-bbcode
+Display-If-Installed: dev-php/pecl-cairo
+Display-If-Installed: dev-php/pecl-dbx
+Display-If-Installed: dev-php/pecl-htscanner
+Display-If-Installed: dev-php/pecl-libevent
+Display-If-Installed: dev-php/pecl-memcache
+Display-If-Installed: dev-php/pecl-mongo
+Display-If-Installed: dev-php/pecl-mysqlnd_ms
+Display-If-Installed: dev-php/pecl-mysqlnd_qc
+Display-If-Installed: dev-php/pecl-sphinx
+Display-If-Installed: dev-php/pecl-spl_types
+Display-If-Installed: dev-php/pecl-svn
+Display-If-Installed: dev-php/pecl-xrange
+Display-If-Installed: dev-php/suhosin
+Display-If-Installed: dev-php/xcache
+Display-If-Installed: dev-php/xhprof
+Display-If-Installed: dev-php/pecl-apcu:0
+Display-If-Installed: dev-php/pecl-dbase:0
+Display-If-Installed: dev-php/pecl-http:2
+Display-If-Installed: dev-php/pecl-mailparse:0
+Display-If-Installed: dev-php/pecl-memcached:0
+Display-If-Installed: dev-php/pecl-oauth:0
+Display-If-Installed: dev-php/pecl-propro:0
+Display-If-Installed: dev-php/pecl-ps:0
+Display-If-Installed: dev-php/pecl-raphf:0
+Display-If-Installed: dev-php/pecl-rrd:0
+Display-If-Installed: dev-php/pecl-ssh2:0
+Display-If-Installed: dev-php/pecl-stomp:0
+Display-If-Installed: dev-php/pecl-xdiff:0
+Display-If-Installed: dev-php/pecl-yaml:0
+Display-If-Installed: dev-php/twig[extension]
+Display-If-Installed: dev-php/PEAR-MDB2_Driver_mysql
+Display-If-Installed: media-gfx/exact-image[php]
+Display-If-Installed: sci-geosciences/mapserver[php,php_targets_php5-6]
+Display-If-Installed: www-apps/rutorrent:3.4-r1
+Display-If-Installed: www-server/nginx-unit[php56]
+
+The Gentoo PHP Team is announcing the deprecation and future removal of
+PHP 5.6. As of October 1, 2019, PHP 5.6 will be masked for removal.
+Since some may consider this a critical package, we have decided on a
+longer than normal 90 day removal period.
+
+Other distributions have already or will have moved to PHP 7.2 by the end of
+the year.  Currently, we are using a backport repository to keep
+security updates in line with the main releases.  However, we feel this
+is the right time to remove this branch as maintenance burden will
+likely only increase.
+
+To that end, the long list of PHP 5 only extensions must accompany its
+removal. Many of which are long ignored by their upstream maintainers
+and have no replacements.  Some packages listed here have PHP 5 only
+slots which are included as reminders to upgrade.
+
+Some packages do have replacements:
+dev-php/pecl-memcache can be replaced by dev-php/pecl-memcached with
+  some small code modifications
+dev-php/pecl-mongo has been superceded by dev-php/mongodb
+dev-php/pecl-libevent should be replaced by dev-php/pecl-event
+  with code changes
+dev-php/PEAR-MDB2_Driver_mysql should be easily replaced by
+  dev-php/PEAR-MDB2_Driver_mysqli with minor configuration changes



[gentoo-commits] repo/gentoo:master commit in: profiles/

2019-08-30 Thread Brian Evans
commit: 4d5115aa8ac8a0586cfac0b804217c35c63d7827
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 30 16:07:59 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 30 16:07:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5115aa

package.mask: Remove old dev-db/mysql-5.5* mask

Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 99e106458cb..9951eb1776c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -359,13 +359,6 @@ dev-games/vamos
 # Bug #655886, #690704
 dev-python/pgmagick
 
-# Brian Evans  (2019-07-31)
-# MySQL 5.5 will no longer receive updates from Oracle
-# It may or may not have unaccounced security vulnerabilities
-# Please upgrade to 5.6 or use dev-db/mariadb
-# Removal in 30 days
-=dev-db/mysql-5.5*
-
 # Miroslav Šulc  (2019-07-30)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.22



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/files/, dev-db/mysql/

2019-08-30 Thread Brian Evans
commit: 84cae3b3ad487ca364ea2ce1f7c2139abbe03ed8
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 30 16:06:43 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 30 16:06:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cae3b3

dev-db/mysql: Drop old 5.5 version

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mysql/Manifest|   2 -
 dev-db/mysql/files/my.cnf-5.5| 147 
 dev-db/mysql/metadata.xml|   1 -
 dev-db/mysql/mysql-5.5.62.ebuild | 797 ---
 4 files changed, 947 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 17e28b6146c..ef3ead138dc 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,7 @@
-DIST mysql-5.5.62.tar.gz 2902 BLAKE2B 
f1cbb1c6b4dfac11c2c517a57a5c6216ce43766cc247b3c9b387326a7f6446cbc21ddb42bd95afa658c3b0ed2568a29563ceea248c6ec63364ce210119d39cc2
 SHA512 
1080a3989c20bbbfe98739f99dacd183f2087ceee5147845852144240386808568af4c908ecdbccdcb6114000ab760ed7257492834d50018eff9520260fd91ce
 DIST mysql-5.6.44.tar.gz 32531507 BLAKE2B 
28fbf49f699eb9f43223ffa186671b119d16016274cc7192db232b85c58123a61154e37193b9b7145c6a650b80b5f6cf838529bc2bc5ea9c78c0dbc39de834d3
 SHA512 
65ace1c803773ca6c8759d171c09bc93c7d61b8e3208ac9905f82e99087622c9dcca602d2da217741dc62fc6eabe9108ebc7f31facd26705072eae65fcc37077
 DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B 
3c629aed1de808acdea6654c7413e6851507c9c5be939ca4b4f5e2796da317e9b518a749bfc03d2b0ef05bd604b39f72e24b751076b9f206b462d21fa5db4f50
 SHA512 
f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168
 DIST mysql-boost-5.7.26.tar.gz 51098338 BLAKE2B 
1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26
 SHA512 
a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd
 DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 
6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497
 SHA512 
573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52
 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B 
f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a
 SHA512 
a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
-DIST mysql-extras-20180804-2323Z.tar.bz2 322215 BLAKE2B 
cca9e502e375bf43473335868517f6c450fc7bcf03e55de5a294c8bdcfcac2bb783dec09bbb3b6c30a561ba7e3a943543c017e2d42b61d466e699acdef4c0231
 SHA512 
efd9d416f394cc61b977ab76f05ab3acc5803ff8bdee8e1dbc65cc5b3f07e4f9742140d9586c028908b10fcc44f21c98ebffdebcc5c3578acbe05b07526bcb3d
 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B 
dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830
 SHA512 
c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B 
bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb
 SHA512 
be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8

diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
deleted file mode 100644
index 83b9aaab2ec..000
--- a/dev-db/mysql/files/my.cnf-5.5
+++ /dev/null
@@ -1,147 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration 
file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password  = your_password
-port   = 3306
-socket = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character

[gentoo-commits] repo/gentoo:master commit in: profiles/

2019-08-26 Thread Brian Evans
commit: 08b83d736f77fd5dffa9cd5f6b1b44771726ce94
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 26 14:19:05 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 26 14:19:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08b83d73

profiles: Mask virtual/libmysqlclient for removal

Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index eb32493e95b..ebd8c21dce5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans  (2019-08-26)
+# Deprecated virtual as it cannot solve the issue of ABI incompatibility
+# and rebuild consumers when provider changes
+# No revdeps. Removal in 30 days.
+virtual/libmysqlclient
+
 # Michał Górny  (2019-08-25)
 # Discontinued upstream in 2015, and not touched in Gentoo since.
 # Has series of build failures reported due to growing incompatibility



[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/, dev-db/myodbc/files/

2019-08-26 Thread Brian Evans
commit: be2fa3947868e58ab535bb61631ba8562b205a59
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 26 14:11:47 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 26 14:11:47 2019 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=be2fa394

Drop dev-db/myodbc from the repo

Signed-off-by: Brian Evans  gentoo.org>

 dev-db/myodbc/ChangeLog| 181 -
 dev-db/myodbc/Manifest |  24 ---
 .../myodbc/files/5.2.7-mariadb-dynamic-array.patch |  79 -
 dev-db/myodbc/files/5.2.7-my_malloc.patch  |  18 --
 dev-db/myodbc/files/5.3-cmake-doc-path.patch   |  43 -
 dev-db/myodbc/files/5.3-cxxlinkage.patch   |  43 -
 .../myodbc/files/5.3-mariadb-buffer_length.patch   |  93 ---
 .../myodbc/files/5.3-mariadb-dynamic-array.patch   |  96 ---
 dev-db/myodbc/files/5.3.10-cxxlinkage.patch|  29 
 dev-db/myodbc/files/5.3.4-cxxlinkage.patch |  40 -
 dev-db/myodbc/files/cmake-doc-path.patch   |  43 -
 dev-db/myodbc/files/odbc.ini.m4|  17 --
 dev-db/myodbc/files/odbcinst.ini.m4|   5 -
 dev-db/myodbc/metadata.xml |   8 -
 dev-db/myodbc/myodbc-5.3.10.ebuild | 146 -
 dev-db/myodbc/myodbc-5.3.4.ebuild  | 122 --
 16 files changed, 987 deletions(-)

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
deleted file mode 100644
index f9d3054..000
--- a/dev-db/myodbc/ChangeLog
+++ /dev/null
@@ -1,181 +0,0 @@
-# ChangeLog for dev-db/myodbc
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  18 Nov 2015; Brian Evans  myodbc-5.3.4.ebuild:
-  dev-db/myodbc: Clean up build process using multilib-minimal; adding die to
-  external commands
-
-  11 Aug 2015; Brian Evans  +files/5.2.7-my_malloc.patch,
-  myodbc-5.2.7-r2.ebuild:
-  dev-db/myodbc Add patch from bug 548912
-
-  17 May 2015; Brian Evans  -files/5.2.7-cxxlinkage.patch,
-  -files/myodbc-5.1.6-qt4-includedir.patch, -myodbc-5.1.6.ebuild,
-  -myodbc-5.2.7.ebuild:
-  Drop old; 5.1 series no longer builds with current libmysqlclient from 
servers
-
-  19 Apr 2015; Pacho Ramos  myodbc-5.2.7-r1.ebuild:
-  x86 stable wrt bug #525298
-
-  02 Mar 2015; Agostino Sarubbo  myodbc-5.2.7-r1.ebuild:
-  Stable for ppc, wrt bug #525298
-
-  12 Feb 2015; Pacho Ramos  myodbc-5.2.7-r1.ebuild:
-  amd64 stable, bug #525298
-
-  15 Nov 2014; Chema Alonso  myodbc-5.2.7.ebuild:
-  Stable for amd64 wrt bug #513646
-
-*myodbc-5.2.7-r1 (01 Sep 2014)
-
-  01 Sep 2014; Brian Evans 
-  +files/5.2.7-r1-cxxlinkage.patch, +myodbc-5.2.7-r1.ebuild:
-  Revision bump to enable multilib
-
-  20 Aug 2014; Brian Evans  +files/5.2.7-cxxlinkage.patch,
-  +files/5.2.7-mariadb-dynamic-array.patch, myodbc-5.2.7.ebuild:
-  Fix build failures on >=dev-db/mariadb-10.0
-
-*myodbc-5.2.7 (29 Jul 2014)
-
-  29 Jul 2014; Brian Evans  +myodbc-5.2.7.ebuild,
-  -myodbc-5.2.6.ebuild:
-  Version bump, fix slotting of installer utility, and bump required mysql
-  version. Remove old
-
-*myodbc-5.2.6 (04 May 2014)
-
-  04 May 2014; Brian Evans  +files/cmake-doc-path.patch,
-  +myodbc-5.2.6.ebuild:
-  Version bump to 5.2.6. Fixes bugs #380141, #442322, #462432, #474088
-
-  10 May 2013; Patrick Lauer  myodbc-5.1.6.ebuild:
-  Fix src_prepare
-
-  02 Mar 2013; Markos Chandras  myodbc-5.1.6.ebuild:
-  Move Qt dependencies to the new category
-
-  31 Jul 2012; Michael Palimaka  myodbc-5.1.6.ebuild:
-  Add missing slot dependencies on Qt.
-
-  10 Jul 2010; Robin H. Johnson  -myodbc-3.51.06.ebuild,
-  -myodbc-3.51.11.ebuild, -myodbc-3.51.12.ebuild,
-  -myodbc-3.51.26_p1127.ebuild, -myodbc-3.51.26_p1127-r1.ebuild,
-  -myodbc-3.51.27_p695.ebuild, -myodbc-5.1.5_p1144.ebuild:
-  Old versions don't work on newer unixODBC, so clean them up. Latest is
-  stable anyway.
-
-  26 Jun 2010;  myodbc-5.1.6.ebuild:
-  ppc stable #322277
-
-  24 Jun 2010; Pacho Ramos  myodbc-5.1.6.ebuild:
-  stable amd64, bug 322277
-
-  14 Jun 2010; Christian Faulhammer  myodbc-5.1.6.ebuild:
-  stable x86, bug 322277
-
-  11 Apr 2010;  myodbc-3.51.26_p1127-r1.ebuild,
-  myodbc-5.1.5_p1144.ebuild:
-  ppc stable #302944
-
-  07 Feb 2010; Markos Chandras 
-  myodbc-3.51.26_p1127-r1.ebuild, myodbc-5.1.5_p1144.ebuild:
-  Stable on amd64 wrt bug #302944
-
-  03 Feb 2010; Christian Faulhammer 
-  myodbc-3.51.26_p1127-r1.ebuild:
-  stable x86, bug 302944
-
-  03 Feb 2010; Christian Faulhammer 
-  myodbc-5.1.5_p1144.ebuild:
-  stable x86, bug 302944
-
-*myodbc-5.1.6 (31 Jan 2010)
-
-  31 Jan 2010; Robin H. Johnson  +myodbc-5.1.6.ebuild,
-  +files/myodbc-5.1.6-qt4-includedir.patch:
-  Version bump for 5.1 slot, now includes support for Qt Gui.
-
-*myodbc-3.51.27_p695 (31 Jan 2010)
-
-  31 Jan 2010; Robin H. Johnson 
-  +myodbc-3.51.27_p695.ebuild:
-  Add 3.51.27 as the final release in the 3.51 series.
-
-  26 Feb 

[gentoo-commits] proj/mysql:master commit in: profiles/, virtual/mysql/

2019-08-26 Thread Brian Evans
commit: 094e182697efd4745f509b3625adf188d317f8f8
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 26 14:09:54 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 26 14:09:54 2019 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=094e1826

Drop unnecessary virtuals

Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask |  1 -
 virtual/mysql/mysql-5.7-r1.ebuild | 20 
 virtual/mysql/mysql-5.7-r2.ebuild | 22 --
 3 files changed, 43 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index f36d300..11ebff4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,7 +1,6 @@
 # Brian Evans  (10 Oct 2015)
 # Latest versions are masked for testing
 >=dev-db/mysql-5.7
->=virtual/mysql-5.7
 >=virtual/libmysqlclient-19
 >=virtual/libmysqlclient-20
 >=dev-db/percona-server-5.7

diff --git a/virtual/mysql/mysql-5.7-r1.ebuild 
b/virtual/mysql/mysql-5.7-r1.ebuild
deleted file mode 100644
index e4cb285..000
--- a/virtual/mysql/mysql-5.7-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Virtual for MySQL database server"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/20"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
-IUSE="embedded static static-libs"
-
-DEPEND=""
-RDEPEND="
-   virtual/libmysqlclient
-   || (
-   =dev-db/mysql-${PV}*[embedded=,static=,static-libs=]
-   )"

diff --git a/virtual/mysql/mysql-5.7-r2.ebuild 
b/virtual/mysql/mysql-5.7-r2.ebuild
deleted file mode 100644
index 65c5a1f..000
--- a/virtual/mysql/mysql-5.7-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for MySQL database server"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/20"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
-IUSE="embedded static"
-
-DEPEND=""
-RDEPEND="
-   || (
-   =dev-db/mariadb-10.3*[embedded?,server,static?]
-   =dev-db/mariadb-10.2*[embedded?,server,static?]
-   =dev-db/mysql-${PV}*[embedded?,server,static?]
-   =dev-db/percona-server-${PV}*[embedded?,server,static?]
-   )"



[gentoo-commits] proj/mysql:master commit in: dev-db/percona-server/

2019-08-26 Thread Brian Evans
commit: 4fc991d753db5c2c0c319acf981b4609c2ee64bb
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 26 14:13:26 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 26 14:13:26 2019 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=4fc991d7

percona-server: Drop elog reference to virtual/libmysqlclient

Signed-off-by: Brian Evans  gentoo.org>

 dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild 
b/dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild
index 8c7575b..89fe0ee 100644
--- a/dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild
@@ -702,8 +702,8 @@ pkg_postinst() {
fi
 
elog "Since ${PN}-5.6.39.83.1-r1 we no longer provide client 
libs."
-   elog "Applications depending on client libs should migrate to 
virtual/libmysqlclient"
-   elog "which will pull-in dev-db/mysql-connector-c as their new 
client lib provider."
+   elog "Applications depending on client libs should migrate to 
dev-db/mysql-connector-c"
+   elog "as their new client lib provider."
einfo
fi
 }



[gentoo-commits] repo/gentoo:master commit in: dev-php/twig/, dev-php/twig/files/

2019-08-26 Thread Brian Evans
commit: 147ff3d952aeea19a822f42ba2805e980d696735
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 26 13:37:27 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 26 13:37:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147ff3d9

dev-php/twig: Drop old versions which include the extension

PHP 5.6 is EOL and the extension needs to go away
PHP team is planning on masking 5.6 2019-10-01

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/twig/Manifest   |  1 -
 dev-php/twig/files/1.40.1-autoloader-path.patch | 16 -
 dev-php/twig/metadata.xml   |  5 --
 dev-php/twig/twig-1.40.1.ebuild | 87 -
 dev-php/twig/twig-1.42.2.ebuild | 86 
 5 files changed, 195 deletions(-)

diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 36d6379ab8f..5f5c81ed533 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,3 +1,2 @@
 DIST twig-1.40.1.tar.gz 274081 BLAKE2B 
0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554
 SHA512 
de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1
-DIST twig-1.42.2.tar.gz 277760 BLAKE2B 
c72462b172f1cda85ca8a7988870e20abf09bdc6114eb428213508fcf9c19a2b10e180e8fa052b8e51e8aee749c7c0ded936e5792ca1f8b5c7024872335df3fb
 SHA512 
17ccfcea750d9d9154841598b34de8882aa1144696d912c8175b1add996db4f31b3cb85bc68dc75f62944fe858345811ebbf952aabb0c3ff8c1bbc2a0f1a2576
 DIST twig-1.42.3.tar.gz 278164 BLAKE2B 
4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01
 SHA512 
9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f440740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3

diff --git a/dev-php/twig/files/1.40.1-autoloader-path.patch 
b/dev-php/twig/files/1.40.1-autoloader-path.patch
deleted file mode 100644
index 8c236883e07..000
--- a/dev-php/twig/files/1.40.1-autoloader-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 a/lib/Twig/Autoloader.php  2019-04-29 16:12:28.0 +0200
-+++ b/lib/Twig/Autoloader.php.new  2019-05-06 21:37:39.955238245 +0200
-@@ -43,9 +43,11 @@
- return;
- }
- 
--if (is_file($file = __DIR__.'/../'.str_replace(['_', "\0"], ['/', 
''], $class).'.php')) {
-+if (is_file($file = __DIR__.'/../'.str_replace(['Twig_', "\0"], 
['lib/', ''], $class).'.php')) {
- require $file;
--} elseif (is_file($file = 
__DIR__.'/../../src/'.str_replace(['Twig\\', '\\', "\0"], ['', '/', ''], 
$class).'.php')) {
-+} elseif (is_file($file = __DIR__.'/../'.str_replace(['_', "\0"], 
['/', ''], $class).'.php')) {
-+require $file;
-+} elseif (is_file($file = __DIR__.'/../src/'.str_replace(['Twig\\', 
'\\', "\0"], ['', '/', ''], $class).'.php')) {
- require $file;
- }
- }

diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
index 434d766441f..26aeb448aae 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -9,11 +9,6 @@
 php-b...@gentoo.org
 PHP
   
-  
-
-  Build the C extension (only for php-5.6.x).
-
-  
   
 twigphp/Twig
   

diff --git a/dev-php/twig/twig-1.40.1.ebuild b/dev-php/twig/twig-1.40.1.ebuild
deleted file mode 100644
index 0903fb3e789..000
--- a/dev-php/twig/twig-1.40.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Twig"
-USE_PHP="php5-6"
-S="${WORKDIR}/${MY_PN}-${PV}"
-PHP_EXT_S="${S}/ext/${PN}"
-PHP_EXT_NAME="${PN}"
-PHP_EXT_OPTIONAL_USE="extension"
-
-inherit eutils php-ext-source-r3
-
-DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/;
-SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
-   -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc extension test"
-
-DEPEND="test? ( dev-php/phpunit )"
-
-# We always require *some* version of PHP; the eclass (conditionally)
-# requires *specific* versions.
-RDEPEND="dev-lang/php"
-
-src_prepare(){
-   # We need to call eapply_user ourselves, because it may be skipped
-   # if either the "extension" USE flag is not set, or if the user's
-   # PHP_TARGETS is essentially empty (does not contain "php5-6"). In
-   # the latter case, the eclass src_prepare does nothing. We only call
-   # the eclass phase conditionally becau

[gentoo-commits] repo/gentoo:master commit in: dev-php/twig/

2019-08-26 Thread Brian Evans
commit: 4930bce96e7ad6271f3f79ea8983ed63e880e50d
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 26 13:33:06 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 26 13:33:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4930bce9

dev-php/twig: Version bump for 1.42.3

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/twig/Manifest   |  1 +
 dev-php/twig/twig-1.42.3.ebuild | 49 +
 2 files changed, 50 insertions(+)

diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 787f3db0ac1..36d6379ab8f 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,2 +1,3 @@
 DIST twig-1.40.1.tar.gz 274081 BLAKE2B 
0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554
 SHA512 
de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1
 DIST twig-1.42.2.tar.gz 277760 BLAKE2B 
c72462b172f1cda85ca8a7988870e20abf09bdc6114eb428213508fcf9c19a2b10e180e8fa052b8e51e8aee749c7c0ded936e5792ca1f8b5c7024872335df3fb
 SHA512 
17ccfcea750d9d9154841598b34de8882aa1144696d912c8175b1add996db4f31b3cb85bc68dc75f62944fe858345811ebbf952aabb0c3ff8c1bbc2a0f1a2576
+DIST twig-1.42.3.tar.gz 278164 BLAKE2B 
4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01
 SHA512 
9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f440740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3

diff --git a/dev-php/twig/twig-1.42.3.ebuild b/dev-php/twig/twig-1.42.3.ebuild
new file mode 100644
index 000..c06e5c62736
--- /dev/null
+++ b/dev-php/twig/twig-1.42.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Twig"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DESCRIPTION="PHP templating engine with syntax similar to Django"
+HOMEPAGE="http://twig.sensiolabs.org/;
+SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
+DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
+# Test fail due to missing Symphony dependencies
+RESTRICT="test"
+
+src_install(){
+   # The autoloader requires the 'T' in "Twig" capitalized.
+   insinto "/usr/share/php/${MY_PN}/lib"
+   doins -r lib/"${MY_PN}"/*
+   insinto "/usr/share/php/${MY_PN}/src"
+   doins -r src/*
+   insinto "/usr/share/php/${MY_PN}"
+   doins "${FILESDIR}/Autoloader.php"
+
+   dodoc README.rst CHANGELOG
+
+   # This installs the reStructuredText source documents. There's got
+   # to be some way to turn them into HTML using Sphinx, but upstream
+   # doesn't provide for it.
+   use doc && dodoc -r doc
+}
+
+src_test(){
+   cp "${FILESDIR}/Autoloader.php" "${S}" || die
+   phpunit --bootstrap Autoloader.php || die "test suite failed"
+   rm "${S}/Autoloader.php" || die
+}
+
+pkg_postinst(){
+   elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
+   elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-MDB2/

2019-08-26 Thread Brian Evans
commit: 6eaa66d9ea310defecb60af6090beb8bbdd80f98
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 26 13:16:29 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 26 13:16:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eaa66d9

dev-php/PEAR-MDB2: New revision to drop PEAR-MDB2_Driver_mysql dep

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild | 26 +++
 1 file changed, 26 insertions(+)

diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild 
b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
new file mode 100644
index 000..00167744408
--- /dev/null
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"
+
+PDEPEND="mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 )
+   mysql? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 )
+   mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 )
+   oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
+   oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
+   postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4 )"
+
+DOCS=( docs/CONTRIBUTORS docs/MAINTAINERS docs/README docs/STATUS docs/TODO )
+HTML_DOCS=( docs/datatypes.html)



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-radius/

2019-08-23 Thread Brian Evans
commit: 27eaf3c882e3f23c460d9b1b8c38c0d183f3db6d
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 23 18:10:39 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 23 18:11:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27eaf3c8

dev-php/pecl-radius: Drop old

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-radius/Manifest|  1 -
 dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild | 21 -
 2 files changed, 22 deletions(-)

diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest
index b50beb68077..fa882178564 100644
--- a/dev-php/pecl-radius/Manifest
+++ b/dev-php/pecl-radius/Manifest
@@ -1,2 +1 @@
-DIST radius-1.3.0.tgz 43060 BLAKE2B 
e348ca5693872a7af142f2f60dd91613980046ff1479894518591a9db4229147963bfc70dd7f2797ace070d89015096b7877915df18decc03ae3cc092d8d02c6
 SHA512 
79126a852701e77f782283b0cf2ad99cb05418c69ed39d70608f62021f3da06f5e5867ac5b09cc75806feeb3d1a06f24eeb6ff4e56cb2fde5f05bcd198b5a661
 DIST radius-1.4.0b1.tgz 50953 BLAKE2B 
1f6f2a4c4cfa7600a37b8bc30e4d263b899a687becac83fd01bac2466de08cad4233984ca694dc73eaf20b64ef94e1e6a6ca7f843474c8f0c9de2c39df9d9705
 SHA512 
db6ebe928673db1ff4c565338010ef5acf6029844994eb240f2e8eaeda4aff734ed300a7ddf16c09e245671aad377283f99cf1c485569b3bad0c7c7b24a19664

diff --git a/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild 
b/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild
deleted file mode 100644
index 0b5a3b4507f..000
--- a/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="radius"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and 
accounting (RFC 2866)"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] )"



[gentoo-commits] repo/gentoo:master commit in: www-apps/hiawatha-monitor/

2019-08-23 Thread Brian Evans
commit: aad9ed8ca3f9fedf315a183ba04344af2176dcac
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 23 18:00:12 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 23 18:00:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad9ed8c

www-apps/hiawatha-monitor: Drop old

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 www-apps/hiawatha-monitor/Manifest |  1 -
 .../hiawatha-monitor-1.3-r1.ebuild | 31 --
 2 files changed, 32 deletions(-)

diff --git a/www-apps/hiawatha-monitor/Manifest 
b/www-apps/hiawatha-monitor/Manifest
index f98102142df..ba75b7329de 100644
--- a/www-apps/hiawatha-monitor/Manifest
+++ b/www-apps/hiawatha-monitor/Manifest
@@ -1,2 +1 @@
-DIST monitor-1.3.tar.gz 588836 BLAKE2B 
c9ecfadd2210c0eb48960741da0ad4c1239407d416e427e6faaebf7e25a2bc90894eb4f8649c8b054bb203f06e206d4af74c821ed3afbabc9124854569d0a560
 SHA512 
480ef2d2216a47a7b5758e2ceb089233b5f5b3174460a2b7b43f006c76ce9e12a592574d23b6661b7a5408333a40d6867eee3417ea4aa1a9a0c82772114a21b1
 DIST monitor-1.6.tar.gz 622470 BLAKE2B 
79813f162dae9a72b9e62550e58b737b878e69d1eb6ce348f62dd9d8c4309529b9dd77eeba6876fec90d0db6c3894aea5c62ada940a17d53bb8cba876ec31855
 SHA512 
4983638bfa0bfbe3f391b2319cf2f5ba63527cddc8c667618aba001929140453c8058f35d83bedb53f4dc0e5d5139d3a33dd7d9bac46f94e32dff81e65d53f5e

diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild 
b/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild
deleted file mode 100644
index 5ba20143b6b..000
--- a/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="monitor"
-
-DESCRIPTION="Monitoring application for www-servers/hiawatha"
-HOMEPAGE="https://www.hiawatha-webserver.org/howto/monitor;
-SRC_URI="https://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-lang/php-5*[mysql,xslt]
-   virtual/cron
-   virtual/mysql
-   www-servers/hiawatha[xslt]"
-
-S=${WORKDIR}/${MY_P}
-
-src_install () {
-   default
-
-   rm -f ChangeLog README LICENSE
-
-   insinto /usr/share/${PN}
-   doins -r *
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/hiawatha-monitor/

2019-08-23 Thread Brian Evans
commit: 2b80de7ca551b66166bfda396c08650ad8056018
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 23 17:57:35 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 23 17:57:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b80de7c

www-apps/hiawatha-monitor: Version bump to 1.6

Non-maintainer commit
Untested bump in order to fix PHP compatibility and dependencies
Fix license from GPL-2 to GPL-3 as it was not committed correctly

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 www-apps/hiawatha-monitor/Manifest |  1 +
 .../hiawatha-monitor/hiawatha-monitor-1.6.ebuild   | 33 ++
 2 files changed, 34 insertions(+)

diff --git a/www-apps/hiawatha-monitor/Manifest 
b/www-apps/hiawatha-monitor/Manifest
index 744fb2aa304..f98102142df 100644
--- a/www-apps/hiawatha-monitor/Manifest
+++ b/www-apps/hiawatha-monitor/Manifest
@@ -1 +1,2 @@
 DIST monitor-1.3.tar.gz 588836 BLAKE2B 
c9ecfadd2210c0eb48960741da0ad4c1239407d416e427e6faaebf7e25a2bc90894eb4f8649c8b054bb203f06e206d4af74c821ed3afbabc9124854569d0a560
 SHA512 
480ef2d2216a47a7b5758e2ceb089233b5f5b3174460a2b7b43f006c76ce9e12a592574d23b6661b7a5408333a40d6867eee3417ea4aa1a9a0c82772114a21b1
+DIST monitor-1.6.tar.gz 622470 BLAKE2B 
79813f162dae9a72b9e62550e58b737b878e69d1eb6ce348f62dd9d8c4309529b9dd77eeba6876fec90d0db6c3894aea5c62ada940a17d53bb8cba876ec31855
 SHA512 
4983638bfa0bfbe3f391b2319cf2f5ba63527cddc8c667618aba001929140453c8058f35d83bedb53f4dc0e5d5139d3a33dd7d9bac46f94e32dff81e65d53f5e

diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild 
b/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild
new file mode 100644
index 000..8444fca6d85
--- /dev/null
+++ b/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="monitor"
+
+DESCRIPTION="Monitoring application for www-servers/hiawatha"
+HOMEPAGE="https://www.hiawatha-webserver.org/howto/monitor;
+SRC_URI="https://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz "
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-5:*[mysql,mysqli,xslt]
+   virtual/cron
+   virtual/mysql
+   www-servers/hiawatha[xslt]"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog README.md INSTALL )
+
+src_install () {
+   default
+
+   rm -f ChangeLog README.md LICENSE INSTALL
+
+   insinto /usr/share/${PN}
+   doins -r *
+}



[gentoo-commits] repo/gentoo:master commit in: profiles/

2019-08-23 Thread Brian Evans
commit: d77c84b007e4fefc2da9dabf6b5610a17a4d9f7e
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 23 14:55:49 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 23 14:56:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77c84b0

profiles: Mask www-apps/{groupoffice,phpwebsite,sitebar} for removal

Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask | 9 +
 1 file changed, 9 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 55037789ea8..cce2c080288 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans  (2019-08-23)
+# These packages are incompatible with current versions of PHP (7 or higher)
+# They need a maintainer but no one has volunteered.
+# Removal in 30 days if no one picks them up.
+# Bugs 615472 651166 and 651180 respectively
+www-apps/groupoffice
+www-apps/phpwebsite
+www-apps/sitebar
+
 # Matthias Maier  (2019-08-22)
 # Masked for removal in 30 days. Unmaintained and upstream has released
 # backdoored versions for more than a year due to a compromised development



[gentoo-commits] repo/gentoo:master commit in: dev-db/libdbi-drivers/

2019-08-23 Thread Brian Evans
commit: 1c29811d86dbc0a458f74c8b026263ef3d83ca05
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 23 14:36:53 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 23 14:38:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c29811d

dev-db/libdbi-drivers: Revbump for EAPI and deps

Non-maintainer commit

Change to EAPI 7 and use mysql-connector-c instead of virtual/mysql

Bug: https://bugs.gentoo.org/665840
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 .../libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild  | 87 ++
 1 file changed, 87 insertions(+)

diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild 
b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
new file mode 100644
index 000..a46e855b424
--- /dev/null
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+HOMEPAGE="http://libdbi-drivers.sourceforge.net/;
+LICENSE="LGPL-2.1"
+
+IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~x86-fbsd"
+SLOT=0
+REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
+RESTRICT="firebird? ( bindist )"
+
+RDEPEND="
+   >=dev-db/libdbi-0.9.0
+   firebird? ( dev-db/firebird )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:* )
+   sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/openjade )"
+
+DOCS=( AUTHORS ChangeLog NEWS README README.osx TODO )
+
+PATCHES=(
+   #"${FILESDIR}"/${P}-fix-ac-macro.patch \
+   #"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \
+   #"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
+   "${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch
+)
+
+pkg_setup() {
+   use oci8 && [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
+}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myconf=""
+   # WARNING: the configure script does NOT work correctly
+   # --without-$driver does NOT work
+   # so do NOT use `use_with...`
+   # Future additions:
+   # msql
+   # freetds
+   # ingres
+   # db2
+   use mysql && myconf+=" --with-mysql"
+   use postgres && myconf+=" --with-pgsql"
+   use sqlite && myconf+=" --with-sqlite3"
+   use firebird && myconf+=" --with-firebird"
+   if use oci8; then
+   [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
+   myconf+=" --with-oracle-dir=${ORACLE_HOME} --with-oracle"
+   fi
+
+   econf \
+   $(use_enable doc docs) \
+   $(use_enable static-libs static) \
+   --with-dbi-libdir=/usr/$(get_libdir) \
+   ${myconf}
+}
+
+src_test() {
+   if [[ -z "${WANT_INTERACTIVE_TESTS}" ]]; then
+   ewarn "Tests disabled due to interactivity."
+   ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
+   return 0
+   fi
+   einfo "Running interactive tests"
+   emake check
+}
+
+src_install() {
+   default
+
+   find "${D}" -name '*.la' -type f -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-db/mycli/files/, dev-db/mycli/

2019-08-23 Thread Brian Evans
commit: 69128ca8b84c1ae69effe5ecc6b27b04b840983e
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 23 14:09:25 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 23 14:10:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69128ca8

dev-db/mycli: Drop old

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mycli/Manifest |  2 --
 dev-db/mycli/files/remove-tasks.patch | 15 -
 dev-db/mycli/mycli-1.15.0-r2.ebuild   | 31 --
 dev-db/mycli/mycli-1.17.0-r1.ebuild   | 41 ---
 4 files changed, 89 deletions(-)

diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 79066beb3b7..f1c96e7851b 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,4 +1,2 @@
-DIST mycli-1.15.0.tar.gz 275065 BLAKE2B 
47ae049a7a669d18fc2bb467dd4ee6d1bbe23a86115db6d1965c48c93a2a1be9bb8b4427b377f8ce935b957c854c1c4bf4a87fdea07f27329a13fd6a28b59559
 SHA512 
7a7d98220c4a679340dbf3c3c9fb3eaab7698f7abbe3e62835a03df10b59c79f0dfd916e9f7b39f12215063849ecadf9d08d086d14b00666b67bac1d092609f2
-DIST mycli-1.17.0.tar.gz 276786 BLAKE2B 
203c54b58a7876fd0bab5a05880621263e5cdf786b13207f04dfaf38866f5a7250e8fe8e1c5870aa9d3f562cf9963f15cc433e3ddd2232531f4c823e46778ac7
 SHA512 
bd64f44ed7b16a1e9c684da52fa60436876b26333e2705e5226c4fab3a979c6680314447333d01e4fdb274d33a7f093cbb2f732e5b4e04c5330066f9918a35ba
 DIST mycli-1.19.0.tar.gz 263255 BLAKE2B 
524190429476793af038c8302f43389884a6ee24a05b0b8c739f290dbfdebec3336bd14567eafff2ea3351430791e4844e16dfc5affb1b28bb57d3759b496350
 SHA512 
8c6003a09a888c2ac6f35a881ca072ba8972f66b13319cbff73f7a525d1f808b767dcef0121b6272a1b82eed1a02c8c417d5805e5a8ce0c141545f28ff3c3a33
 DIST mycli-1.20.1.tar.gz 265264 BLAKE2B 
d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1
 SHA512 
82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d

diff --git a/dev-db/mycli/files/remove-tasks.patch 
b/dev-db/mycli/files/remove-tasks.patch
deleted file mode 100644
index 94502e6b656..000
--- a/dev-db/mycli/files/remove-tasks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 882fe92..f0d28ab 100755
 a/setup.py
-+++ b/setup.py
-@@ -36,10 +36,6 @@ setup(
- install_requires=install_requirements,
- entry_points={
- 'console_scripts': ['mycli = mycli.main:cli'],
--'distutils.commands': [
--'lint = tasks:lint',
--'test = tasks:test',
--],
- },
- classifiers=[
- 'Intended Audience :: Developers',

diff --git a/dev-db/mycli/mycli-1.15.0-r2.ebuild 
b/dev-db/mycli/mycli-1.15.0-r2.ebuild
deleted file mode 100644
index 3356d93de87..000
--- a/dev-db/mycli/mycli-1.15.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"
-
-HOMEPAGE="https://www.mycli.net;
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-   >=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
-   >=dev-python/click-4.1[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-   >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-   >=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
-   !>=dev-python/prompt_toolkit-1.1.0
-   >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-   >=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-   >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-   !>=dev-python/python-sqlparse-0.3.0
-"
-
-PATCHES=( "${FILESDIR}/remove-tasks.patch" )

diff --git a/dev-db/mycli/mycli-1.17.0-r1.ebuild 
b/dev-db/mycli/mycli-1.17.0-r1.ebuild
deleted file mode 100644
index e3572fd7e6e..000
--- a/dev-db/mycli/mycli-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"
-
-HOMEPAGE="https://www.mycli.net;
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RDEPEND="
-   >=dev-python/cli_helpers-1.0.1[${

[gentoo-commits] repo/gentoo:master commit in: dev-db/mycli/

2019-08-23 Thread Brian Evans
commit: 8245ab86f1b833763af85a8c0c6e2b82fc03c64c
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 23 14:08:04 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 23 14:10:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8245ab86

dev-db/mycli: Version bump for 1.20.1; adjust live deps

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mycli/Manifest   |  1 +
 dev-db/mycli/{mycli-.ebuild => mycli-1.20.1.ebuild} | 15 +++
 dev-db/mycli/mycli-.ebuild  |  8 
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 61090c13fb0..79066beb3b7 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,3 +1,4 @@
 DIST mycli-1.15.0.tar.gz 275065 BLAKE2B 
47ae049a7a669d18fc2bb467dd4ee6d1bbe23a86115db6d1965c48c93a2a1be9bb8b4427b377f8ce935b957c854c1c4bf4a87fdea07f27329a13fd6a28b59559
 SHA512 
7a7d98220c4a679340dbf3c3c9fb3eaab7698f7abbe3e62835a03df10b59c79f0dfd916e9f7b39f12215063849ecadf9d08d086d14b00666b67bac1d092609f2
 DIST mycli-1.17.0.tar.gz 276786 BLAKE2B 
203c54b58a7876fd0bab5a05880621263e5cdf786b13207f04dfaf38866f5a7250e8fe8e1c5870aa9d3f562cf9963f15cc433e3ddd2232531f4c823e46778ac7
 SHA512 
bd64f44ed7b16a1e9c684da52fa60436876b26333e2705e5226c4fab3a979c6680314447333d01e4fdb274d33a7f093cbb2f732e5b4e04c5330066f9918a35ba
 DIST mycli-1.19.0.tar.gz 263255 BLAKE2B 
524190429476793af038c8302f43389884a6ee24a05b0b8c739f290dbfdebec3336bd14567eafff2ea3351430791e4844e16dfc5affb1b28bb57d3759b496350
 SHA512 
8c6003a09a888c2ac6f35a881ca072ba8972f66b13319cbff73f7a525d1f808b767dcef0121b6272a1b82eed1a02c8c417d5805e5a8ce0c141545f28ff3c3a33
+DIST mycli-1.20.1.tar.gz 265264 BLAKE2B 
d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1
 SHA512 
82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d

diff --git a/dev-db/mycli/mycli-.ebuild b/dev-db/mycli/mycli-1.20.1.ebuild
similarity index 74%
copy from dev-db/mycli/mycli-.ebuild
copy to dev-db/mycli/mycli-1.20.1.ebuild
index 4aa099d560e..8416d80d359 100644
--- a/dev-db/mycli/mycli-.ebuild
+++ b/dev-db/mycli/mycli-1.20.1.ebuild
@@ -3,28 +3,27 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-EGIT_REPO_URI="https://github.com/dbcli/mycli.git;
-inherit distutils-r1 git-r3
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
 
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"
 
 HOMEPAGE="https://www.mycli.net;
-SRC_URI=""
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="ssh test"
 RDEPEND="
-   >=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
+   >=dev-python/cli_helpers-1.1.0[${PYTHON_USEDEP}]
>=dev-python/click-7.0[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-   >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-   =dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
+   https://github.com/dbcli/mycli.git;
 inherit distutils-r1 git-r3
 
@@ -16,15 +16,15 @@ SLOT="0"
 KEYWORDS=""
 IUSE="ssh test"
 RDEPEND="
-   >=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
+   >=dev-python/cli_helpers-1.1.0[${PYTHON_USEDEP}]
>=dev-python/click-7.0[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-   >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-   =dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: mail-client/s-nail/files/, mail-client/s-nail/

2019-08-23 Thread Brian Evans
commit: 5e265343ded309ffcfef1f6d3a0f511668053b78
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 23 12:55:05 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 23 12:55:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e265343

mail-client/s-nail: Version bump for 14.9.15

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 mail-client/s-nail/Manifest|   1 +
 .../s-nail/files/s-nail-14.9.15-havenet.patch  | 205 +
 mail-client/s-nail/s-nail-14.9.15.ebuild   |  94 ++
 3 files changed, 300 insertions(+)

diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index 1a48213f110..91c6b34decd 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1 +1,2 @@
 DIST s-nail-14.9.13.tar.xz 734416 BLAKE2B 
b23de9c32357d5b88ecb723dc875d3366b2b4c57dd654a4f2422e8bb81b781a76568eb0955990d4166f034bf40459fa5d2992da6e7f2b403a641a4d4c0c1e200
 SHA512 
6467846fab5752c708886ba7a66cd2038effc0cf8d72e2feb670283cf1d5436c27037087eeaa201c074964476ff0c213cffe74169fb03089ebf964fcc766e6ea
+DIST s-nail-14.9.15.tar.xz 757180 BLAKE2B 
9d3efe43e6f1f4486bb66bb0060a6b656097c4b6d95e5f22e209e7464bd92bc9cf42a36009d674a3ee032ab32f64ecef2aa0cc1b09519a7760bf5d1145e35c5d
 SHA512 
ca95c544890a13b475fb12f882a172942f29517319956eccab1fbc2a67625fe53e3f0cc10c31daac98e28bb1fae48364d80db9ec35f0e6cc71d748290a2635df

diff --git a/mail-client/s-nail/files/s-nail-14.9.15-havenet.patch 
b/mail-client/s-nail/files/s-nail-14.9.15-havenet.patch
new file mode 100644
index 000..386e03e174d
--- /dev/null
+++ b/mail-client/s-nail/files/s-nail-14.9.15-havenet.patch
@@ -0,0 +1,205 @@
+diff --git a/THANKS b/THANKS
+index 9613133d..1d4dfd0d 100644
+--- a/THANKS
 b/THANKS
+@@ -43,6 +43,7 @@ Erich Eckner  erich dot eckner at gmx dot de
+ Paul Eggert   eggert at cs dot ucla dot edu
+ Justin Ellingwood JustinEllingwood at gmail dot com
+ Robert Elzkre at munnari dot OZ dot AU
++Brian Evans   grknight at gentoo dot org
+ Rich Felker   dalias at libc dot org
+ Dr. Werner Fink   werner at suse dot de
+ Felix Fontein felix at fontein dot de
+diff --git a/mx-test.sh b/mx-test.sh
+index 4a60a1b0..201b00e7 100755
+--- a/mx-test.sh
 b/mx-test.sh
+@@ -5442,12 +5442,17 @@ t_mta_aliases() {
+## xxx The following are actually *expandaddr* tests!!
+ 
+# May not send plain names over SMTP!
+-   echo | ${MAILX} ${ARGS} -Smta=smtp://laber.backe \
+-  -Smta-aliases=./.tali \
+-  -b a3 -c a2 a1 > ./.tall 2>&1
+-   check_exn0 3
+-   check 4 - "${MBOX}" '1172368381 238'
+-   if have_feat uistrings; then
++   mtaali=
++   if have_feat smtp; then
++  echo | ${MAILX} ${ARGS} \
++ -Smta=smtp://laber.backe -Ssmtp-auth=none \
++ -Smta-aliases=./.tali \
++ -b a3 -c a2 a1 > ./.tall 2>&1
++  check_exn0 3
++  check 4 - "${MBOX}" '1172368381 238'
++  mtaali=1
++   fi
++   if [ -n "${mtaali}" ] && have_feat uistrings; then
+   check 5 - .tall '771616226 179'
+else
+   t_echoskip '5:[test unsupported]'
+diff --git a/src/mx/cmd-resend.c b/src/mx/cmd-resend.c
+index 488c9b78..31f20609 100644
+--- a/src/mx/cmd-resend.c
 b/src/mx/cmd-resend.c
+@@ -723,7 +723,11 @@ jleave:
+ 
+ static int
+ a_crese_resend1(void *vp, boole add_resent){
+-   struct mx_url url;
++#ifdef mx_HAVE_NET
++   struct mx_url url, *urlp = 
++#else
++   struct mx_url *urlp = NIL;
++#endif
+struct header head;
+struct mx_name *myto, *myrawto;
+boole mta_isexe;
+@@ -747,7 +751,7 @@ jedar:
+   goto jleave;
+}
+ 
+-   if(!(mta_isexe = mx_sendout_mta_url()))
++   if(!(mta_isexe = mx_sendout_mta_url(urlp)))
+   goto jleave;
+mta_isexe = (mta_isexe != TRU1);
+ 
+@@ -794,7 +798,7 @@ jedar:
+   head.h_mailx_orig_cc = lextract(hfield1("cc", mp), GCC | gf);
+   head.h_mailx_orig_bcc = lextract(hfield1("bcc", mp), GBCC | gf);
+ 
+-  if(n_resend_msg(mp, (mta_isexe ? NIL : ), , add_resent
++  if(n_resend_msg(mp, (mta_isexe ? NIL : urlp), , add_resent
+ ) != OKAY){
+  /* n_autorec_relax_gut(); XXX but is handled automatically? */
+  goto jleave;
+diff --git a/src/mx/sendout.c b/src/mx/sendout.c
+index 2b0e8bf0..c4f373c1 100644
+--- a/src/mx/sendout.c
 b/src/mx/sendout.c
+@@ -2060,9 +2060,13 @@ FL enum okay
+ n_mail1(enum n_mailsend_flags msf, struct header *hp, struct message *quote,
+char const *quotefile)
+ {
+-   struct n_sigman sm;
++#ifdef mx_HAVE_NET
+struct mx_cred_ctx cc;
+-   struct mx_url url;
++   struct mx_url url, *urlp = 
++#else
++   struct mx_url *urlp = NIL;
++#endif
++   struct n_sigman sm;
+struct sendbundle sb;
+struct mx_name *to;
+boole dosign, mta_isexe;
+@@ -2121,7 +2125,7 @@ 

[gentoo-commits] proj/bouncer:master commit in: php/lib/

2019-08-19 Thread Brian Evans
commit: a7066d7bd83e18729d0b0a9efc3449decfa27a69
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 19 14:02:09 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 19 14:02:09 2019 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=a7066d7b

php/lib/auth.php: Drop md5 upgrade check

Signed-off-by: Brian Evans  gentoo.org>

 php/lib/auth.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/php/lib/auth.php b/php/lib/auth.php
index 610b3c2..7101886 100644
--- a/php/lib/auth.php
+++ b/php/lib/auth.php
@@ -48,9 +48,7 @@ public static function query($username,$password)
 if ($res && DB::numrows($res)>0) {
 $userrow = DB::fetch($res,PDO::FETCH_ASSOC);
if (!password_verify($password, $userrow['password'])) {
-   if ($userrow['password'] !== md5($password))
-   return false;
-   static::password_upgrade($userrow, $username, $password);
+   return false;
}
if (password_needs_rehash($userrow['password'], PASSWORD_DEFAULT))
static::password_upgrade($userrow, $username, $password);



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-apcu/

2019-08-19 Thread Brian Evans
commit: 71d19c05b96c4e2235ea612c1d6544f261f61c53
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 19 13:22:31 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Aug 19 13:22:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d19c05

dev-php/pecl-apcu: Fix false positives on an elog " into ${EPREFIX}"

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild | 2 +-
 dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
index 907e9265b6b..675490a1e85 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
@@ -71,7 +71,7 @@ src_install() {
 pkg_postinst() {
if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 || use php_targets_php7-3 ; then
elog "The apc.php file shipped with this release of pecl-apcu 
was"
-   elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+   elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
elog
elog "If you depend on the apc_* functions,"
elog "please install dev-php/pecl-apcu_bc as this extension no 
longer"

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
index 7da2fb1c712..39a64219bf7 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
@@ -71,7 +71,7 @@ src_install() {
 pkg_postinst() {
if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 || use php_targets_php7-3 ; then
elog "The apc.php file shipped with this release of pecl-apcu 
was"
-   elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+   elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
elog
elog "If you depend on the apc_* functions,"
elog "please install dev-php/pecl-apcu_bc as this extension no 
longer"



[gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Net_Sieve/

2019-08-16 Thread Brian Evans
commit: 536c797c63705f130885b4d0280bd2a402d7179c
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:06:50 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536c797c

dev-php/PEAR-Net_Sieve: Remove HOMEPAGE from SRC_URI

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild | 4 ++--
 dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild 
b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
index 2d6a716f5d8..facc1829ab4 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 
 DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
 HOMEPAGE="https://github.com/roundcube/${MY_PN};
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"

diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild 
b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
index 44df11c59f7..f2967f67022 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 
 DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
 HOMEPAGE="https://github.com/roundcube/${MY_PN};
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"



[gentoo-commits] repo/gentoo:master commit in: dev-php/symfony-process/

2019-08-16 Thread Brian Evans
commit: cb590c2b04ff9f0fccdfc2ec492fe48407024931
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 14:08:18 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb590c2b

dev-php/symfony-process: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/symfony-process/Manifest   |  1 -
 .../symfony-process/symfony-process-3.2.6.ebuild   | 43 --
 2 files changed, 44 deletions(-)

diff --git a/dev-php/symfony-process/Manifest b/dev-php/symfony-process/Manifest
index 9dbaf61740d..51a7e028749 100644
--- a/dev-php/symfony-process/Manifest
+++ b/dev-php/symfony-process/Manifest
@@ -1,2 +1 @@
-DIST symfony-process-3.2.6.tar.gz 31684 BLAKE2B 
5129b6a7a01c137b9468950b8da58674343131863283cd96f8afac6d0d86969a61a1effc7d59c3735e6370059fb4f53e084011c07b629bddbd153fb6394d3d15
 SHA512 
8fd7712b2f63a46b6dea0b6cb76825c1e4c7b6a33123fe0949fedec820e599ffe5175bac567e8b453be7964f8b070bc2a2b9554b102a33834dfdbe959a23a3d4
 DIST symfony-process-3.4.29.tar.gz 34684 BLAKE2B 
87f79a17ac321b395a634f0b83a0d218c39a06f0b5b553904c1c00431ffaf94f7bd26aa015cd426f5ba7726f09328b4b1d4475f4f8c229eedc1d52fc3f0142c1
 SHA512 
9e19406cad79f51d4ec811460a762c3a5004679e53777ca37049f5d8eb73bc3b569e266bd11ecddfc42481d7f05a4850bd6901c3ec2dd1d398d5077cdbe2e0bd

diff --git a/dev-php/symfony-process/symfony-process-3.2.6.ebuild 
b/dev-php/symfony-process/symfony-process-3.2.6.ebuild
deleted file mode 100644
index 03d09390cc5..000
--- a/dev-php/symfony-process/symfony-process-3.2.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Symfony Process Component"
-HOMEPAGE="https://github.com/symfony/process;
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-   dev-lang/php:*
-   dev-php/fedora-autoloader"
-DEPEND="
-   test? (
-   ${RDEPEND}
-   dev-php/phpunit )"
-
-S="${WORKDIR}/process-${PV}"
-
-src_prepare() {
-   default
-   if use test; then
-   cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-   fi
-}
-
-src_install() {
-   insinto "/usr/share/php/Symfony/Component/Process"
-   doins -r Exception/ Pipes/ ExecutableFinder.php InputStream.php \
-   LICENSE PhpExecutableFinder.php PhpProcess.php ProcessBuilder.php \
-   Process.php ProcessUtils.php "${FILESDIR}"/autoload.php
-   dodoc README.md
-}
-
-src_test() {
-   phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/symfony-filesystem/

2019-08-16 Thread Brian Evans
commit: e9770bac6b0f87bc1662ca0c1f334a3cc887b9c4
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 14:05:08 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9770bac

dev-php/symfony-filesystem: Remove HOMEPAGE from SRC_URI; RESTRICT test

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild 
b/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
index 24314726ed6..f9398c26fd3 100644
--- a/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
+++ b/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 DESCRIPTION="Symfony Filesystem Component"
 HOMEPAGE="https://github.com/symfony/filesystem;
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/symfony/filesystem/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*
dev-php/fedora-autoloader"



[gentoo-commits] repo/gentoo:master commit in: dev-php/ca-bundle/

2019-08-16 Thread Brian Evans
commit: a2214a1d76ecdee8462689bdc84e8b590184aead
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:14:21 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2214a1d

dev-php/ca-bundle: Remove HOMEPAGE from SRC_URI

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/ca-bundle/ca-bundle-1.1.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild 
b/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
index 164c183e94b..19d43507a5f 100644
--- a/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
+++ b/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
 HOMEPAGE="https://github.com/composer/ca-bundle;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-php/theseer-tokenizer/

2019-08-16 Thread Brian Evans
commit: 0d442a518c16d6621c1e0ffa4bf2f94b131f4a4a
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 14:16:59 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d442a51

dev-php/theseer-tokenizer: Remove HOMEPAGE from SRC_URI; Add RESTRICT

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild 
b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
index 2f736a8e864..dfed89b2df7 100644
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Convert tokenized PHP source code into XML and other formats"
 HOMEPAGE="https://github.com/theseer/tokenizer;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/tokenizer-${PV}"
 



[gentoo-commits] repo/gentoo:master commit in: dev-php/jsonlint/

2019-08-16 Thread Brian Evans
commit: 2275b34963cbf83984e07fe1f623a2037a6c4cea
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:34:00 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2275b349

dev-php/jsonlint: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/jsonlint/Manifest  |  1 -
 dev-php/jsonlint/jsonlint-1.6.0.ebuild | 40 --
 2 files changed, 41 deletions(-)

diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest
index c848c5894bb..3c259a33e1c 100644
--- a/dev-php/jsonlint/Manifest
+++ b/dev-php/jsonlint/Manifest
@@ -1,2 +1 @@
-DIST jsonlint-1.6.0.tar.gz 11327 BLAKE2B 
481744188c6aa8a3135fc76c1026fce75df9ceaf939db9cb88f323afae27bf5041a56d3a63618ef497dc1e8f0606a8b8c24651fab566bb421d12d0ac5853ad15
 SHA512 
16538781807a4ca73de83e7be69d0fc2b530dd9b25f2b9a2ee3f1156dd5ebccb79e9489b873f307718ca2da658a1ae7cef5144adb32f2d1e5c34bd192d496c79
 DIST jsonlint-1.7.1.tar.gz 11813 BLAKE2B 
ed1a1404cf77d526a5dce15d0a3f36c5ff8c691e3d2560b6b5e309108d6f0072988b292fd1410b48bfad4ba528abd854204c38bf36f5196c7d8beb468716a5db
 SHA512 
dd8380d02591997a129dc8f25f3b2f7c2f00c1d280bdce6551079b564b54b4828beb929bd9a7c608be6429754eb1c33d2d655a0f87b8f671ccf26ee2ae46095d

diff --git a/dev-php/jsonlint/jsonlint-1.6.0.ebuild 
b/dev-php/jsonlint/jsonlint-1.6.0.ebuild
deleted file mode 100644
index ea1e8f975dc..000
--- a/dev-php/jsonlint/jsonlint-1.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="JSON Lint for PHP"
-HOMEPAGE="https://github.com/Seldaek/jsonlint;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-   dev-lang/php:*
-   dev-php/fedora-autoloader"
-DEPEND="
-   test? (
-   ${RDEPEND}
-   dev-php/phpunit )"
-
-src_prepare() {
-   default
-   if use test; then
-   cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-   sed -i -e "s:__DIR__:'${S}/src/Seld/JsonLint':" 
"${S}"/autoload-test.php || die
-   fi
-}
-
-src_install() {
-   insinto "/usr/share/php/Seld/JsonLint"
-   doins -r src/Seld/JsonLint/. "${FILESDIR}"/autoload.php
-   dodoc README.mdown
-}
-
-src_test() {
-   phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/composer/

2019-08-16 Thread Brian Evans
commit: 895139459102bb018c0978c2c1c4b4836cbfb9d9
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:23:28 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89513945

dev-php/composer: Remove HOMEPAGE from SRC_URI; add RESTRICT on test

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/composer/composer-1.8.6.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-php/composer/composer-1.8.6.ebuild 
b/dev-php/composer/composer-1.8.6.ebuild
index 2c139b8b882..d39d5769d38 100644
--- a/dev-php/composer/composer-1.8.6.ebuild
+++ b/dev-php/composer/composer-1.8.6.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 DESCRIPTION="Dependency Manager for PHP"
 HOMEPAGE="https://github.com/composer/composer;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
dev-lang/php:*[curl]



[gentoo-commits] repo/gentoo:master commit in: dev-php/maxmind-db-reader/, dev-php/maxmind-db-reader/files/

2019-08-16 Thread Brian Evans
commit: d9cf12bb35d29d42d77658681d924f2a4999b951
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:39:44 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9cf12bb

dev-php/maxmind-db-reader: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/maxmind-db-reader/Manifest |  2 -
 dev-php/maxmind-db-reader/files/autoload.php   |  6 --
 .../maxmind-db-reader-1.2.0.ebuild | 76 -
 .../maxmind-db-reader-1.3.0.ebuild | 77 --
 4 files changed, 161 deletions(-)

diff --git a/dev-php/maxmind-db-reader/Manifest 
b/dev-php/maxmind-db-reader/Manifest
index 154db8897aa..668eacd1cc9 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1 @@
-DIST MaxMind-DB-Reader-php-1.2.0.tar.gz 17488 BLAKE2B 
2a511f84091ade374eb5b9a975fa6dafe75d69c4c057113790492840acfb9b8e50137bf4927814d8d77b2e17f4e0a7fe1ffda511f7c599a604bc69d4f38af406
 SHA512 
2965c5348ec787e503c04322961b00fe7806cd95c5f711efd9833adc0acb21f0c40cab1983868f8ea0bb4e8576186d83e1e1913b203aab999f3870ea298a9b2a
-DIST MaxMind-DB-Reader-php-1.3.0.tar.gz 18573 BLAKE2B 
6f093b4343438d37a44639dd47d4c149bcfdd351b9fe68eb19c1b739a28e7c7605728e47471cc7d5d257d56df5da37b5ffd32c275cb705befe9e6d60a137ac46
 SHA512 
480fb38122d1700b18bb0b85d8062397ddc7f003897829f3533901c12a409d76eea9d499ffc0fdd1bfaf4d35b954a30606a053b78e787eda27771995e2a1800b
 DIST MaxMind-DB-Reader-php-1.4.1.tar.gz 19667 BLAKE2B 
b397eb1bb7fa00c3382c7ee7c019c401d390c88d9bccd7742873445e95cb87d780ac17affe5cd1ec98e6f60d16660784dc5fdb188f8e4d2956df816397a9c251
 SHA512 
2407f3d1af10830078c9f5ba93ee74761084b06e630242eff0f707b98bdb78e6e87dabc999c36b29780ba9c8c38aec022575b66d95b3707bdc06875c6dd5

diff --git a/dev-php/maxmind-db-reader/files/autoload.php 
b/dev-php/maxmind-db-reader/files/autoload.php
deleted file mode 100644
index 45e8c2dfba3..000
--- a/dev-php/maxmind-db-reader/files/autoload.php
+++ /dev/null
@@ -1,6 +0,0 @@
-https://github.com/maxmind/${MY_PN};
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="extension test"
-
-COMMON_DEPEND="extension? ( dev-libs/libmaxminddb )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-   dev-php/fedora-autoloader"
-
-src_prepare(){
-   # We need to call eapply_user ourselves, because it may be skipped
-   # if either the "extension" USE flag is not set, or if the user's
-   # PHP_TARGETS is essentially empty. In the latter case, the eclass
-   # src_prepare does nothing. We only call the eclass phase conditionally
-   # because the correct version of e.g. "phpize" may not be there
-   # unless USE=extension is set.
-   eapply_user
-   use extension && php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-   # The eclass phase will try to run the ./configure script even if it
-   # doesn't exist (in contrast to the default src_configure), so we
-   # need to skip it if the eclass src_prepare (that creates said
-   # script) is not run.
-   use extension && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-   # Avoids the same problem as in src_configure.
-   use extension && php-ext-source-r3_src_compile
-}
-
-src_install() {
-   dodoc CHANGELOG.md README.md
-   insinto /usr/share/php
-   doins -r src/MaxMind
-   insinto /usr/share/php/MaxMind/Db
-   doins "${FILESDIR}/autoload.php"
-
-   use extension && php-ext-source-r3_src_install
-}
-
-src_test() {
-   # The PHP API has its own set of tests that isn't shipped with the
-   # release tarballs at the moment (github issues 55).
-   use extension && php-ext-source-r3_src_test
-}
-
-pkg_postinst(){
-   elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
-   elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
-   elog "and then most of the examples in the documentation should"
-   elog "work without further modification."
-}

diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild 
b/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild
deleted file mode 100644
index 7d53d3fc64d..000
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="MaxMind-DB-Reader-php"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-PHP_EXT_S="${S}/ext"
-PHP_EXT_NAME="maxmind

[gentoo-commits] repo/gentoo:master commit in: dev-php/jsonlint/

2019-08-16 Thread Brian Evans
commit: 74a0a1e39fc684db2a2570b48ad7954c51aecdb5
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:36:35 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74a0a1e3

dev-php/jsonlint: Remove HOMEPAGE from SRC_URI

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/jsonlint/jsonlint-1.7.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/jsonlint/jsonlint-1.7.1.ebuild 
b/dev-php/jsonlint/jsonlint-1.7.1.ebuild
index ae2c9d17871..4085b18b49f 100644
--- a/dev-php/jsonlint/jsonlint-1.7.1.ebuild
+++ b/dev-php/jsonlint/jsonlint-1.7.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="JSON Lint for PHP"
 HOMEPAGE="https://github.com/Seldaek/jsonlint;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-php/phar-io-manifest/

2019-08-16 Thread Brian Evans
commit: 48fed25ef3dbeb08fa7995287b897fdba6795f4e
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:49:27 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48fed25e

dev-php/phar-io-manifest: Remove HOMEPAGE from SRC_URI

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild 
b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
index 7287044db58..ce651fab76f 100644
--- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
+++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
 HOMEPAGE="https://github.com/phar-io/manifest;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-php/symfony-filesystem/files/, dev-php/symfony-filesystem/

2019-08-16 Thread Brian Evans
commit: 5fd1a4e98541b9c1bea55baf904fc80eca5dc833
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 14:01:42 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd1a4e9

dev-php/symfony-filesystem: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/symfony-filesystem/Manifest|  1 -
 .../files/annotate-network-tests.patch | 27 --
 .../symfony-filesystem-3.2.8.ebuild| 41 --
 3 files changed, 69 deletions(-)

diff --git a/dev-php/symfony-filesystem/Manifest 
b/dev-php/symfony-filesystem/Manifest
index 717b7682665..5442b6d1d3f 100644
--- a/dev-php/symfony-filesystem/Manifest
+++ b/dev-php/symfony-filesystem/Manifest
@@ -1,2 +1 @@
-DIST symfony-filesystem-3.2.8.tar.gz 17361 BLAKE2B 
8ce4fd987ee7e0609433de8428b849645a9c8372029e0a075d3070786441577c5413e1a2f13e1581afc90cb69fe04c2b64e75de3e23ea532dd7ffd63e2bd8ee2
 SHA512 
b9464dec0c5100877bb7178a118ab34e9893307df371e9a9f8df8d69e59b6e14c9f7143e4eaf5b47662f69dce1b5fa975b6bb78e93a5c7455eb44dacfaab82e8
 DIST symfony-filesystem-3.4.28.tar.gz 19238 BLAKE2B 
dcb9752a5691834aa87b3866b6c2f53b54d5953cf721547cf3ae8aa03e826bcacb2393f324bf9a767013a2daebcf9654c7ce18822ac40758d96b35b174b8ab6d
 SHA512 
4a2e19bf6df69396e503e2d9b37e9deaaba5eb4fa95857b7b19e1ce073462d2ca18442b6cc1c30021f925d0878f635aa9bc1c5de55318f0c521a291efcc8

diff --git a/dev-php/symfony-filesystem/files/annotate-network-tests.patch 
b/dev-php/symfony-filesystem/files/annotate-network-tests.patch
deleted file mode 100644
index 38c83753195..000
--- a/dev-php/symfony-filesystem/files/annotate-network-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cda6fa8801d04b149592c5789c0d060c4ca4e9db Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky 
-Date: Wed, 3 May 2017 18:33:56 -0400
-Subject: [PATCH 1/1] Annotate the one network test as being a part of the
- "network" group.
-

- Tests/FilesystemTest.php | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
-index 1341392..a862fa8 100644
 a/Tests/FilesystemTest.php
-+++ b/Tests/FilesystemTest.php
-@@ -156,6 +156,9 @@ class FilesystemTest extends FilesystemTestCase
- $this->assertEquals('SOURCE FILE', 
file_get_contents($targetFilePath));
- }
- 
-+/**
-+ * @group network
-+ */
- public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
- {
- $sourceFilePath = 
'http://symfony.com/images/common/logo/logo_symfony_header.png';
--- 
-2.10.2
-

diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild 
b/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
deleted file mode 100644
index 942c49c4b13..000
--- a/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Symfony Filesystem Component"
-HOMEPAGE="https://github.com/symfony/filesystem;
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-lang/php:*
-   dev-php/fedora-autoloader"
-DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
-
-S="${WORKDIR}/filesystem-${PV}"
-
-# This patch is https://github.com/symfony/symfony/pull/22630
-PATCHES=( "${FILESDIR}/annotate-network-tests.patch" )
-
-src_prepare() {
-   default
-   if use test; then
-   cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
-   fi
-}
-
-src_install() {
-   insinto "/usr/share/php/Symfony/Component/Filesystem"
-   doins -r Exception
-   doins *.php "${FILESDIR}/autoload.php"
-   dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-   phpunit --bootstrap "${S}/autoload-test.php" \
-   --exclude-group network || die 'test suite failed'
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/maxmind-db-reader/

2019-08-16 Thread Brian Evans
commit: 1e420947b668b639bd4e0ee45bfbb0030acb5c72
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:43:00 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e420947

dev-php/maxmind-db-reader: Fix SRC_URI; Drop 7-0; RESTRICT on USE test

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild 
b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
index e5bac06988f..5663a274a2d 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
@@ -10,18 +10,19 @@ PHP_EXT_S="${S}/ext"
 PHP_EXT_NAME="maxminddb"
 PHP_EXT_OPTIONAL_USE="extension"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
 
 inherit php-ext-source-r3
 
 DESCRIPTION="PHP reader for the MaxMind database format"
 HOMEPAGE="https://github.com/maxmind/${MY_PN};
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="extension test"
+RESTRICT="!test? ( test )"
 
 DEPEND="extension? ( dev-libs/libmaxminddb )"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/json-schema/

2019-08-16 Thread Brian Evans
commit: b87bd09efd7a8138acab94793a030a312d4fca80
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:30:11 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87bd09e

dev-php/json-schema: Remove HOMEPAGE from SRC_URI

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/json-schema/json-schema-5.2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/json-schema/json-schema-5.2.8.ebuild 
b/dev-php/json-schema/json-schema-5.2.8.ebuild
index c1115fb6ccc..0c8201a0dd7 100644
--- a/dev-php/json-schema/json-schema-5.2.8.ebuild
+++ b/dev-php/json-schema/json-schema-5.2.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="PHP implementation of JSON schema"
 HOMEPAGE="https://github.com/justinrainbow/json-schema;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/justinrainbow/json-schema/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-php/symfony-process/

2019-08-16 Thread Brian Evans
commit: 0d0617ff7d73f4df3735461b7ddbe4f0c4b2dc9c
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 14:13:07 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0617ff

dev-php/symfony-process: Remove HOMEPAGE from SRC_URI

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/symfony-process/symfony-process-3.4.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/symfony-process/symfony-process-3.4.29.ebuild 
b/dev-php/symfony-process/symfony-process-3.4.29.ebuild
index 75fe9dd83fc..27f884f7d55 100644
--- a/dev-php/symfony-process/symfony-process-3.4.29.ebuild
+++ b/dev-php/symfony-process/symfony-process-3.4.29.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Symfony Process Component"
 HOMEPAGE="https://github.com/symfony/process;
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/symfony/process/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-php/phar-io-version/

2019-08-16 Thread Brian Evans
commit: 4553d078f1e19249879e5b439fea250c56d5f385
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:55:53 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4553d078

dev-php/phar-io-version: Remove HOMEPAGE from SRC_URI

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/phar-io-version/phar-io-version-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild 
b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
index 2a2ba341e41..c0576cc49ef 100644
--- a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
+++ b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Library for handling version information and constraints"
 HOMEPAGE="https://github.com/phar-io/version;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/phar-io/version/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-php/json-schema/

2019-08-16 Thread Brian Evans
commit: 80bcbe023973d840f0ae1a69cdcb16f71ba3b1bc
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:27:53 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bcbe02

dev-php/json-schema: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/json-schema/Manifest |  2 --
 dev-php/json-schema/json-schema-4.1.0.ebuild | 40 
 dev-php/json-schema/json-schema-5.2.7.ebuild | 40 
 3 files changed, 82 deletions(-)

diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest
index 7af2bc15113..50eaebbc2f8 100644
--- a/dev-php/json-schema/Manifest
+++ b/dev-php/json-schema/Manifest
@@ -1,3 +1 @@
-DIST json-schema-4.1.0.tar.gz 24772 BLAKE2B 
181c584c3c2e0bb7b2f19ef40ae588e470169a4498a47fbd3fcae60d7bb1bb21ac4ab82ce295e487098719fca9004090142d992a296a1b5599fb909b0171
 SHA512 
5c6bda8c34012bc20d9bf604a6183d50f451327bded70d94415450d2b3cc8e7f6f416ddd8b13db0aeb487fe031fe3185aebd9c97e4c1f79c866dcbc3463f64d0
-DIST json-schema-5.2.7.tar.gz 31388 BLAKE2B 
b0ce5a9f958effe7d8040c57501841225865eee0d67f56d0eec6aca0c93557b526d51ae35d04a5bd2c066066c1ccdfb00954e6aed866c6d225260ca4a5f73f56
 SHA512 
fe3b436ea3c29719244fb29e11c37b505fa46845704b9153b1e195147c0b3da39d5d69c61e1b2d89de1ef56bfd51be3552e91cc5dd41a08a8a036e62c29ba197
 DIST json-schema-5.2.8.tar.gz 31179 BLAKE2B 
fc422b4ea632299308fe44104ed66365441879441446d47bad1da89182da0c1aba04877c279577fe7e8fc9f82e4677bc78a4f4fa1893362d2b93e8743a08
 SHA512 
04a96413a12979ee42cc72dc7d6cd73ab26472c46cffa1ce65d7e2338867ec6cce48da5a058d4c8bb849a8fae72376272b814f3a808ed3374af9c98eb8674fe5

diff --git a/dev-php/json-schema/json-schema-4.1.0.ebuild 
b/dev-php/json-schema/json-schema-4.1.0.ebuild
deleted file mode 100644
index 9412e627e0e..000
--- a/dev-php/json-schema/json-schema-4.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="PHP implementation of JSON schema"
-HOMEPAGE="https://github.com/justinrainbow/json-schema;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# Tests are not in the release tarball
-RESTRICT="test"
-
-RDEPEND="
-   dev-lang/php:*
-   dev-php/fedora-autoloader"
-DEPEND="
-   test? (
-   ${RDEPEND}
-   dev-php/phpunit )"
-
-src_prepare() {
-   default
-   if use test; then
-   cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-   fi
-}
-
-src_install() {
-   insinto "/usr/share/php/JsonSchema"
-   doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php
-   dodoc README.md
-}
-
-src_test() {
-   phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}

diff --git a/dev-php/json-schema/json-schema-5.2.7.ebuild 
b/dev-php/json-schema/json-schema-5.2.7.ebuild
deleted file mode 100644
index abb217de97e..000
--- a/dev-php/json-schema/json-schema-5.2.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PHP implementation of JSON schema"
-HOMEPAGE="https://github.com/justinrainbow/json-schema;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# Tests are not in the release tarball
-RESTRICT="test"
-
-RDEPEND="
-   dev-lang/php:*
-   dev-php/fedora-autoloader"
-DEPEND="
-   test? (
-   ${RDEPEND}
-   dev-php/phpunit )"
-
-src_prepare() {
-   default
-   if use test; then
-   cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-   fi
-}
-
-src_install() {
-   insinto "/usr/share/php/JsonSchema"
-   doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php
-   dodoc README.md
-}
-
-src_test() {
-   phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/phar-io-version/

2019-08-16 Thread Brian Evans
commit: 658968eeabd67d3f70b7019c3f7c32dd4aa7ad91
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:53:55 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658968ee

dev-php/phar-io-version: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/phar-io-version/Manifest   |  1 -
 .../phar-io-version/phar-io-version-1.0.1.ebuild   | 25 --
 2 files changed, 26 deletions(-)

diff --git a/dev-php/phar-io-version/Manifest b/dev-php/phar-io-version/Manifest
index c9f122b7f3e..941d13b52f3 100644
--- a/dev-php/phar-io-version/Manifest
+++ b/dev-php/phar-io-version/Manifest
@@ -1,2 +1 @@
-DIST phar-io-version-1.0.1.tar.gz 8686 BLAKE2B 
2cb7208f24ebce981b1b487170d8f07fd43c6dc53782e2797c3172736255e29863aa832d8e63f59e9f941fc154a1e3ebc6452437641f92521f84ddfdf2d3e6ec
 SHA512 
c3bd6e7426bbac99c2b7028d86429f954daafebb7aea3c969305035ce5fc98c3d718f34efbf36658442bb4f60518dbb8217c314f2a3afd429e037120cc7428d9
 DIST phar-io-version-2.0.1.tar.gz 10348 BLAKE2B 
22a4f8426c14662781534e63ddb62e4e783fe563ae061c0c3ae87960e0c649d68adff9b19e4388e9aafc52184aa273e8ecc5df08f16e0918258a2a4862950181
 SHA512 
068d872ecafc3491c7cd27068fa2b35cf1d7e3abe21649677c935e897b6582d2efcdcbcef71a00f3b9b416320f6139c671411821ad41e3b7c906fac5288646ec

diff --git a/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild 
b/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
deleted file mode 100644
index 6a4c90ec3d5..000
--- a/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for handling version information and constraints"
-HOMEPAGE="https://github.com/phar-io/version;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/version-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-   dev-lang/php:*"
-
-src_install() {
-   insinto /usr/share/php/PharIo/Version
-   doins src/*.php
-   doins "${FILESDIR}/autoload.php"
-   dodoc README.md
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/phar-io-manifest/

2019-08-16 Thread Brian Evans
commit: e5d6af11d122ea04ac27823e6538ee9e5db017cf
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:47:16 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d6af11

dev-php/phar-io-manifest: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/phar-io-manifest/Manifest  |  1 -
 .../phar-io-manifest/phar-io-manifest-1.0.1.ebuild | 27 --
 2 files changed, 28 deletions(-)

diff --git a/dev-php/phar-io-manifest/Manifest 
b/dev-php/phar-io-manifest/Manifest
index f5d78ab77fe..cb5837a1cb2 100644
--- a/dev-php/phar-io-manifest/Manifest
+++ b/dev-php/phar-io-manifest/Manifest
@@ -1,2 +1 @@
-DIST phar-io-manifest-1.0.1.tar.gz 21403 BLAKE2B 
0f18d94d127ec54914cb60756fd3e75c2d13ec593b7101735e385e4515abf4da0f03ef94d0bbbfaee02f348309525504f5e99e150a68b0d0fcd2129ccade4541
 SHA512 
3e4dd7ddd6de0a9f70595d0d8a6721782d2584526d3d4649cf0338ab36f106798daf4b7dcbf5bd972893a1569b622e4217212e5812b14e4bf3f698504f4d2228
 DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 
48fb8858ea6c89415e78da399e2d3b6660e1857958094bf5e6c42465cfc32e34122ec1ab6e413f36f48e288ef40af7b85f93c80e6a2cfa547a166557de04ec97
 SHA512 
f8f9a6d4b761b739ec24a9f94ae5d4ac74f7276621675e3f3c7c3085aa7662c73cc703b1c86531d327199cf42074bb19446c14f78a3c8a888b1d236dc59bed94

diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild 
b/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild
deleted file mode 100644
index c70be9f4ebe..000
--- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
-HOMEPAGE="https://github.com/phar-io/manifest;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples"
-
-S="${WORKDIR}/manifest-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-   dev-php/phar-io-version
-   dev-lang/php:*[phar]"
-
-src_install() {
-   insinto /usr/share/php/PharIo/Manifest
-   doins -r src/*
-   doins "${FILESDIR}/autoload.php"
-   dodoc README.md
-   use examples && dodoc -r examples
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/ca-bundle/

2019-08-16 Thread Brian Evans
commit: ad60fb683bfefc97c29f433e29c97035a5d20a2c
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:15:43 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad60fb68

dev-php/ca-bundle: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/ca-bundle/Manifest   |  2 --
 dev-php/ca-bundle/ca-bundle-1.0.3.ebuild | 22 --
 dev-php/ca-bundle/ca-bundle-1.1.2.ebuild | 22 --
 3 files changed, 46 deletions(-)

diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
index 144a4df96e9..869046bf79d 100644
--- a/dev-php/ca-bundle/Manifest
+++ b/dev-php/ca-bundle/Manifest
@@ -1,3 +1 @@
-DIST ca-bundle-1.0.3.tar.gz 151659 BLAKE2B 
a8755af7041a1e093d06f6bf3bfdcd7461bd50ab5347f48285fb6e69d6e621c82c458c73625ed36d6745e91b0c7fabae37318da3674c47bb2813b78aa9483379
 SHA512 
e33629345d63121b7a6a46b0812afefad5adbc24fd5516eeb7471dd93b7e4126f144b6fc933b526796607fdc3fc9a99f5703188e15d905654d629591c555ad86
-DIST ca-bundle-1.1.2.tar.gz 129296 BLAKE2B 
54912144510c7d2c09647540542cdaba24ae9ce1638c74d1f796bee7e82a7161c11ad8561aae6290c13c8e818acae55cfcab3d75d0572906632c6ca456376068
 SHA512 
4ab7ee419fe0a45b526fe985ecf87f2c8834538c21d008736b8daceec987caf87f525d60208639ade66c39d2fd3c774f54f0bf784cadbd5c81954e8df48ab058
 DIST ca-bundle-1.1.3.tar.gz 126613 BLAKE2B 
6b1013c2544f8795a4d054c6807cc2a2c51d03547f0d404def311d7edde9891f27ca1a249bef90e10f129a85f0dea489e1fc933b4c5f3bd8213c3428dba588d2
 SHA512 
b3e1f6bc9196b6c70476a7b656fb3dc4d398cd033d223b436d50676f228b62b561075787df36b880b7b4eb7de677da19d3e597752f88f279279b8569cc865a5f

diff --git a/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild 
b/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild
deleted file mode 100644
index 95b1abf4025..000
--- a/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
-HOMEPAGE="https://github.com/composer/ca-bundle;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   dev-lang/php:*
-   dev-php/fedora-autoloader"
-
-src_install() {
-   insinto /usr/share/php/Composer/CaBundle
-   doins src/CaBundle.php "${FILESDIR}/autoload.php"
-   dodoc README.md
-}

diff --git a/dev-php/ca-bundle/ca-bundle-1.1.2.ebuild 
b/dev-php/ca-bundle/ca-bundle-1.1.2.ebuild
deleted file mode 100644
index 60dc4ddfdae..000
--- a/dev-php/ca-bundle/ca-bundle-1.1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
-HOMEPAGE="https://github.com/composer/ca-bundle;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   dev-lang/php:*
-   dev-php/fedora-autoloader"
-
-src_install() {
-   insinto /usr/share/php/Composer/CaBundle
-   doins src/CaBundle.php "${FILESDIR}/autoload.php"
-   dodoc README.md
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/semver/

2019-08-16 Thread Brian Evans
commit: d2ce7d9b5fcea3d0cef1f8c4006be6b0275741cb
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:58:09 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ce7d9b

dev-php/semver: Remove HOMEPAGE from SRC_URI

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/semver/semver-1.4.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/semver/semver-1.4.2.ebuild 
b/dev-php/semver/semver-1.4.2.ebuild
index 21aed1b2790..98683b0d625 100644
--- a/dev-php/semver/semver-1.4.2.ebuild
+++ b/dev-php/semver/semver-1.4.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking"
 HOMEPAGE="https://github.com/composer/semver;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-php/composer/, dev-php/composer/files/

2019-08-16 Thread Brian Evans
commit: a5803c8fe33f8fbac21ed1fd114197f8f4978ffb
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 13:20:43 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 14:17:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5803c8f

dev-php/composer: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/composer/Manifest  |  7 -
 dev-php/composer/composer-1.6.3.ebuild | 46 -
 dev-php/composer/composer-1.6.5.ebuild | 46 -
 dev-php/composer/composer-1.7.2.ebuild | 46 -
 dev-php/composer/composer-1.7.3.ebuild | 46 -
 dev-php/composer/composer-1.8.0.ebuild | 46 -
 dev-php/composer/composer-1.8.3.ebuild | 47 --
 dev-php/composer/composer-1.8.4.ebuild | 47 --
 dev-php/composer/files/autoload.php| 28 
 9 files changed, 359 deletions(-)

diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 1f0adaeaa3f..7b7890d9a3d 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,8 +1 @@
-DIST composer-1.6.3.tar.gz 396955 BLAKE2B 
ee455c8ff7446fe2b51180c1c719a28a5efd30b24ba0f521ce07b02007bfaad15aea4d45b2a381d4a3abef123ce67077f8bf0bc3bee447752f3ab87bb6a5d46b
 SHA512 
d373afe1bf8a5572f1d0bf3451d29ef1ea41f96a5fe54789e906601229d9366536ff0abdc7e0afa7cd14b22ccecf9ddf8b32fec14d4cd6fb308b878034af374c
-DIST composer-1.6.5.tar.gz 398169 BLAKE2B 
e89fb8805a58d031d4ba1e9694fb45eefa734d5ed79e1bd7c6aef02bf8a52ace19ed7fa109270d67af973f6892a45122017bc42bbd115245dc521e4720b5a549
 SHA512 
5f18a43af0b94006f4d553f03574347c7f279c409e3467ee65dfff12dad810d625a06452208e2024479faa0b1608ce122a293810e69b826667072171de7d905a
-DIST composer-1.7.2.tar.gz 401211 BLAKE2B 
b3470a45dcffe8758c3e498a6298f726928a03d297eefa182b823c5c263aca3492f2b3514528c3bb252100cd2f2b64d5a46a74c91cba76823d75433d1ae5c762
 SHA512 
c6cdb3c122c78383ea5f133bf54d44474c13e343e25e8ac4992e8d213f7645221009b20def194de8d91217f3f9105a7a3b601ab86206ce4c376b028dcb181151
-DIST composer-1.7.3.tar.gz 402233 BLAKE2B 
b9ae601e5710f12acd6da189a64217fee0198a0eb14227d905b3faab1dd5a4e6b573c4be89968f3b66b4e5612189fc7c284c2aa7d63c2247bce1cc56913acc5f
 SHA512 
7dd6200abdae845e71bc9cb9d329547ee82a3186db93b535af92bdf01d5e0fecc1d7f7ddcbce54c05e60cf75dea9aba0f27ad86746b61b2301effe8d4c115949
-DIST composer-1.8.0.tar.gz 404169 BLAKE2B 
977d04d3477e0660eb33e4cb746a5f7cf1cc15544b0afdc48ce7dc7774750b685c36db7796280dd825e2b5b5d310f65521a6c12ca92ca9d2b15c2213c64bec4f
 SHA512 
d8589c75174fd36f5ce10c8f4e18045b8c86167ccc7d6cadb4eed8828d4d7b4b44b0b477b6bd0ebf6d0981a381b35f662205d6b4324c92c86ea3fbc8c3aeb6e4
-DIST composer-1.8.3.tar.gz 405927 BLAKE2B 
00be1624fb96212edffd7059b718e74ed69643810de2ddfd6ffa1fb16ac689d2298d420452e7461bb427cc2e8186f4d2c9be072054fe7310bc74c32b80a1a497
 SHA512 
bb3ddcddcd30c211deae5a75fdfb178c39f0714efd59cb2a4abebdcdc9e18cf9437cae26ed21881fe06278472c150de2935f70b48c3f3c5d7e2a1ea92ee26605
-DIST composer-1.8.4.tar.gz 406561 BLAKE2B 
2521da6a50371102c2a8bf61aeeba0c5846692dcbaaa13e83d09a42480c518f91889bd6d6461aef60958d1f68801f77a646c7940c5992a8da25adf050550050b
 SHA512 
b1061fd190b05d2fc309ff76bf246f6d02547249fe52c347715c2dc2e4f5149b3c4e4f43f255874749caeb44ce05cfcbdb8da1d96a9f88a2213a9601e123ef9c
 DIST composer-1.8.6.tar.gz 409002 BLAKE2B 
15d9621e062646b81518aff816a3e0b187bf1d9cd617c32e3a19167ba0c89b9ee8f55503e7d2e6d3515939f7d50131c5be0786fc04518409584960290eb32118
 SHA512 
97ab93acba24307897fe64b3762e77ebca9fa794c5eb476a9d774feb124dbd53b090c36b0fa9d1da38ea26d13af8bf13d7bc733c9c465fba6b908e590ea96dbc

diff --git a/dev-php/composer/composer-1.6.3.ebuild 
b/dev-php/composer/composer-1.6.3.ebuild
deleted file mode 100644
index 4edcaf35368..000
--- a/dev-php/composer/composer-1.6.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   dev-lang/php:*[curl]
-   >=dev-php/ca-bundle-1.0.0
-   >=dev-php/cli-prompt-1.0.0
-   >=dev-php/psr-log-1.0.2
-   dev-php/fedora-autoloader
-   >=dev-php/json-schema-3.0.0
-   >=dev-php/jsonlint-1.4.0
-   >=dev-php/phar-utils-1.0.0
-   >=dev-php/semver-1.0.0
-   >=dev-php/spdx-licenses-1.2.0
-   >=dev-php/symfony-console-2.7.9
-   >=dev-php/symfony-filesystem-2.7.20
-   >=dev-php/symfony-finder-2.7.20
-   >=dev-php/symfony-process-2.8.12"
-
-src_install() {
-   insi

[gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Cache_Lite/

2019-08-16 Thread Brian Evans
commit: 02c64fa4b093db349c279212bb13c625e67e34e1
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 12:47:53 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 12:57:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c64fa4

dev-php/PEAR-Cache_Lite: Fix conditional test RESTRICT

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild 
b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
index 460d3047f13..4c7a3877208 100644
--- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,6 +10,7 @@ DESCRIPTION="Fast and safe little cache system"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
 DEPEND="test? ( ${RDEPEND} )"



[gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Config/

2019-08-16 Thread Brian Evans
commit: 68bb219125dd960d6a3566dc42c148c01694f4cd
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 16 12:53:47 2019 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Aug 16 12:57:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68bb2191

dev-php/PEAR-Config: Fix conditional test RESTRICT

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild 
b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
index fd949ea89cf..441cc05883f 100644
--- a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
+++ b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="PHP-2.02"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test xml"
+RESTRICT="!test? ( test )"
 RDEPEND="xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util )"
 DEPEND="test? ( ${RDEPEND} )"
 
SRC_URI="https://github.com/pear/Config/archive/606a24034ad80f9d6ccb5a8b698b702b392e4674.tar.gz
 -> ${PEAR_P}.tar.gz"



  1   2   3   4   5   6   7   8   9   10   >