summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-06-01 22:28:49 +0000
committerBen de Groot <yngwin@gentoo.org>2009-06-01 22:28:49 +0000
commit02e5859cba0762afa89b18fff60d84f68933d381 (patch)
tree89f4488d50f0e536b0723083f226840497e24019 /x11-libs/qscintilla
parentUpdate package.mask for testing hal (diff)
downloadhistorical-02e5859cba0762afa89b18fff60d84f68933d381.tar.gz
historical-02e5859cba0762afa89b18fff60d84f68933d381.tar.bz2
historical-02e5859cba0762afa89b18fff60d84f68933d381.zip
Move to EAPI=2, and add use dep
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/qscintilla')
-rw-r--r--x11-libs/qscintilla/ChangeLog5
-rw-r--r--x11-libs/qscintilla/Manifest4
-rw-r--r--x11-libs/qscintilla/qscintilla-2.3.2.ebuild10
3 files changed, 10 insertions, 9 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index cc823f6ddf10..a65aaae771fd 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qscintilla
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.24 2009/05/29 23:22:53 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.25 2009/06/01 22:28:49 yngwin Exp $
+
+ 01 Jun 2009; Ben de Groot <yngwin@gentoo.org> qscintilla-2.3.2.ebuild:
+ Move to EAPI=2, and add use dep
29 May 2009; Ben de Groot <yngwin@gentoo.org> qscintilla-2.3.2.ebuild:
Remove monolithic qt4 dep, as only split is in tree
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a079a1fdedce..a2f37872e709 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -14,7 +14,7 @@ EBUILD qscintilla-1.5.1.ebuild 2059 RMD160 aba058df06336df7de6795a682a623bca8dfb
EBUILD qscintilla-1.7.1.ebuild 2299 RMD160 99f53c4c41fc670e789f7ee55e5695adef29f3d3 SHA1 4a0b0e0aa66604d91d642082addc195684f51c9a SHA256 e3f092f98b44fde1a9de44a7ab2d6fa715206cd82e2967f46c311ed46ac37d59
EBUILD qscintilla-2.1-r1.ebuild 3899 RMD160 881eb02bfbd2980a65564d3d9d3523dc9b1d78ad SHA1 675ec38bd144b30bee0918f87f86dc7d1fe9cae0 SHA256 ec144eb2eb750818cd83f7aa22601da211fb304b6639b91dfdf23dffed56207f
EBUILD qscintilla-2.2.ebuild 3857 RMD160 7e23a9df40d99c41466b56315948ed3f6759390c SHA1 2a8b689d0da65ff93770ad79b033f21409a90585 SHA256 51b4418cd951886be38dfa3b4907bf17346e7fca2b6cfc4cf535a43b33ba1c51
-EBUILD qscintilla-2.3.2.ebuild 3810 RMD160 bb17c4093ddccf1162cba0373a0f8ee601910352 SHA1 182b7682067bbdc8aca1a536b1f80a89a5d72c13 SHA256 e6dab6738befbeab7169cccfa8dc8040ade56bd02f6dc5c0cf96a3f9d03ae2a1
+EBUILD qscintilla-2.3.2.ebuild 3805 RMD160 d6d41d1213cc5ba0873a0c63fb40ba272a990637 SHA1 b92f0e444fca0696d9b4d9067b785a8ece6b2fb1 SHA256 57d00e7cd62d83a35c62aca509fb396f80dd0ab97ddf17e33da4dcf4535dc1f9
EBUILD qscintilla-2.3.ebuild 3891 RMD160 c72559e488a59bc4c63a4354517389e9e1d13f56 SHA1 6bb488282ec3730136bead5adf1195cb0c5b42e0 SHA256 29a87b0e659ef37c16e3e2ba772328169629645a70049805e6592254586dd1ee
-MISC ChangeLog 13895 RMD160 906145ab1de8bb2b07681e813f14b9d329824048 SHA1 efe58121fdc904b634b4ccd41f804e884aa57f38 SHA256 2a3f5efdbf91baef68246fabb8a4ae15382e7fd8a44c9ebd270a6e4873a12e91
+MISC ChangeLog 14003 RMD160 61bf5e880a79a7a9fc5d0990e17fd13aad711c1b SHA1 54c89689db8be1a2dc8d8f108d90cc4e727f24dd SHA256 fdb01369b262dcf494b8a2bf32bc190b0518d98c85ada86657ffc5a6e185cc09
MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
index 33d746cfa621..6cafc95bfc22 100644
--- a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.8 2009/05/29 23:22:53 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.9 2009/06/01 22:28:49 yngwin Exp $
-EAPI=1
+EAPI=2
inherit eutils toolchain-funcs multilib
MY_P="${PN/qs/QS}-gpl-${PV}"
@@ -22,11 +22,9 @@ RDEPEND="qt4? ( x11-libs/qt-gui:4 )
DEPEND="${RDEPEND}"
# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
# need dev-python/PyQt, bug 199543
-PDEPEND="python? ( dev-python/qscintilla-python )"
-
-src_unpack() {
- unpack ${A}
+PDEPEND="python? ( dev-python/qscintilla-python[qt4=] )"
+src_configure() {
local myqmake myqtdir
if use qt4; then
myqmake=/usr/bin/qmake