summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-01-23 13:39:18 +0000
committerFabian Groffen <grobian@gentoo.org>2010-01-23 13:39:18 +0000
commitd60f63b10963c07b5d85825ab068cd64611d7a41 (patch)
tree555fe16eaa8f6b51ca7e12bbd4686afbd1c00d56 /dev-util
parentDepend on media-libs/jpeg:0 for headers/utilities. (diff)
downloadhistorical-d60f63b10963c07b5d85825ab068cd64611d7a41.tar.gz
historical-d60f63b10963c07b5d85825ab068cd64611d7a41.tar.bz2
historical-d60f63b10963c07b5d85825ab068cd64611d7a41.zip
Marked ~amd64-linux, fix for Prefix, bug #300037
Package-Manager: portage-2.2.00.15200-prefix/cvs/Darwin powerpc RepoMan-Options: --force
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/qt-creator/ChangeLog5
-rw-r--r--dev-util/qt-creator/Manifest4
-rw-r--r--dev-util/qt-creator/qt-creator-1.3.1.ebuild11
3 files changed, 12 insertions, 8 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 2da099e3797a..c3719e588ef1 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/qt-creator
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.40 2010/01/21 19:24:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.41 2010/01/23 13:39:18 grobian Exp $
+
+ 23 Jan 2010; Fabian Groffen <grobian@gentoo.org> qt-creator-1.3.1.ebuild:
+ Marked ~amd64-linux, fix for Prefix, bug #300037
21 Jan 2010; Markos Chandras <hwoarang@gentoo.org>
qt-creator-1.3.1.ebuild:
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 55c26f681ef1..1c86315ed892 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -4,6 +4,6 @@ DIST qt-creator-1.3.0-src.tar.gz 10613989 RMD160 d1c339dea74538a840317792b62b7a3
DIST qt-creator-1.3.1-src.tar.gz 10623442 RMD160 37bebc4566cfef85d5a7901c1efd8b917b3a0584 SHA1 49b61c3e8010d94d6d595fef38d3da737b26cd80 SHA256 b738a327b64276c5d8c0a01cbb840e316a657635514bc8e41c6cfa1c77e691ed
EBUILD qt-creator-1.2.1.ebuild 2894 RMD160 c2273fb5ecd97c45d0f90004aa41c298185730a9 SHA1 1ac8a0a953ff7802ea424ffc29b4315efeebce00 SHA256 f7b71ac5b08e649a48ef68647e922250060419b9866dc9b054c7c5dba600038b
EBUILD qt-creator-1.3.0.ebuild 2846 RMD160 950588a2fbb4c1aa795f842ce291810e7665da8a SHA1 0dbefd7404c2dd3042d6c4287a425ea92777e0c1 SHA256 e2ba3a6474e40021f7b95c94dd17534cbc35b5c3acadb964cd7fd3b3d559bcbb
-EBUILD qt-creator-1.3.1.ebuild 3171 RMD160 205b7e3e4d6bf64db63e9fb3b19612d1741c9580 SHA1 4f985c04a9ea3c611ff29988b495219f8bb7a44d SHA256 c301e2d978717ae51c60fb951db30f1dacebb11edb6b0db0baca7703d4fd89bf
-MISC ChangeLog 5833 RMD160 8e3b8f3582a2508cddcfbb8718ef66f6de922e87 SHA1 4655e7a3eaaa6095660501f511db5a7f83765e63 SHA256 b9a5674f877d6a11b7a9f9ead95dad3588e23a1affd0203788ff230b51ce3caa
+EBUILD qt-creator-1.3.1.ebuild 3235 RMD160 c713647cb089f0e5338b3ab4ca95990004a52089 SHA1 2cc21780b409c30ab9f86d01f0e6ac1078e039f8 SHA256 160b18283c44a649c75292c3061daa05e4c1078c16d37f7cffb4a5627e050896
+MISC ChangeLog 5960 RMD160 aa8fb19555372eda8fbe77281daf307ffa56bf80 SHA1 97bc29a3144f8c6cd12c39932541030f0c946949 SHA256 0f3b607cb5cea8a73dccaef5d633be7d1b83337e3d48f0ff653b2589f39f9067
MISC metadata.xml 1033 RMD160 0b058403d52323334eb6b761f4fb2589d31d3bc3 SHA1 7d24c0b85f2db72266957079050bc6d220ed56c7 SHA256 4b4ace82370a5e11e600a2dad2e48361aba79b07cada8ef84389950aef58de3d
diff --git a/dev-util/qt-creator/qt-creator-1.3.1.ebuild b/dev-util/qt-creator/qt-creator-1.3.1.ebuild
index d5da05f50289..4c8417edf9e3 100644
--- a/dev-util/qt-creator/qt-creator-1.3.1.ebuild
+++ b/dev-util/qt-creator/qt-creator-1.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.1.ebuild,v 1.3 2010/01/21 19:24:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.1.ebuild,v 1.4 2010/01/23 13:39:18 grobian Exp $
EAPI="2"
LANGS="de es fr it ja pl ru sl"
@@ -14,7 +14,7 @@ SRC_URI="http://get.qt.nokia.com/${MY_PN}/${P}-src.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
IUSE="bineditor bookmarks +cmake cvs debug +debugger +designer doc examples fakevim git kde mercurial perforce qml qtscript subversion"
DEPEND=">=x11-libs/qt-assistant-4.6.0:4
@@ -79,11 +79,12 @@ src_configure() {
}
src_install() {
- emake INSTALL_ROOT="${D}/usr" install_subtargets || die "emake install failed"
+ emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die "emake install failed"
# fix binary name bug 275859
- mv "${D}"/usr/bin/${MY_PN}.bin "${D}"/usr/bin/${MY_PN} || die "failed to rename executable"
+ mv "${D%/}${EPREFIX}"/usr/bin/${MY_PN}.bin \
+ "${D%/}${EPREFIX}"/usr/bin/${MY_PN} || die "failed to rename executable"
if use doc;then
- emake INSTALL_ROOT="${D}/usr" install_qch_docs || die "emake install qch_docs failed"
+ emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_qch_docs || die "emake install qch_docs failed"
fi
make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
'Qt;Development;IDE' || die "make_desktop_entry failed"