Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-apcu/
Date: Thu, 23 Jun 2016 20:04:58
Message-Id: 1466712282.af90b6c10c91c005459c57e5ba9c0170781effac.grknight@gentoo
1 commit: af90b6c10c91c005459c57e5ba9c0170781effac
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 23 20:02:40 2016 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 23 20:04:42 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af90b6c1
7
8 dev-php/pecl-apcu: Version bump to new slot
9
10 This version allows both apcu to install to 5.6 and 7.0
11
12 Package-Manager: portage-2.3.0
13
14 dev-php/pecl-apcu/Manifest | 2 +-
15 ...cl-apcu-5.1.2.ebuild => pecl-apcu-5.1.5.ebuild} | 33 ++++++++++++++--------
16 2 files changed, 22 insertions(+), 13 deletions(-)
17
18 diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
19 index 32dff7b..c3ae488 100644
20 --- a/dev-php/pecl-apcu/Manifest
21 +++ b/dev-php/pecl-apcu/Manifest
22 @@ -1,4 +1,4 @@
23 DIST APCu-4.0.7.tgz 118670 SHA256 178a731ee3435b451f1144bc4a63c9d70d4909a2c434e17c6e07db554df90bd6 SHA512 50db51358c9268cc5fdd0d48fb444be9e9356f1690bc1ae021a9618c8819ce8873bf4502fe87a10467ffda2ef38267ccca2af55152b064400c69a8da92b7e98b WHIRLPOOL 3c721753764d6f3adbf6090710aafdb29d78b3d55e718c0101d7cad993b51d7b335931c61f120f8dad4623fe16cad9f13952367934968599ed15dd9c744b9725
24 DIST apcu-4.0.10.tgz 119264 SHA256 8dee6680924107d2aaf827f9cb8ef0e8e09c47bb38712a3439eddabe3ce41b40 SHA512 8aabd51996270cff98b9e329413f9cfcaa9be33a0df8bf9ad50ac2dfd320e348aee6432b8ecd498e077c490714184a82502ea656d825a5fcab70966780064163 WHIRLPOOL c39d4d0953dc4f5168032641c89292c2efcf514c2afca4f9cf65a35564c169021a0a74543556b6e890972904007c7c846a88d8c3ce2ccc0167a1a74e18779b99
25 DIST apcu-4.0.8.tgz 119062 SHA256 bef4f5ae309526a332e0f6b98f0579a45d6000b928991babe684d4c22432d57d SHA512 990fbf3d6f490eeebf1d28eea5e7b0400c8c4badbfcf5ed1c5fc5b7186c5cd6d4ec87a99a8185e9bb27c64ccd371ca7b4324901f35a84644301e32fd9cfa8ef8 WHIRLPOOL 443f0f0a5a742933a19b22a18aa442587f3a7b75fc5e3739ea5dac9d8e31d9e40c41b8107b4d4953cb33f5baa49761a4d1c52a9f472377a5f7a4019750b08f64
26 -DIST apcu-5.1.2.tgz 108212 SHA256 ed51891990664fffa08417382fd5110d27937cc5715409043444b6bae472b764 SHA512 c237ecab9d24bca11dad55248dc3c96b7870681fcad571752d682e42eeca181e7033669df24d5bc99e232ffa8c77afb1fca6b2f4c2c86596f8b57f0eb9a1d581 WHIRLPOOL 48b85df9cd64404ab0ab345ef7f541bb67b3e67ff5514218ef9608f37f7c09ff5abf8ce6f28efb3a1e7fdb5ba05c285332906ab7826666167ff89f58436e5751
27 +DIST apcu-5.1.5.tgz 109196 SHA256 5f4153fe21745a44f1d92431b05a85c0912bb3235110615db84a4a6e84fb6791 SHA512 ffa3e666f354c8fd2ab163db9c8352066d27a1cd6aebe4d8f374052f14a90dbe752efc27c6e927cbf75fc48b6f673e639b07ceeffc2a68402a778cc6a8b18fbc WHIRLPOOL 53345855c62584f2bcac87c008ac22dc73b330f4ee6df48a9f294b404ceddca476f0187defc8d258a73d254be094845be62def71a8e2087a7506da56b414d9aa
28
29 diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.2.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.5.ebuild
30 similarity index 52%
31 rename from dev-php/pecl-apcu/pecl-apcu-5.1.2.ebuild
32 rename to dev-php/pecl-apcu/pecl-apcu-5.1.5.ebuild
33 index bfb5277..6202e0f 100644
34 --- a/dev-php/pecl-apcu/pecl-apcu-5.1.2.ebuild
35 +++ b/dev-php/pecl-apcu/pecl-apcu-5.1.5.ebuild
36 @@ -9,19 +9,24 @@ PHP_EXT_INI="yes"
37 PHP_EXT_ZENDEXT="no"
38 DOCS="NOTICE README.md TECHNOTES.txt TODO"
39
40 -USE_PHP="php7-0"
41 +# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
42 +# This allows us to depend on the other slot
43 +USE_PHP="php5-6 php7-0"
44
45 inherit php-ext-pecl-r2 confutils
46
47 +# However, we only really build for 7.0; so redefine it here
48 +USE_PHP="php7-0"
49 +
50 KEYWORDS="~amd64 ~x86"
51
52 DESCRIPTION="Stripped down version of APC supporting only user cache"
53 LICENSE="PHP-3.01"
54 -SLOT="0"
55 +SLOT="7"
56 IUSE="+mmap"
57
58 DEPEND=""
59 -RDEPEND="${DEPEND}"
60 +RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
61
62 LOCKS="pthreadmutex pthreadrw spinlock semaphore"
63
64 @@ -44,17 +49,21 @@ src_configure() {
65 }
66
67 src_install() {
68 - php-ext-pecl-r2_src_install
69 + if use php_targets_php7-0 ; then
70 + php-ext-pecl-r2_src_install
71
72 - insinto "${PHP_EXT_SHARED_DIR}"
73 - doins apc.php
74 + insinto /usr/share/php7/apcu
75 + doins apc.php
76 + fi
77 }
78
79 pkg_postinst() {
80 - elog "The apc.php file shipped with this release of pecl-apcu was"
81 - elog "installed into ${PHP_EXT_SHARED_DIR}/."
82 - elog
83 - elog "If you depend on the apc_* functions,"
84 - elog "please install dev-php/pecl-apcu_bc as this extension no longer"
85 - elog "provides backwards compatibility."
86 + if use php_targets_php7-0 ; then
87 + elog "The apc.php file shipped with this release of pecl-apcu was"
88 + elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
89 + elog
90 + elog "If you depend on the apc_* functions,"
91 + elog "please install dev-php/pecl-apcu_bc as this extension no longer"
92 + elog "provides backwards compatibility."
93 + fi
94 }