summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-01-04 17:19:27 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-01-04 17:19:27 +0000
commitfb9640a84cb10ad47b5e0223cf3a87e2a3f4e744 (patch)
tree23e7b4e3a3dece4bcfcd553e48859b1f9a6c0bc0 /app-admin/php-toolkit
parentadd patch to compile with dbus-0.60, remove dbus mask (diff)
downloadgentoo-2-fb9640a84cb10ad47b5e0223cf3a87e2a3f4e744.tar.gz
gentoo-2-fb9640a84cb10ad47b5e0223cf3a87e2a3f4e744.tar.bz2
gentoo-2-fb9640a84cb10ad47b5e0223cf3a87e2a3f4e744.zip
Fix bug #117733.
(Portage version: 2.0.53)
Diffstat (limited to 'app-admin/php-toolkit')
-rw-r--r--app-admin/php-toolkit/ChangeLog9
-rw-r--r--app-admin/php-toolkit/Manifest18
-rw-r--r--app-admin/php-toolkit/files/digest-php-toolkit-1.0-r1 (renamed from app-admin/php-toolkit/files/digest-php-toolkit-1.0)0
-rw-r--r--app-admin/php-toolkit/files/php-select-modules/libsymlink.sh7
-rw-r--r--app-admin/php-toolkit/php-toolkit-1.0-r1.ebuild (renamed from app-admin/php-toolkit/php-toolkit-1.0.ebuild)4
5 files changed, 21 insertions, 17 deletions
diff --git a/app-admin/php-toolkit/ChangeLog b/app-admin/php-toolkit/ChangeLog
index 3e547fe4742d..9b31b380299b 100644
--- a/app-admin/php-toolkit/ChangeLog
+++ b/app-admin/php-toolkit/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-admin/php-toolkit
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/php-toolkit/ChangeLog,v 1.6 2006/01/03 23:03:36 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/php-toolkit/ChangeLog,v 1.7 2006/01/04 17:19:27 chtekk Exp $
+
+*php-toolkit-1.0-r1 (04 Jan 2006)
+
+ 04 Jan 2006; Luca Longinotti <chtekk@gentoo.org>
+ files/php-select-modules/libsymlink.sh, -php-toolkit-1.0.ebuild,
+ +php-toolkit-1.0-r1.ebuild:
+ Fix bug #117733.
03 Jan 2006; Mark Loeser <halcy0n@gentoo.org> php-toolkit-1.0.ebuild:
Adding ~ppc
diff --git a/app-admin/php-toolkit/Manifest b/app-admin/php-toolkit/Manifest
index b5d264979886..399072b4a94c 100644
--- a/app-admin/php-toolkit/Manifest
+++ b/app-admin/php-toolkit/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 da8706099d57dfd37ec96e631017c938 ChangeLog 1214
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-php-toolkit-1.0 0
+MD5 cc8d2bfda0641d102896352d57ac2806 ChangeLog 1417
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-php-toolkit-1.0-r1 0
MD5 4a45245e9b5d4fd45b744f093190a08b files/php-select 8283
MD5 dfd0ee80895ad0838d0d14d7bfb3cd5d files/php-select-modules/apache1.sh 508
MD5 996b58c1298deb31512e75f0a4af1a61 files/php-select-modules/apache2.sh 512
MD5 54965be7111a69cdabe1a7af4925eedb files/php-select-modules/libapache.sh 6160
-MD5 c60d3342a7482d3d7ff8f2314c8c3c66 files/php-select-modules/libsymlink.sh 6395
+MD5 b3f69da2c2a271e2d9b8b96682d4994d files/php-select-modules/libsymlink.sh 6495
MD5 4ecf2a69badd7ba1b12fc497544726f3 files/php-select-modules/php-cgi.sh 452
MD5 e4c69f3c38351cce893f12122cf3262c files/php-select-modules/php-devel.sh 532
MD5 13c38bfdc416d740518637fe1425f467 files/php-select-modules/php.sh 436
MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 80b7013226648f5ba0ec61963b0b63c6 php-toolkit-1.0.ebuild 1019
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDuxeS2+ySkm8kpY0RAnxrAJ9mPj6XnoZp1z1e4c0Bk4coTmTILACfWvss
-GDRtrHw59WMt+DAEHdyenAk=
-=cAxP
------END PGP SIGNATURE-----
+MD5 4360710911a21016ead63c456950c1d6 php-toolkit-1.0-r1.ebuild 1018
diff --git a/app-admin/php-toolkit/files/digest-php-toolkit-1.0 b/app-admin/php-toolkit/files/digest-php-toolkit-1.0-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-admin/php-toolkit/files/digest-php-toolkit-1.0
+++ b/app-admin/php-toolkit/files/digest-php-toolkit-1.0-r1
diff --git a/app-admin/php-toolkit/files/php-select-modules/libsymlink.sh b/app-admin/php-toolkit/files/php-select-modules/libsymlink.sh
index fb25507c4620..9e5b6da853b5 100644
--- a/app-admin/php-toolkit/files/php-select-modules/libsymlink.sh
+++ b/app-admin/php-toolkit/files/php-select-modules/libsymlink.sh
@@ -94,9 +94,11 @@ learnPhpVersions ()
local musthave
local x
local n
+ local breakit
# how many files are we looking for?
musthave=${#G_SYMLINK_SOURCE[@]}
+ breakit="no"
for (( i = 0 ; i < ${#G_LIBDIR[@]} ; i = i + 1 )) ; do
for x in `echo ${G_LIBDIR[$i]}/php*` ; do
@@ -110,8 +112,13 @@ learnPhpVersions ()
if (( dohave == musthave )) ; then
echo "$x"
+ breakit="yes"
fi
done
+
+ if [[ ${breakit} == "yes" ]] ; then
+ break
+ fi
done
}
diff --git a/app-admin/php-toolkit/php-toolkit-1.0.ebuild b/app-admin/php-toolkit/php-toolkit-1.0-r1.ebuild
index 599447a090d8..182e28e9cd33 100644
--- a/app-admin/php-toolkit/php-toolkit-1.0.ebuild
+++ b/app-admin/php-toolkit/php-toolkit-1.0-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/php-toolkit/php-toolkit-1.0.ebuild,v 1.7 2006/01/04 00:31:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/php-toolkit/php-toolkit-1.0-r1.ebuild,v 1.1 2006/01/04 17:19:27 chtekk Exp $
inherit eutils
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-DESCRIPTION="Utilities for managing installed copies of PHP ."
+DESCRIPTION="Utilities for managing installed copies of PHP."
HOMEPAGE="http://svn.gnqs.org/projects/gentoo-php-overlay/wiki/PhpToolkit"
SRC_URI=""
LICENSE="GPL-2"