* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-dbus/, x11-libs/qt-core/, x11-libs/qt-assistant/
@ 2012-02-01 20:56 Markos Chandras
0 siblings, 0 replies; only message in thread
From: Markos Chandras @ 2012-02-01 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 304f11c05aa2b8f9d241890ad87e67a3ba1b4c7d
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 20:52:32 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 20:52:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=304f11c0
qt-{assistant,core,dbus}: Replace ECLASS with QT_ECLASS
It turns out that ECLASS is used internally by portage.
See line 329 in /usr/lib64/portage/bin/ebuild.sh
Replaced by a more specific variable
---
x11-libs/qt-assistant/Manifest | 4 ++--
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 16 ++++++++--------
x11-libs/qt-assistant/qt-assistant-4.9999.ebuild | 16 ++++++++--------
x11-libs/qt-core/Manifest | 4 ++--
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 10 +++++-----
x11-libs/qt-core/qt-core-4.9999.ebuild | 10 +++++-----
x11-libs/qt-dbus/Manifest | 4 ++--
x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild | 8 ++++----
x11-libs/qt-dbus/qt-dbus-4.9999.ebuild | 8 ++++----
9 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index c3b53af..eda7e3b 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -4,6 +4,6 @@ AUX qt-assistant-4.7-include.tar.gz 448 RMD160 5432ab486dae1d2510798b53c32365f86
AUX qt-assistant-4.8.0-install-fix.patch 2708 RMD160 b64c206d48b0939e4c504585a44cc06cd29fd62a SHA1 cb1740e69ffb163234e6cfff4043e071ee85d4bf SHA256 7c525c8bf696e3082bdf86e079703b2a033ea16b3fb882d519fc6463da8e5dde
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
EBUILD qt-assistant-4.7.9999.ebuild 2772 RMD160 3630fabc5bd1c439e6b2d9d123f2d6b747a28a84 SHA1 c81e03e87e62cefb0f1496106c3a680fc6cbe9b1 SHA256 005ddd402c7485d988d4987f8bc39ca3f0e4616456228831e2eb0bf1394530d3
-EBUILD qt-assistant-4.8.9999.ebuild 4456 RMD160 81de97c973378ff68a5145a29713f6b0fd85d932 SHA1 b7a66ccda011cf1ccc443bcf9c7790e76294781e SHA256 4bf977babc860dca0bd2b6f06043e2a71d38c0f7312b7aaadae8ede2055a17dc
-EBUILD qt-assistant-4.9999.ebuild 4456 RMD160 81de97c973378ff68a5145a29713f6b0fd85d932 SHA1 b7a66ccda011cf1ccc443bcf9c7790e76294781e SHA256 4bf977babc860dca0bd2b6f06043e2a71d38c0f7312b7aaadae8ede2055a17dc
+EBUILD qt-assistant-4.8.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6
+EBUILD qt-assistant-4.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6
MISC metadata.xml 816 RMD160 7f4cdb5e95a0e1f50fa64172fc238ced50797074 SHA1 8d04c81cb77a5dbe825a070958700cda6fbb64b3 SHA256 080d4e3bc86ad0b0907f13b2ac88cedf515d2508d3135ee4276babdd6098763f
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index 2c8b30b..c16ab12 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -4,9 +4,9 @@
EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
- ECLASS="-edge"
+ QT_ECLASS="-edge"
fi
-inherit qt4-build${ECLASS}
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The assistant help module for the Qt toolkit"
SLOT="4"
@@ -50,11 +50,11 @@ pkg_setup() {
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
${QT4_EXTRACT_DIRECTORIES}"
- qt4-build${ECLASS}_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_unpack() {
- qt4-build${ECLASS}_src_unpack
+ qt4-build${QT_ECLASS}_src_unpack
# compat version
# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
if use compat; then
@@ -68,7 +68,7 @@ src_unpack() {
}
src_prepare() {
- qt4-build${ECLASS}_src_prepare
+ qt4-build${QT_ECLASS}_src_prepare
if use compat; then
epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
fi
@@ -88,7 +88,7 @@ src_configure() {
-no-svg $(qt_use qt3support) $(qt_use webkit)"
! use glib && myconf="${myconf} -no-glib"
- qt4-build${ECLASS}_src_configure
+ qt4-build${QT_ECLASS}_src_configure
}
src_compile() {
@@ -96,7 +96,7 @@ src_compile() {
export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
- qt4-build${ECLASS}_src_compile
+ qt4-build${QT_ECLASS}_src_compile
# ugly hack to build docs
cd "${S}"
@@ -112,7 +112,7 @@ src_compile() {
}
src_install() {
- qt4-build${ECLASS}_src_install
+ qt4-build${QT_ECLASS}_src_install
cd "${S}"
#see src_compile note
if [[ ${PV} != 4*9999 ]]; then
diff --git a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
index 2c8b30b..c16ab12 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
@@ -4,9 +4,9 @@
EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
- ECLASS="-edge"
+ QT_ECLASS="-edge"
fi
-inherit qt4-build${ECLASS}
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The assistant help module for the Qt toolkit"
SLOT="4"
@@ -50,11 +50,11 @@ pkg_setup() {
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
${QT4_EXTRACT_DIRECTORIES}"
- qt4-build${ECLASS}_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_unpack() {
- qt4-build${ECLASS}_src_unpack
+ qt4-build${QT_ECLASS}_src_unpack
# compat version
# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
if use compat; then
@@ -68,7 +68,7 @@ src_unpack() {
}
src_prepare() {
- qt4-build${ECLASS}_src_prepare
+ qt4-build${QT_ECLASS}_src_prepare
if use compat; then
epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
fi
@@ -88,7 +88,7 @@ src_configure() {
-no-svg $(qt_use qt3support) $(qt_use webkit)"
! use glib && myconf="${myconf} -no-glib"
- qt4-build${ECLASS}_src_configure
+ qt4-build${QT_ECLASS}_src_configure
}
src_compile() {
@@ -96,7 +96,7 @@ src_compile() {
export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
- qt4-build${ECLASS}_src_compile
+ qt4-build${QT_ECLASS}_src_compile
# ugly hack to build docs
cd "${S}"
@@ -112,7 +112,7 @@ src_compile() {
}
src_install() {
- qt4-build${ECLASS}_src_install
+ qt4-build${QT_ECLASS}_src_install
cd "${S}"
#see src_compile note
if [[ ${PV} != 4*9999 ]]; then
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 0a63901..ce1e8fa 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,5 +1,5 @@
AUX qt-core-4.8.0-qurl-regression-fix.patch 742 RMD160 0fc99db2d43af1784c5dfcdf948915dc34749536 SHA1 44463c6f8faf5857d238778d0b57b12c36364096 SHA256 4a799c2948966a7c746e98e680db38fd05da8bf9fea581a1780ad3f94305f5dc
EBUILD qt-core-4.7.9999.ebuild 4022 RMD160 fa68febaa31c0cce43b5c350d06459e2f38dfa9e SHA1 318ce1b9622e8054a8ca89c4c6b18cbc464135d5 SHA256 c60b5ceb76f8190464cf494aa7209666ec97a0a23693e8059de461766e2991a2
-EBUILD qt-core-4.8.9999.ebuild 4964 RMD160 28d43d0ceece24a7bc6f502d0b17d20c139832be SHA1 e217b2d1ca46674c4260ec5f83ffcff86eff6c67 SHA256 44bf6306f2707366ab59bfd6f05547dc208a52995b8cda3ab6435c5d66a218a3
-EBUILD qt-core-4.9999.ebuild 4964 RMD160 28d43d0ceece24a7bc6f502d0b17d20c139832be SHA1 e217b2d1ca46674c4260ec5f83ffcff86eff6c67 SHA256 44bf6306f2707366ab59bfd6f05547dc208a52995b8cda3ab6435c5d66a218a3
+EBUILD qt-core-4.8.9999.ebuild 4979 RMD160 25901bf3503b12e83039d8e25d105a2ff1b00029 SHA1 695a94b49bea8d6f3e84c114dd96b9c16ea35852 SHA256 070f94884eb7c08609be115af1b86a638bf33cbd0a72164bc6d9c0fabf392324
+EBUILD qt-core-4.9999.ebuild 4979 RMD160 25901bf3503b12e83039d8e25d105a2ff1b00029 SHA1 695a94b49bea8d6f3e84c114dd96b9c16ea35852 SHA256 070f94884eb7c08609be115af1b86a638bf33cbd0a72164bc6d9c0fabf392324
MISC metadata.xml 803 RMD160 83aa032a8ce070f8cb633679563d4c9a501a0eda SHA1 332f440bedc7f39993f64d7d18508c6eac55cb08 SHA256 33c8d5ca13dfc9ea047db0078e8f9a9e4ecd47694a937f47f8f499df07428681
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 99395ce..8d2099b 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -4,9 +4,9 @@
EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
- ECLASS="-edge"
+ QT_ECLASS="-edge"
fi
-inherit qt4-build${ECLASS}
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
@@ -70,7 +70,7 @@ pkg_setup() {
tools/linguist/shared
translations"
fi
- qt4-build${ECLASS}_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_prepare() {
@@ -79,7 +79,7 @@ src_prepare() {
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
done
- qt4-build${ECLASS}_src_prepare
+ qt4-build${QT_ECLASS}_src_prepare
# bug 172219
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
@@ -102,7 +102,7 @@ src_configure() {
$(qt_use ssl openssl)
$(qt_use qt3support)"
- qt4-build${ECLASS}_src_configure
+ qt4-build${QT_ECLASS}_src_configure
}
src_install() {
diff --git a/x11-libs/qt-core/qt-core-4.9999.ebuild b/x11-libs/qt-core/qt-core-4.9999.ebuild
index 99395ce..8d2099b 100644
--- a/x11-libs/qt-core/qt-core-4.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.9999.ebuild
@@ -4,9 +4,9 @@
EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
- ECLASS="-edge"
+ QT_ECLASS="-edge"
fi
-inherit qt4-build${ECLASS}
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
@@ -70,7 +70,7 @@ pkg_setup() {
tools/linguist/shared
translations"
fi
- qt4-build${ECLASS}_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_prepare() {
@@ -79,7 +79,7 @@ src_prepare() {
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
done
- qt4-build${ECLASS}_src_prepare
+ qt4-build${QT_ECLASS}_src_prepare
# bug 172219
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
@@ -102,7 +102,7 @@ src_configure() {
$(qt_use ssl openssl)
$(qt_use qt3support)"
- qt4-build${ECLASS}_src_configure
+ qt4-build${QT_ECLASS}_src_configure
}
src_install() {
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest
index db32d7b..a26ff16 100644
--- a/x11-libs/qt-dbus/Manifest
+++ b/x11-libs/qt-dbus/Manifest
@@ -1,5 +1,5 @@
AUX qt-4.6-master-nolibx11.patch 1201 RMD160 54cd69c157b4624f687dcd05fa49c659973531c7 SHA1 1a320131804aba3a441d07dff9414a1b0d799125 SHA256 25a7f06997fdc7fc642d945fec279b62a13505764ea15f7bd77518e08825e4a8
EBUILD qt-dbus-4.7.9999.ebuild 758 RMD160 c6db295132086cb2b61408e2e20ceadfe9e49665 SHA1 7060bde745f6a0328ef243bb98edfffe358146ed SHA256 78bdbbd13a9bf5572bb4c18ff6357cb9f1b8ab6eb8d58f41f0e4658f17f31430
-EBUILD qt-dbus-4.8.9999.ebuild 1089 RMD160 b03159911629c9df75e736923e353b202f206f7c SHA1 6a05be6c34d080d6a4b488f7c979afb10168fb7a SHA256 07764b94d8623248eb30629ce58f8291615c0d8287a5bf5b728a2b138846ee6e
-EBUILD qt-dbus-4.9999.ebuild 1089 RMD160 b03159911629c9df75e736923e353b202f206f7c SHA1 6a05be6c34d080d6a4b488f7c979afb10168fb7a SHA256 07764b94d8623248eb30629ce58f8291615c0d8287a5bf5b728a2b138846ee6e
+EBUILD qt-dbus-4.8.9999.ebuild 1101 RMD160 96453943b277586f8d7a73e19af3b9f2432ec633 SHA1 80749069d678ec3c2683d696b1a91c1c2c8980fa SHA256 1c54c59da080a90cdee84530954bc2fe785e08d50d1f1efbc03f5cd782ddd527
+EBUILD qt-dbus-4.9999.ebuild 1101 RMD160 96453943b277586f8d7a73e19af3b9f2432ec633 SHA1 80749069d678ec3c2683d696b1a91c1c2c8980fa SHA256 1c54c59da080a90cdee84530954bc2fe785e08d50d1f1efbc03f5cd782ddd527
MISC metadata.xml 369 RMD160 52b34abcd322c2436157d9045cb892cffdbf00e4 SHA1 91a5ea601ffcd5d32626c6cd23767f39ecc743cb SHA256 f92954ba27e6923458310562b1537216409895a1ba484399f49809824a80e980
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
index 6a9686d..3975740 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
@@ -4,9 +4,9 @@
EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
- ECLASS="-edge"
+ QT_ECLASS="-edge"
fi
-inherit qt4-build${ECLASS}
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The DBus module for the Qt toolkit"
SLOT="4"
@@ -39,10 +39,10 @@ pkg_setup() {
src/xml"
fi
- qt4-build${ECLASS}_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_configure() {
myconf="${myconf} -dbus-linked"
- qt4-build${ECLASS}_src_configure
+ qt4-build${QT_ECLASS}_src_configure
}
diff --git a/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild
index 6a9686d..3975740 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild
@@ -4,9 +4,9 @@
EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
- ECLASS="-edge"
+ QT_ECLASS="-edge"
fi
-inherit qt4-build${ECLASS}
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The DBus module for the Qt toolkit"
SLOT="4"
@@ -39,10 +39,10 @@ pkg_setup() {
src/xml"
fi
- qt4-build${ECLASS}_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_configure() {
myconf="${myconf} -dbus-linked"
- qt4-build${ECLASS}_src_configure
+ qt4-build${QT_ECLASS}_src_configure
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-02-01 20:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-01 20:56 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-dbus/, x11-libs/qt-core/, x11-libs/qt-assistant/ Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox