| 1 |
jokey 07/12/06 01:23:50 |
| 2 |
|
| 3 |
Modified: php-qt-0.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
LICENSE fix from project overlay |
| 6 |
(Portage version: 2.1.4_rc7) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-php5/php-qt/php-qt-0.1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/php-qt/php-qt-0.1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/php-qt/php-qt-0.1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/php-qt/php-qt-0.1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: php-qt-0.1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-php5/php-qt/php-qt-0.1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- php-qt-0.1.ebuild 30 Aug 2007 13:09:06 -0000 1.1 |
| 22 |
+++ php-qt-0.1.ebuild 6 Dec 2007 01:23:49 -0000 1.2 |
| 23 |
@@ -1,43 +1,44 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-qt/php-qt-0.1.ebuild,v 1.1 2007/08/30 13:09:06 jokey Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-qt/php-qt-0.1.ebuild,v 1.2 2007/12/06 01:23:49 jokey Exp $ |
| 28 |
|
| 29 |
-inherit eutils kde-functions qt4 toolchain-funcs depend.php |
| 30 |
+PHP_EXT_NAME="php_qt" |
| 31 |
+PHP_EXT_INI="yes" |
| 32 |
+PHP_EXT_ZENDEXT="no" |
| 33 |
+PHPSAPILIST="cli" |
| 34 |
+inherit php-ext-base-r1 qt4 eutils depend.php toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="PHP5 bindings for the Qt4 framework." |
| 37 |
HOMEPAGE="http://php-qt.org/" |
| 38 |
SRC_URI="http://download.berlios.de/php-qt/${P}.tar.gz" |
| 39 |
|
| 40 |
-LICENSE="LGPL-2.1" |
| 41 |
+LICENSE="GPL-2 BSD" |
| 42 |
SLOT="0" |
| 43 |
KEYWORDS="~amd64 ~x86" |
| 44 |
IUSE="" |
| 45 |
|
| 46 |
-RDEPEND=">=kde-base/smoke-3.5.6 |
| 47 |
- $(qt4_min_version 4)" |
| 48 |
+RDEPEND="$(qt4_min_version 4) |
| 49 |
+ >=x11-libs/qscintilla-2.1-r1 |
| 50 |
+ !kde-base/smoke" # yes, this IS required, installs a bundled QT4-compatible copy |
| 51 |
|
| 52 |
DEPEND="${RDEPEND} |
| 53 |
- >=dev-util/cmake-2.4" |
| 54 |
+ >=dev-util/cmake-2.4 |
| 55 |
+ dev-lang/perl" |
| 56 |
|
| 57 |
need_php_by_category |
| 58 |
|
| 59 |
S="${WORKDIR}/${PN/-/_}" |
| 60 |
|
| 61 |
pkg_setup() { |
| 62 |
- has_php |
| 63 |
+ require_php_cli |
| 64 |
if built_with_use =${PHP_PKG} threads; then |
| 65 |
- eerror "dev-lang/php must be compiled without \"threads\" support." |
| 66 |
+ eerror "dev-lang/php must be compiled without threads support." |
| 67 |
die "Recompile ${PHP_PKG} with USE=\"-threads\" and try again." |
| 68 |
fi |
| 69 |
-} |
| 70 |
- |
| 71 |
-src_unpack() { |
| 72 |
- unpack ${A} |
| 73 |
- cd "${S}" |
| 74 |
- set-kdedir |
| 75 |
- sed -i -e "/add_subdirectory(smoke)/d" CMakeLists.txt |
| 76 |
- sed -i -e "/\/smoke/d" -e "/include_directories/a\\ |
| 77 |
- ${KDEDIR}/include" php_qt/CMakeLists.txt |
| 78 |
+ if ! built_with_use x11-libs/qscintilla qt4 ; then |
| 79 |
+ eerror "x11-libs/qscintilla must be compiled with qt4 support." |
| 80 |
+ die "Recompile x11-libs/qscintilla with USE=\"qt4\" and try again." |
| 81 |
+ fi |
| 82 |
} |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
@@ -47,14 +48,20 @@ |
| 86 |
-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ |
| 87 |
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ |
| 88 |
-DQT_QMAKE_EXECUTABLE="/usr/bin/qmake" \ |
| 89 |
+ -DQSCINTILLA_INCLUDE_DIR="/usr/include/Qsci" \ |
| 90 |
-DCMAKE_INSTALL_PREFIX=/usr \ |
| 91 |
|| die "cmake failed" |
| 92 |
+ |
| 93 |
emake || die "emake failed" |
| 94 |
} |
| 95 |
|
| 96 |
src_install() { |
| 97 |
emake DESTDIR="${D}" install || die "install failed" |
| 98 |
- dodoc COPYING CREDITS README #COPYING is a dependent license |
| 99 |
+ |
| 100 |
+ php-ext-base-r1_src_install |
| 101 |
+ |
| 102 |
+ # COPYING is a dependent license |
| 103 |
+ dodoc COPYING ChangeLog CREDITS README |
| 104 |
insinto /usr/share/doc/${PF}/examples/ |
| 105 |
doins -r "${S}"/examples/* |
| 106 |
} |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
1.8 dev-php5/php-qt/ChangeLog |
| 111 |
|
| 112 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/php-qt/ChangeLog?rev=1.8&view=markup |
| 113 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/php-qt/ChangeLog?rev=1.8&content-type=text/plain |
| 114 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-php5/php-qt/ChangeLog?r1=1.7&r2=1.8 |
| 115 |
|
| 116 |
Index: ChangeLog |
| 117 |
=================================================================== |
| 118 |
RCS file: /var/cvsroot/gentoo-x86/dev-php5/php-qt/ChangeLog,v |
| 119 |
retrieving revision 1.7 |
| 120 |
retrieving revision 1.8 |
| 121 |
diff -u -r1.7 -r1.8 |
| 122 |
--- ChangeLog 30 Aug 2007 13:09:06 -0000 1.7 |
| 123 |
+++ ChangeLog 6 Dec 2007 01:23:49 -0000 1.8 |
| 124 |
@@ -1,6 +1,12 @@ |
| 125 |
# ChangeLog for dev-php5/php-qt |
| 126 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 127 |
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-qt/ChangeLog,v 1.7 2007/08/30 13:09:06 jokey Exp $ |
| 128 |
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-qt/ChangeLog,v 1.8 2007/12/06 01:23:49 jokey Exp $ |
| 129 |
+ |
| 130 |
+ 06 Dec 2007; Markus Ullmann <jokey@g.o> php-qt-0.1.ebuild: |
| 131 |
+ LICENSE fix from project overlay |
| 132 |
+ |
| 133 |
+ 01 Dec 2007; Jakub Moc <jakub@g.o> php-qt-0.1.ebuild: |
| 134 |
+ Fix Bug 200872 |
| 135 |
|
| 136 |
*php-qt-0.1 (30 Aug 2007) |
| 137 |
|
| 138 |
|
| 139 |
|
| 140 |
|
| 141 |
-- |
| 142 |
gentoo-commits@g.o mailing list |
Archives