summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-php/libphutil/libphutil-20170929.ebuild10
-rw-r--r--dev-php/libphutil/libphutil-9999.ebuild10
2 files changed, 6 insertions, 14 deletions
diff --git a/dev-php/libphutil/libphutil-20170929.ebuild b/dev-php/libphutil/libphutil-20170929.ebuild
index 0629a72d..aeec1f29 100644
--- a/dev-php/libphutil/libphutil-20170929.ebuild
+++ b/dev-php/libphutil/libphutil-20170929.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,11 +23,7 @@ DEPEND="!${CATEGORY}/${PN}:0
=www-client/arcanist-20170922:stable
dev-lang/php[cli]
)"
-RDEPEND="|| (
- dev-lang/php:5.6[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
- dev-lang/php:7.1[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
- )
- !!dev-lang/php:7.0"
+RDEPEND="dev-lang/php[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
src_prepare() {
default
@@ -119,7 +115,7 @@ src_install() {
if use test ; then
fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
- dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
+ dosym "../share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
fi
# Make executable all shebanged files
diff --git a/dev-php/libphutil/libphutil-9999.ebuild b/dev-php/libphutil/libphutil-9999.ebuild
index 2df86ba7..372a3764 100644
--- a/dev-php/libphutil/libphutil-9999.ebuild
+++ b/dev-php/libphutil/libphutil-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,11 +21,7 @@ DEPEND="!${CATEGORY}/${PN}:stable
=www-client/arcanist-${PV}:0
dev-lang/php[cli]
)"
-RDEPEND="|| (
- dev-lang/php:5.6[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
- dev-lang/php:7.1[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
- )
- !!dev-lang/php:7.0"
+RDEPEND="dev-lang/php[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
src_prepare() {
default
@@ -117,7 +113,7 @@ src_install() {
if use test ; then
fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
- dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
+ dosym "../share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
fi
# Make executable all shebanged files