summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kde-base/marble/ChangeLog5
-rw-r--r--kde-base/marble/Manifest10
-rw-r--r--kde-base/marble/marble-4.2.4.ebuild27
-rw-r--r--kde-base/marble/marble-4.2.88.ebuild27
-rw-r--r--kde-base/marble/marble-4.2.9999.ebuild27
-rw-r--r--kde-base/marble/marble-9999.ebuild27
6 files changed, 22 insertions, 101 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 5f8f260c10d..ab01cbe9f52 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Jun 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ marble-4.2.4.ebuild, marble-4.2.88.ebuild, marble-4.2.9999.ebuild,
+ marble-9999.ebuild:
+ Do not allow to build Qt-only marble - problematic
+
29 May 2009; Alexey Shvetsov <alexxy@gentoo.org> -marble-4.2.85.ebuild:
Version removed.
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index b58d76cc00f..dad84a4032a 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,8 +1,8 @@
DIST kdeedu-4.2.4.tar.bz2 59564451 RMD160 35d5043791a5dcfbdb282fb19fc6fa35d2d7d255 SHA1 7b26b946e1981ac57efdd2059eb3bba2808aef4b SHA256 1d0c08cee2bb9d76caa180b11b67ccf1718ff8b706fd31aa91aa7c0a4b6efbcb
DIST kdeedu-4.2.88.tar.lzma 53529354 RMD160 163f339fb9b063813fc65bc34392443d1ff92686 SHA1 1801b2e501e0dea418621488bc8eda0162daa85d SHA256 4b36f6236e79746385be16a59d9e69fd47375e331e46aa2c69ee9fa4dcd147b8
-EBUILD marble-4.2.4.ebuild 1984 RMD160 e504bb255b37bbeb940da71354a48c2da78afc70 SHA1 0b488425ae4e7a851e3afcc69d647c6c4c4eabf5 SHA256 3ff3d122871f50d2e276633d589ebb979ac0c665530305aacfa4c3d96f4f3497
-EBUILD marble-4.2.88.ebuild 1796 RMD160 58465b7987dd8061176d28852c136ad9f5c1e324 SHA1 8fc71f13e74eb06e5f77c41151a6d5dbd0540c20 SHA256 8b444b7f52e5d8126bdafe98d4e63984cd8243892ef2940f50f8153eaef05180
-EBUILD marble-4.2.9999.ebuild 1942 RMD160 eb9fe0d30aeb6629954b6a02eda9da223e6e2e2f SHA1 1d6dfac7661a27ec755f9a5aa28048814ccbe570 SHA256 c225a7dcef55ccdbcc65d7823f29b837385771cfe0bcb22765451d45ed8e7c3e
-EBUILD marble-9999.ebuild 1785 RMD160 065b067bb078815aef80c165018a525d9d9b4c41 SHA1 105d4f0d9ee93fcccf543ea0a718199a1a828cc7 SHA256 fab5f8fbb4cb8187ab2de16dcc15c16e899a2c7c703410618ebd718fe0d5704d
-MISC ChangeLog 8758 RMD160 a67fd901efe642cb40ea1b5220d248446cf0b426 SHA1 82f4748c1ab8bf695343b14b9ac66293198f00ea SHA256 010c5ce43842efcc953651a4fdf2cf7880a271986ae3971af302fa10af98b2e3
+EBUILD marble-4.2.4.ebuild 1431 RMD160 7839323b2c3c1b825820ac4d7d901a0ac171fe23 SHA1 8e62d28c0a283f78dc469c6ce3d91ed06708fd64 SHA256 2fc01fc8e3a9a3203e05c5ff6ae0bab53f5927beb61f9a2594d3494eb94d8629
+EBUILD marble-4.2.88.ebuild 1243 RMD160 c60dbf8be34fa3852c1ad4bcde26af25d533a303 SHA1 9c8b5af60958813d0f53efe7c90ab292b11a15c7 SHA256 40276c4927d8423c35a2a912f1c3af9ebb57cfa3c4951e3c95575c288282336a
+EBUILD marble-4.2.9999.ebuild 1389 RMD160 6da0a97340b55fa191535b904425ba7c39edbd1e SHA1 6be51e56660f16760acec3e1db18d427d38bbb9a SHA256 9b9e3db93434de95d60decafe425afc0627b8cc76fb976989f13b0b758c2a743
+EBUILD marble-9999.ebuild 1232 RMD160 f3621b784318d60421888b21f6f01ae4adf49afb SHA1 058a8391d82f8cf0f36ce2a092d238ffe3dd80e5 SHA256 ce946a798020b66ce76fb518adca8475a66bb6a74fad00ae8e667a1bd093fbeb
+MISC ChangeLog 8967 RMD160 4b58691c58c107198bd5b80a465688adf9b3a044 SHA1 38dc84aa5c55d559eeeed5883a507edc61abdf1e SHA256 cfcdad3bbc8e5a05c0f14b86d2b6b1bdcccad04f91cb7d0335d11d57dd43fc1e
MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
diff --git a/kde-base/marble/marble-4.2.4.ebuild b/kde-base/marble/marble-4.2.4.ebuild
index 2c88bdb4673..95189fe7c44 100644
--- a/kde-base/marble/marble-4.2.4.ebuild
+++ b/kde-base/marble/marble-4.2.4.ebuild
@@ -6,43 +6,28 @@ EAPI="2"
KMNAME="kdeedu"
CPPUNIT_REQUIRED="optional"
-KDE_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="Generic geographical map widget"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug designer-plugin +handbook +kde gps plasma python"
+IUSE="debug designer-plugin gps +handbook plasma python"
DEPEND="
gps? ( sci-geosciences/gpsd )
python? (
>=dev-python/PyQt4-4.4.4-r1
- kde? ( >=kde-base/pykde4-${PV}:${SLOT} )
+ >=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
)
"
RDEPEND="${DEPEND}
!kdeprefix? ( !sci-geosciences/marble )
"
-pkg_setup() {
- if use plasma && ! use kde; then
- echo
- eerror "KDE integration is required to build marble world clock applet."
- eerror
- eerror "Either enable 'kde' USE flag or disable 'plasma'."
- eerror "You can do this by setting these flags in /etc/portage/package.use, like:"
- eerror " =${CATEGORY}/${PN}-${PV} kde plasma"
- echo
- die "Conflicting USE flags found"
- fi
-
- kde4-meta_pkg_setup
-}
-
src_configure() {
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
$(cmake-utils_use_with plasma Plasma)
+ $(cmake-utils_use_with python PyKDE4)
$(cmake-utils_use_with python PyQt4)
$(cmake-utils_use_with python PythonLibrary)
$(cmake-utils_use_with python SIP)"
@@ -60,11 +45,5 @@ src_configure() {
marble/Findlibgps.cmake || die "sed to disable gpsd failed."
fi
- if use kde; then
- mycmakeargs="${mycmakeargs} $(cmake-utils_use_with python PyKDE4)"
- else
- mycmakeargs="${mycmakeargs} -DQTONLY=ON -DWITH_PyKDE4=OFF"
- fi
-
kde4-meta_src_configure
}
diff --git a/kde-base/marble/marble-4.2.88.ebuild b/kde-base/marble/marble-4.2.88.ebuild
index 1e59c1440c2..72a5c16a707 100644
--- a/kde-base/marble/marble-4.2.88.ebuild
+++ b/kde-base/marble/marble-4.2.88.ebuild
@@ -6,12 +6,11 @@ EAPI="2"
KMNAME="kdeedu"
CPPUNIT_REQUIRED="optional"
-KDE_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="Generic geographical map widget"
KEYWORDS="~amd64 ~x86"
-IUSE="debug designer-plugin +handbook +kde gps plasma python"
+IUSE="debug designer-plugin gps +handbook plasma python"
# tests fail / segfault. Last checked for 4.2.88
RESTRICT=test
@@ -20,32 +19,18 @@ DEPEND="
gps? ( sci-geosciences/gpsd )
python? (
>=dev-python/PyQt4-4.4.4-r1
- kde? ( >=kde-base/pykde4-${PV}:${SLOT} )
+ >=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
)
"
RDEPEND="${DEPEND}
!kdeprefix? ( !sci-geosciences/marble )
"
-pkg_setup() {
- if use plasma && ! use kde; then
- echo
- eerror "KDE integration is required to build marble world clock applet."
- eerror
- eerror "Either enable 'kde' USE flag or disable 'plasma'."
- eerror "You can do this by setting these flags in /etc/portage/package.use, like:"
- eerror " =${CATEGORY}/${PN}-${PV} kde plasma"
- echo
- die "Conflicting USE flags found"
- fi
-
- kde4-meta_pkg_setup
-}
-
src_configure() {
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
$(cmake-utils_use_with plasma Plasma)
+ $(cmake-utils_use_with python PyKDE4)
$(cmake-utils_use_with python PyQt4)
$(cmake-utils_use_with python PythonLibrary)
$(cmake-utils_use_with python SIP)"
@@ -59,11 +44,5 @@ src_configure() {
marble/Findlibgps.cmake || die "sed to disable gpsd failed."
fi
- if use kde; then
- mycmakeargs="${mycmakeargs} $(cmake-utils_use_with python PyKDE4)"
- else
- mycmakeargs="${mycmakeargs} -DQTONLY=ON -DWITH_PyKDE4=OFF"
- fi
-
kde4-meta_src_configure
}
diff --git a/kde-base/marble/marble-4.2.9999.ebuild b/kde-base/marble/marble-4.2.9999.ebuild
index 1728f363693..9eeea30c75f 100644
--- a/kde-base/marble/marble-4.2.9999.ebuild
+++ b/kde-base/marble/marble-4.2.9999.ebuild
@@ -6,43 +6,28 @@ EAPI="2"
KMNAME="kdeedu"
CPPUNIT_REQUIRED="optional"
-KDE_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="Generic geographical map widget"
KEYWORDS=""
-IUSE="debug designer-plugin +handbook +kde gps plasma python"
+IUSE="debug designer-plugin gps +handbook plasma python"
DEPEND="
gps? ( sci-geosciences/gpsd )
python? (
>=dev-python/PyQt4-4.4.4-r1
- kde? ( >=kde-base/pykde4-${PV}:${SLOT} )
+ >=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
)
"
RDEPEND="${DEPEND}
!kdeprefix? ( !sci-geosciences/marble )
"
-pkg_setup() {
- if use plasma && ! use kde; then
- echo
- eerror "KDE integration is required to build marble world clock applet."
- eerror
- eerror "Either enable 'kde' USE flag or disable 'plasma'."
- eerror "You can do this by setting these flags in /etc/portage/package.use, like:"
- eerror " =${CATEGORY}/${PN}-${PV} kde plasma"
- echo
- die "Conflicting USE flags found"
- fi
-
- kde4-meta_pkg_setup
-}
-
src_configure() {
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
$(cmake-utils_use_with plasma Plasma)
+ $(cmake-utils_use_with python PyKDE4)
$(cmake-utils_use_with python PyQt4)
$(cmake-utils_use_with python PythonLibrary)
$(cmake-utils_use_with python SIP)"
@@ -60,11 +45,5 @@ src_configure() {
marble/Findlibgps.cmake || die "sed to disable gpsd failed."
fi
- if use kde; then
- mycmakeargs="${mycmakeargs} $(cmake-utils_use_with python PyKDE4)"
- else
- mycmakeargs="${mycmakeargs} -DQTONLY=ON -DWITH_PyKDE4=OFF"
- fi
-
kde4-meta_src_configure
}
diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 171b466659e..75aeccd015e 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -6,12 +6,11 @@ EAPI="2"
KMNAME="kdeedu"
CPPUNIT_REQUIRED="optional"
-KDE_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="Generic geographical map widget"
KEYWORDS=""
-IUSE="debug designer-plugin +handbook +kde gps plasma python"
+IUSE="debug designer-plugin gps +handbook plasma python"
# tests fail / segfault. Last checked for 4.2.88
RESTRICT=test
@@ -20,32 +19,18 @@ DEPEND="
gps? ( sci-geosciences/gpsd )
python? (
>=dev-python/PyQt4-4.4.4-r1
- kde? ( >=kde-base/pykde4-${PV}:${SLOT} )
+ >=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
)
"
RDEPEND="${DEPEND}
!kdeprefix? ( !sci-geosciences/marble )
"
-pkg_setup() {
- if use plasma && ! use kde; then
- echo
- eerror "KDE integration is required to build marble world clock applet."
- eerror
- eerror "Either enable 'kde' USE flag or disable 'plasma'."
- eerror "You can do this by setting these flags in /etc/portage/package.use, like:"
- eerror " =${CATEGORY}/${PN}-${PV} kde plasma"
- echo
- die "Conflicting USE flags found"
- fi
-
- kde4-meta_pkg_setup
-}
-
src_configure() {
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
$(cmake-utils_use_with plasma Plasma)
+ $(cmake-utils_use_with python PyKDE4)
$(cmake-utils_use_with python PyQt4)
$(cmake-utils_use_with python PythonLibrary)
$(cmake-utils_use_with python SIP)"
@@ -59,11 +44,5 @@ src_configure() {
marble/Findlibgps.cmake || die "sed to disable gpsd failed."
fi
- if use kde; then
- mycmakeargs="${mycmakeargs} $(cmake-utils_use_with python PyKDE4)"
- else
- mycmakeargs="${mycmakeargs} -DQTONLY=ON -DWITH_PyKDE4=OFF"
- fi
-
kde4-meta_src_configure
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 23:24:22 +0000