diff options
author | Michał Górny <mgorny@gentoo.org> | 2015-02-18 05:28:36 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2015-02-18 05:28:36 +0000 |
commit | cf98151af2dc6a134beb82ce521bf24efeb352c8 (patch) | |
tree | a1a7a0b49a45950ffa5a3931161f80fd39ed2c43 /kde-base | |
parent | Drop default on gui useflag, which is now enabled (with some others) in deskt... (diff) | |
download | gentoo-2-cf98151af2dc6a134beb82ce521bf24efeb352c8.tar.gz gentoo-2-cf98151af2dc6a134beb82ce521bf24efeb352c8.tar.bz2 gentoo-2-cf98151af2dc6a134beb82ce521bf24efeb352c8.zip |
Remove old version. python-exec:0 can be removed now.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/pykde4/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch | 22 | ||||
-rw-r--r-- | kde-base/pykde4/metadata.xml | 1 | ||||
-rw-r--r-- | kde-base/pykde4/pykde4-4.12.5.ebuild | 163 |
4 files changed, 5 insertions, 187 deletions
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog index dc5d9c196c44..21685dea832a 100644 --- a/kde-base/pykde4/ChangeLog +++ b/kde-base/pykde4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/pykde4 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.311 2015/02/17 11:06:42 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.312 2015/02/18 05:28:36 mgorny Exp $ + + 18 Feb 2015; Michał Górny <mgorny@gentoo.org> + -files/pykde4-4.10.1-arm-sip.patch, -pykde4-4.12.5.ebuild, metadata.xml: + Remove old version. python-exec:0 can be removed now. 17 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pykde4-4.14.3.ebuild: Stable for ppc64 wrt bug #517344 diff --git a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch deleted file mode 100644 index 73cee86b6c57..000000000000 --- a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch +++ /dev/null @@ -1,22 +0,0 @@ -See Gentoo bug #322351. - ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -101,6 +101,8 @@ - ${KDEPIMLIBS_INCLUDE_DIRS} - ) - -+# Pull in ARM configuration options if needed -+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "") - set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip) - set(SIP_CONCAT_PARTS 8) - if (WIN32) -@@ -108,7 +110,7 @@ - else () - set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) - endif () --set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) -+set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK}) - - # Use an extra option when compiling on Python 3. - if (PYTHON_VERSION_MAJOR GREATER 2) diff --git a/kde-base/pykde4/metadata.xml b/kde-base/pykde4/metadata.xml index 7bceb5a68841..7ceb431b93bb 100644 --- a/kde-base/pykde4/metadata.xml +++ b/kde-base/pykde4/metadata.xml @@ -5,6 +5,5 @@ <use> <flag name="akonadi">Compile bindings for Akonadi</flag> <flag name="nepomuk">Compile bindings for Nepomuk</flag> - <flag name="semantic-desktop">Enables Nepomuk and Soprano python language bindings</flag> </use> </pkgmetadata> diff --git a/kde-base/pykde4/pykde4-4.12.5.ebuild b/kde-base/pykde4/pykde4-4.12.5.ebuild deleted file mode 100644 index a1a6f57c5677..000000000000 --- a/kde-base/pykde4/pykde4-4.12.5.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.12.5.ebuild,v 1.6 2014/07/17 10:59:25 kensington Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) -PYTHON_REQ_USE="threads" -OPENGL_REQUIRED="always" - -inherit python-r1 portability kde4-base multilib eutils - -DESCRIPTION="Python bindings for KDE4" -KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="debug doc examples semantic-desktop test" -HOMEPAGE="http://techbase.kde.org/Development/Languages/Python" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( semantic-desktop )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-python/PyQt4-4.9.5[${PYTHON_USEDEP},dbus,declarative,script(+),sql,svg,webkit,X] - <dev-python/PyQt4-4.11 - >=dev-python/sip-4.14:=[${PYTHON_USEDEP}] - <dev-python/sip-4.16 - $(add_kdebase_dep kdelibs 'opengl,semantic-desktop?') - semantic-desktop? ( - $(add_kdebase_dep kdepimlibs) - >=dev-libs/soprano-2.9.0 - ) -" -DEPEND="${RDEPEND} - dev-lang/python-exec:0[${PYTHON_USEDEP}] - sys-devel/libtool -" - -pkg_setup() { - kde4-base_pkg_setup - - have_python2=false - - scan_python_versions() { - if [[ ${EPYTHON} == python2.* ]]; then - have_python2=true - fi - } - python_foreach_impl scan_python_versions - - if ! ${have_python2}; then - ewarn "You do not have a Python 2 version selected." - ewarn "kpythonpluginfactory will not be built" - fi -} - -src_prepare() { - kde4-base_src_prepare - - if ! use examples; then - sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \ - || die "Failed to disable examples" - fi - - # See bug 322351 - use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch" - - sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \ - -i kpythonpluginfactory/CMakeLists.txt || die - - if ${have_python2}; then - mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper" - cp "${FILESDIR}/kpythonpluginfactorywrapper.c-r1" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper" - fi - python_copy_sources - -} - -src_configure() { - configuration() { - local mycmakeargs=( - -DWITH_PolkitQt=OFF - -DWITH_QScintilla=OFF - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with semantic-desktop Nepomuk) - $(cmake-utils_use_with semantic-desktop KdepimLibs) - -DPYTHON_EXECUTABLE=${PYTHON} - -DPYKDEUIC4_ALTINSTALL=TRUE - ) - local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI} - kde4-base_src_configure - } - - python_foreach_impl run_in_build_dir configuration -} - -echo_and_run() { - echo "$@" - "$@" -} - -src_compile() { - compilation() { - local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI} - kde4-base_src_compile - } - python_foreach_impl run_in_build_dir compilation - - if ${have_python2}; then - pushd "${WORKDIR}/wrapper" > /dev/null - echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \ - -shared \ - ${CFLAGS} ${CPPFLAGS} \ - -DEPREFIX="\"${EPREFIX}\"" \ - -DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \ - -o kpythonpluginfactorywrapper.lo \ - kpythonpluginfactorywrapper.c - echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \ - -shared -module -avoid-version \ - ${CFLAGS} ${LDFLAGS} \ - -o kpythonpluginfactory.la \ - -rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \ - kpythonpluginfactorywrapper.lo \ - $(dlopen_lib) - popd > /dev/null - fi -} - -src_test() { - python_foreach_impl run_in_build_dir kde4-base_src_test -} - -src_install() { - installation() { - emake DESTDIR="${D}" install - - mv "${ED}"/usr/bin/pykdeuic4-{${EPYTHON/python/},${EPYTHON}} || die - python_optimize - } - python_foreach_impl run_in_build_dir installation - - dosym python-exec /usr/bin/pykdeuic4 - - # As we don't call the eclass's src_install, we have to install the docs manually - DOCS=("${S}"/{AUTHORS,NEWS,README}) - use doc && HTML_DOCS=("${S}/docs/html/") - einstalldocs - - if ${have_python2}; then - pushd "${WORKDIR}/wrapper" > /dev/null - echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la" - rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la" - popd > /dev/null - fi -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use examples; then - echo - elog "PyKDE4 examples have been installed to" - elog "${EPREFIX}/usr/share/apps/${PN}/examples" - echo - fi -} |