diff options
author | 2017-09-18 01:49:30 +0200 | |
---|---|---|
committer | 2017-09-18 01:54:12 +0200 | |
commit | 6bbdcd277441846d6b9c1dd01fd75f1835cbd0cc (patch) | |
tree | 76152fc65104554ec68676f257ab38d088ac9d5a /kde-apps | |
parent | app-portage/portpeek: Ignore python USE_EXPAND. Support python 3.6. (diff) | |
download | gentoo-6bbdcd277441846d6b9c1dd01fd75f1835cbd0cc.tar.gz gentoo-6bbdcd277441846d6b9c1dd01fd75f1835cbd0cc.tar.bz2 gentoo-6bbdcd277441846d6b9c1dd01fd75f1835cbd0cc.zip |
profiles: Remove last-rited kde-apps/pykde4 and kde-plasma/libkworkspace
Diffstat (limited to 'kde-apps')
-rw-r--r-- | kde-apps/pykde4/Manifest | 2 | ||||
-rw-r--r-- | kde-apps/pykde4/files/kpythonpluginfactorywrapper.c-r2 | 71 | ||||
-rw-r--r-- | kde-apps/pykde4/files/pykde4-4.14.0-arm-sip.patch | 23 | ||||
-rw-r--r-- | kde-apps/pykde4/files/pykde4-4.14.3-gcc-5.patch | 25 | ||||
-rw-r--r-- | kde-apps/pykde4/files/pykde4-4.14.3-nokio.patch | 46 | ||||
-rw-r--r-- | kde-apps/pykde4/files/pykde4-4.14.3-noplasma.patch | 27 | ||||
-rw-r--r-- | kde-apps/pykde4/metadata.xml | 8 | ||||
-rw-r--r-- | kde-apps/pykde4/pykde4-4.14.3-r3.ebuild | 170 |
8 files changed, 0 insertions, 372 deletions
diff --git a/kde-apps/pykde4/Manifest b/kde-apps/pykde4/Manifest deleted file mode 100644 index 220ae005708f..000000000000 --- a/kde-apps/pykde4/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST pykde4-4.14.3-sip419.patch.bz2 3089 SHA256 458a92483f85462a302b5563b2c0d2fcdcd2c5f6d6a1e9b259fc7b87d3bedd66 SHA512 7355f662abdb9981731fc4e0f475fae37ba4887f91493d2d2b69685e2dbfe0a4873d9bf75c53039f1870432a9410d691d888f8c6b7161b2e3e7d92dd37664c76 WHIRLPOOL 2643adf09214916225f726d90ac6f9e4db02618c10011a2bdd6230f9baeb4016736e962e7649e3c29bbc52bb14282aa531545f7b5e1d779660efbf11f9a2c9c3 -DIST pykde4-4.14.3.tar.xz 2006504 SHA256 7fb9d7b5ed03d531243ebd67939baf30933452dafbdfca866e6653e9a77d80fc SHA512 42430f83bf41dc5d7511369250ff480fd7b90954b4ace8dbda2d6151ee3f3c979fe3d9b0163cda76df52107e982d4ac518fa1c28bc1d711d97f2d8739eaff1f3 WHIRLPOOL 5df847617a220ef9e1330f3c970bb6f785e713ebbed8a04ef4a3c9d1470d1b4a2032177f59df4d4baf89a0975b8c02f63f133747588cb65a3fa5d849e51b4d4d diff --git a/kde-apps/pykde4/files/kpythonpluginfactorywrapper.c-r2 b/kde-apps/pykde4/files/kpythonpluginfactorywrapper.c-r2 deleted file mode 100644 index f516f1b72281..000000000000 --- a/kde-apps/pykde4/files/kpythonpluginfactorywrapper.c-r2 +++ /dev/null @@ -1,71 +0,0 @@ -#include <dlfcn.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <sys/wait.h> - -#define VERSION_LEN 10 - -#define FORMAT EPREFIX PLUGIN_DIR "/kpython%spluginfactory.so" - -static void *handle; -static void *(*wrapped_qt_plugin_instance)(); - -static void get_python_version(char* out) { - int pipefd[2]; - pipe(pipefd); - pid_t cpid = fork(); - if (cpid > 0) { - close(pipefd[1]); - read(pipefd[0], out, VERSION_LEN); - close(pipefd[0]); - waitpid(cpid, NULL, 0); - } else if (cpid < 0) { - /* fork failed, guess 2.7 */ - strcpy(out, "2.7\n"); - close(pipefd[0]); - close(pipefd[1]); - } else { - close(pipefd[0]); - close(1); - dup2(pipefd[1], 1); - close(pipefd[1]); - close(0); - char *args[] = { "eselect", "python", "show", "--ABI", "--python2", 0 }; - execv(EPREFIX "/usr/bin/eselect", args); - /* exec failed, guess 2.7 */ - write(1, "2.7\n", 4); - exit(0); - } -} - -__attribute__((constructor)) -static void init() { - char buf[VERSION_LEN + 1]; - memset(buf, 0, VERSION_LEN + 1); - get_python_version(buf); - char *s = buf; - while(*s != '\0') { - if(*s == '\n') { - *s = '\0'; - break; - } - ++s; - } - int length = strlen(FORMAT) + strlen(buf) + 1; - char *name = malloc(length + 1); - snprintf(name, length, FORMAT, buf); - handle = dlopen(name, RTLD_NOW); - free(name); - wrapped_qt_plugin_instance = dlsym(handle, "qt_plugin_instance"); -} - -__attribute__((destructor)) -static void fini() { - dlclose(handle); -} - -void *qt_plugin_instance() { - return wrapped_qt_plugin_instance(); -} diff --git a/kde-apps/pykde4/files/pykde4-4.14.0-arm-sip.patch b/kde-apps/pykde4/files/pykde4-4.14.0-arm-sip.patch deleted file mode 100644 index f6391a8ec714..000000000000 --- a/kde-apps/pykde4/files/pykde4-4.14.0-arm-sip.patch +++ /dev/null @@ -1,23 +0,0 @@ -See Gentoo bug #322351. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -99,6 +99,9 @@ include_directories( - ${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 ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip) - set(SIP_CONCAT_PARTS 8) - if (WIN32) -@@ -106,7 +109,7 @@ if (WIN32) - 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}) - - set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) - diff --git a/kde-apps/pykde4/files/pykde4-4.14.3-gcc-5.patch b/kde-apps/pykde4/files/pykde4-4.14.3-gcc-5.patch deleted file mode 100644 index 9c29ffa503fa..000000000000 --- a/kde-apps/pykde4/files/pykde4-4.14.3-gcc-5.patch +++ /dev/null @@ -1,25 +0,0 @@ -Patch created by: Erik Zeek - -See also: https://bugs.gentoo.org/show_bug.cgi?id=567022 - ---- a/CMakeLists.txt -+++ a/CMakeLists.txt -@@ -166,7 +166,7 @@ add_sip_python_module(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS} ${Q - - file(GLOB kio_files_sip sip/kio/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${kio_files_sip}) --add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) -+add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) - - file(GLOB kutils_files_sip sip/kutils/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${kutils_files_sip}) -@@ -190,7 +190,7 @@ add_sip_python_module(PyKDE4.knewstuff sip/knewstuff/knewstuffmod.sip ${KDE4_KNE - - file(GLOB dnssd_files_sip sip/dnssd/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${dnssd_files_sip}) --add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY}) -+add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}) - - file(GLOB phonon_files_sip sip/phonon/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${phonon_files_sip}) - diff --git a/kde-apps/pykde4/files/pykde4-4.14.3-nokio.patch b/kde-apps/pykde4/files/pykde4-4.14.3-nokio.patch deleted file mode 100644 index 795bb5ebc37f..000000000000 --- a/kde-apps/pykde4/files/pykde4-4.14.3-nokio.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/CMakeLists.txt 2017-03-04 13:39:59.460248598 +0100 -+++ b/CMakeLists.txt 2017-03-04 13:56:47.391748964 +0100 -@@ -89,7 +89,6 @@ - ${QT_QTSVG_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR}/solid -- ${KDE4_INCLUDE_DIR}/kio - ${KDE4_INCLUDE_DIR}/dom - ${KDE4_INCLUDE_DIR}/ksettings - ${KDE4_INCLUDE_DIR}/knewstuff2 -@@ -163,26 +162,10 @@ - set(SIP_EXTRA_FILES_DEPEND ${kdeui_files_sip}) - add_sip_python_module(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY}) - --file(GLOB kio_files_sip sip/kio/*.sip) --set(SIP_EXTRA_FILES_DEPEND ${kio_files_sip}) --add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) -- - file(GLOB kutils_files_sip sip/kutils/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${kutils_files_sip}) - add_sip_python_module(PyKDE4.kutils sip/kutils/kutilsmod.sip ${KDE4_KUTILS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS}) - --file(GLOB kparts_files_sip sip/kparts/*.sip) --set(SIP_EXTRA_FILES_DEPEND ${kparts_files_sip}) --add_sip_python_module(PyKDE4.kparts sip/kparts/kpartsmod.sip ${KDE4_KPARTS_LIBS}) -- --file(GLOB ktexteditor_files_sip sip/ktexteditor/*.sip) --set(SIP_EXTRA_FILES_DEPEND ${ktexteditor_files_sip}) --add_sip_python_module(PyKDE4.ktexteditor sip/ktexteditor/ktexteditormod.sip ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -- --file(GLOB khtml_files_sip sip/khtml/*.sip) --set(SIP_EXTRA_FILES_DEPEND ${khtml_files_sip}) --add_sip_python_module(PyKDE4.khtml sip/khtml/khtmlmod.sip ${KDE4_KHTML_LIBS}) -- - file(GLOB knewstuff_files_sip sip/knewstuff/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${knewstuff_files_sip}) - add_sip_python_module(PyKDE4.knewstuff sip/knewstuff/knewstuffmod.sip ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${QT_QTCORE_LIBRARY}) -@@ -199,7 +182,7 @@ - set(SIP_EXTRA_FILES_DEPEND ${kterminal_files_sip}) - add_sip_python_module(PyKDE4.kterminal sip/kterminal/kterminalmod.sip ${KDE4_TERMINAL_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) - --set(PYKDE_MODULES "kdecore solid kdeui kio kutils kparts ktexteditor dnssd phonon kterminal") -+set(PYKDE_MODULES "kdecore solid kdeui kutils dnssd phonon kterminal") - - if(Soprano_FOUND) - include_directories(${SOPRANO_INCLUDE_DIR}) diff --git a/kde-apps/pykde4/files/pykde4-4.14.3-noplasma.patch b/kde-apps/pykde4/files/pykde4-4.14.3-noplasma.patch deleted file mode 100644 index 30c29340914b..000000000000 --- a/kde-apps/pykde4/files/pykde4-4.14.3-noplasma.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/CMakeLists.txt 2017-03-04 13:20:17.605591238 +0100 -+++ b/CMakeLists.txt 2017-03-04 13:39:59.460248598 +0100 -@@ -87,7 +87,6 @@ - ${QT_QTSQL_INCLUDE_DIR} - ${QT_QTXML_INCLUDE_DIR} - ${QT_QTSVG_INCLUDE_DIR} -- ${QT_QTWEBKIT_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR}/solid - ${KDE4_INCLUDE_DIR}/kio -@@ -196,15 +195,11 @@ - set(SIP_EXTRA_FILES_DEPEND ${phonon_files_sip}) - add_sip_python_module(PyKDE4.phonon sip/phonon/phononmod.sip ${PHONON_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) - --file(GLOB plasma_files_sip sip/plasma/*.sip) --set(SIP_EXTRA_FILES_DEPEND ${plasma_files_sip}) --add_sip_python_module(PyKDE4.plasma sip/plasma/plasmamod.sip ${KDE4_PLASMA_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${KDE4_KIO_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY}) -- - file(GLOB kterminal_files_sip sip/kterminal/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${kterminal_files_sip}) - add_sip_python_module(PyKDE4.kterminal sip/kterminal/kterminalmod.sip ${KDE4_TERMINAL_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) - --set(PYKDE_MODULES "kdecore solid kdeui kio kutils kparts ktexteditor dnssd phonon plasma kterminal") -+set(PYKDE_MODULES "kdecore solid kdeui kio kutils kparts ktexteditor dnssd phonon kterminal") - - if(Soprano_FOUND) - include_directories(${SOPRANO_INCLUDE_DIR}) diff --git a/kde-apps/pykde4/metadata.xml b/kde-apps/pykde4/metadata.xml deleted file mode 100644 index 2fdbf33d963d..000000000000 --- a/kde-apps/pykde4/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> -</pkgmetadata> diff --git a/kde-apps/pykde4/pykde4-4.14.3-r3.ebuild b/kde-apps/pykde4/pykde4-4.14.3-r3.ebuild deleted file mode 100644 index 663e9d870df4..000000000000 --- a/kde-apps/pykde4/pykde4-4.14.3-r3.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -PYTHON_REQ_USE="threads" -OPENGL_REQUIRED="always" -CMAKE_MAKEFILE_GENERATOR="emake" -WEBKIT_REQUIRED="never" -inherit python-r1 portability kde4-base multilib eutils - -DESCRIPTION="Python bindings for kdelibs-4" -KEYWORDS="amd64 x86" -IUSE="debug doc examples test" -HOMEPAGE="https://techbase.kde.org/Development/Languages/Python" - -SRC_URI+=" https://dev.gentoo.org/~johu/distfiles/${P}-sip419.patch.bz2" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/PyQt4-4.12[${PYTHON_USEDEP},dbus,declarative,script,sql,svg,X] - >=dev-python/sip-4.19:=[${PYTHON_USEDEP}] - kde-frameworks/kdelibs:4[opengl] -" -DEPEND="${RDEPEND} - dev-lang/python-exec:2[${PYTHON_USEDEP}] - sys-devel/libtool -" - -PATCHES=( - "${FILESDIR}/${P}-gcc-5.patch" - "${FILESDIR}/${P}-noplasma.patch" - "${FILESDIR}/${P}-nokio.patch" - "${DISTDIR}/${P}-sip419.patch.bz2" -) - -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.14.0-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-r2" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper" - fi - python_copy_sources - -} - -src_configure() { - configuration() { - local mycmakeargs=( - -DWITH_PolkitQt=OFF - -DWITH_QScintilla=OFF - -DPYKDEUIC4_ALTINSTALL=TRUE - -DWITH_Nepomuk=OFF - -DWITH_Soprano=OFF - -DWITH_KdepimLibs=OFF - -DPYTHON_EXECUTABLE=${PYTHON} - ) - 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 - - mkdir -p "${D%/}$(python_get_scriptdir)" || die - mv "${ED%/}/usr/bin/pykdeuic4-${EPYTHON/python/}" \ - "${D%/}$(python_get_scriptdir)"/pykdeuic4 || die - - python_fix_shebang "${D%/}$(python_get_scriptdir)"/pykdeuic4 - python_optimize - } - python_foreach_impl run_in_build_dir installation - - dosym ../lib/python-exec/python-exec2 /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 -} |