aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-04-27 21:52:36 -0400
committerJonathan Callen <abcd@gentoo.org>2011-04-27 21:52:36 -0400
commit7dab287bd58a6d853388df8d42938db4318deb65 (patch)
treeaedff9faa7bb3a43ba1eb8c74fe1e791958d85ce /x11-libs/qtscriptgenerator
parentRemove redundant seds to replace the KDE4WORKBASE_ bits, the eclass now handl... (diff)
downloadkde-7dab287bd58a6d853388df8d42938db4318deb65.tar.gz
kde-7dab287bd58a6d853388df8d42938db4318deb65.tar.bz2
kde-7dab287bd58a6d853388df8d42938db4318deb65.zip
Use EAPI=4 when possible, massive cleanup
(Portage version: 2.2.0_alpha30/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 229E5838)
Diffstat (limited to 'x11-libs/qtscriptgenerator')
-rw-r--r--x11-libs/qtscriptgenerator/Manifest22
-rw-r--r--x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild17
2 files changed, 27 insertions, 12 deletions
diff --git a/x11-libs/qtscriptgenerator/Manifest b/x11-libs/qtscriptgenerator/Manifest
index ae30ff7004..3019d39375 100644
--- a/x11-libs/qtscriptgenerator/Manifest
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -1,3 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX qtscriptgenerator-gcc44.patch 495 RMD160 7e58d78e23aaf6e89b070941517a0db3cbc45ff4 SHA1 87cd599403fa9bb441ddc27c77e0b6242e2cc150 SHA256 6cc6825725e5746ddbf4f5f4376ce8584cb74643027a84b4eb44c10850a7205a
-EBUILD qtscriptgenerator-9999.ebuild 1424 RMD160 93a9c9161b12a41ceddc7a5748cd943df0d0fa21 SHA1 2525da2d068a0bbf1bd6eb57291c8689ad1c7e70 SHA256 174442232f022c2cc4c031fd4ed498d8540c4568ec1d329ccbcbc493b822917d
+EBUILD qtscriptgenerator-9999.ebuild 1327 RMD160 8ec8ef1cffa33496e4aebad15a958d67b7eac75c SHA1 4274eb590fa73cb737036582a85c39a38c632a58 SHA256 68f1ff58f8e4f347c6fdaeb41c6138d4f65fe8abe871fb32e48497064cdcee1f
MISC metadata.xml 174 RMD160 150ebb914d1d3dba874847502ec6fca3569bdd9d SHA1 069ee757d92149b01569258dd651246ae0c56e88 SHA256 24acedd614ebfee8dfa4f4bbe7729fd1b503351fb7c055fe3ff0109ef01e2a8e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMhbAAoJELHSF2kinlg4mnMP/jV09ok1OsHARRto5HV52yqu
+8Po44KojPmkso2jZZV5DG5Ell/9jCw1KvcpRO/U1vddZdacLuSHgatL4S8VifARV
+xjZNnqgPrVVdPiww3YL6/+0ghMVxAT5PJYMHIAOdLL7cByj2JDdPdBPxGrfPfhdD
+X75cIGA+7R4Rk7gz6EPp66ZrGXanEqxEE7CiZbQUZrmwDkaBspNkfLlRdzrPrbeO
+6YUxO/07byxVVek3t22+eMSjSpYxRnFpgmnPVkyp3WvfKE5duv/zUuM/DJcZhZ9u
+2LcYl8fH6YZDizu7E1HXmSME9G+ZvCH4uMD3wq4GaHkv6p1/P+p84ir6hY1RVDrw
+x/OPpU8H5KSJoPMyyzl8DzoQNIlPsz0kCMAqmX5GlZHUU93w7oAXe6lA+C3wokhZ
+LALaKYC8gHVgtEF1x3OH4MccLotKriprTLsD7Dr7zVvmPWpXvDeBdtKSt6owLUIx
+uTxpcLhIeGRPTAdsRyo+idMJ+Z2VdnWwessOf8j3157d2dwM3zShRYDQsS4hEg4s
+Zvh/oSbHk+dEs4nu4l1z4+XCkLw3lX2J9xDcPM3pN2fm9x3h+tY+TOQQt0OlCOCX
+P0dhpt0u/FPesZPUGIy8VNCV83r9On644MbVF8J8kEkloQK0IwWge/23oLo9YzIj
+TLO+uNlplTCZMe/zsZ9Q
+=Cc20
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
index 5e714342c7..1a111cee0f 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
-inherit multilib git qt4
+inherit multilib qt4-r2 git-2
DESCRIPTION="Tool for generating Qt bindings for Qt Script"
HOMEPAGE="http://code.google.com/p/qtscriptgenerator/"
@@ -26,10 +26,6 @@ RDEPEND="${DEPEND}"
PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns"
-src_unpack() {
- git_src_unpack
-}
-
src_prepare() {
# remove phonon
sed -i "/typesystem_phonon.xml/d" generator/generator.qrc \
@@ -38,8 +34,7 @@ src_prepare() {
|| die "sed failed"
epatch "${FILESDIR}/${PN}-gcc44.patch"
- git_src_prepare
- qt4_src_prepare
+ qt4-r2_src_prepare
}
src_configure() {
@@ -51,11 +46,11 @@ src_configure() {
src_compile() {
cd "${S}"/generator
- emake || die "emake generator failed"
- ./generator --include-paths="/usr/include/qt4/" || die "running generator failed"
+ emake
+ ./generator --include-paths="${EPREFIX}/usr/include/qt4/" || die "running generator failed"
cd "${S}"/qtbindings
- emake || die "make qtbindings failed"
+ emake
}
src_install() {