commit: 02203e3b21e08192deee5677b1d89b14f664a600 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 17 23:03:46 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 17 23:05:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02203e3b
sci-misc/mendeleydesktop: Remove last-rited package Closes: https://bugs.gentoo.org/712200 Closes: https://bugs.gentoo.org/725388 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/package.mask | 5 - sci-misc/mendeleydesktop/Manifest | 2 - .../files/mendeleydesktop-1.17.8-libdir.patch | 19 --- .../files/mendeleydesktop-1.17.8-qt5plugins.patch | 15 --- .../mendeleydesktop-1.17.8-unix-distro-build.patch | 16 --- .../mendeleydesktop/mendeleydesktop-1.19.6.ebuild | 127 --------------------- sci-misc/mendeleydesktop/metadata.xml | 10 -- 7 files changed, 194 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index f3ec05476aa..0d79365eb6d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -292,11 +292,6 @@ sys-libs/libkudzu # Removal in 30 days. app-text/kchmviewer -# Andreas Sturmlechner <ast...@gentoo.org> (2020-11-18) -# Depends on deprecated QtWebKit, no maintainer. -# Bugs #712200 and 725388. Removal in 30 days. -sci-misc/mendeleydesktop - # Michał Górny <mgo...@gentoo.org> (2020-11-18) # Upstream has switched to aiobotocore. It's a huge hack that requires # a very specific botocore version, currently 3 months old. Given that diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest deleted file mode 100644 index 292cd0ac1fa..00000000000 --- a/sci-misc/mendeleydesktop/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mendeleydesktop-1.19.6-linux-i486.tar.bz2 156023883 BLAKE2B b6e962100fe4f7a93ad9922bb26ec224cbece1de8f182394799f758942a7f5c666ff959d712c74c250a3dbde082a168250ba92d0a70db30823ac70d7526b6192 SHA512 8d610043abb325a8396256b4e6fca53db9198be7fecad0128120e79279b5ea048240fd98ccb9833d885eb9f9873b8479e184e4103455528d6a897011f798e2f0 -DIST mendeleydesktop-1.19.6-linux-x86_64.tar.bz2 159780391 BLAKE2B ca61beff5b213a3e2712aa95a3f8adff2639e5c22ab2c6cfeddfb985e427958397601f986f0c75b979a22e0119ea4a31dd3ec9b7f1f223a9798b949320e3b07f SHA512 7baebb8e20b7fb47ae49c5d8378469fb30f74f36033b8d9820ccf2b5559a184ec848a2463464c42d526d42c9c111c47e440e3dbf681b4e87dc5eafb9a42cf8ef diff --git a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-libdir.patch b/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-libdir.patch deleted file mode 100644 index 67ba57fca05..00000000000 --- a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-libdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch to find libstdc++. - -https://bugs.funtoo.org/browse/FL-3519 ---- a/bin/mendeleydesktop -+++ b/bin/mendeleydesktop -@@ -29,6 +29,13 @@ def library_paths(): - paths.append("/usr/lib/x86_64-linux-gnu") - paths.append("/usr/lib/i386-linux-gnu") - -+ gcc_libpath = subprocess.Popen( -+ '/usr/bin/gcc-config -L', shell=True, stdout=subprocess.PIPE, -+ ).stdout.read().decode('utf-8').replace('\n', '').split(':') -+ for path in gcc_libpath: -+ if len(path) > 0: -+ paths.append(path) -+ - return paths - - def library_version_from_path(lib_path): diff --git a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-qt5plugins.patch b/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-qt5plugins.patch deleted file mode 100644 index 49395a46a0f..00000000000 --- a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-qt5plugins.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch to find qt5 plugins. - -Patch by Marius Brehler <mar...@linux.sungazer.de> ---- a/bin/mendeleydesktop -+++ b/bin/mendeleydesktop -@@ -75,7 +83,7 @@ def get_paths(): - else: - results['MENDELEY_BIN'] = results['MENDELEY_BASE'] + "/lib/mendeleydesktop/libexec/mendeleydesktop.i486" - -- results['MENDELEY_BUNDLED_QT_PLUGIN'] = results['MENDELEY_BASE'] + "/lib/mendeleydesktop/plugins/" -+ results['MENDELEY_BUNDLED_QT_PLUGIN'] = "/usr/lib/qt5/plugins" - - # Path to Mendeley Desktop and PDFNet libraries - results['MENDELEY_LIB'] = results['MENDELEY_BASE'] + "/lib/" - diff --git a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-unix-distro-build.patch b/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-unix-distro-build.patch deleted file mode 100644 index dffd69df6b5..00000000000 --- a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-unix-distro-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -Patch to force --unix-distro-build. - -Patch by Marius Brehler <mar...@linux.sungazer.de> ---- a/bin/mendeleydesktop -+++ b/bin/mendeleydesktop -@@ -159,10 +167,7 @@ def mendeley_desktop_arguments(): - """ Returns a list with the argumetns to be appended to Mendeley Desktop. """ - extra_args = sys.argv[1:] - -- if is_linux_distro_build(): -- # Enable Linux distro specific changes (eg. in auto-update -- # handling) -- extra_args = extra_args + ["--unix-distro-build"] -+ extra_args = extra_args + ["--unix-distro-build"] - - use_debugger = sys.argv.count("--debug") > 0 diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.6.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.19.6.ebuild deleted file mode 100644 index 5daa682e978..00000000000 --- a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.6.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit desktop python-single-r1 xdg - -MY_P_AMD64="${P}-linux-x86_64" -MY_P_X86="${P}-linux-i486" - -DESCRIPTION="Research management tool for desktop and web" -HOMEPAGE="https://www.mendeley.com/"; -SRC_URI=" - amd64? ( ${MY_P_AMD64}.tar.bz2 ) - x86? ( ${MY_P_X86}.tar.bz2 ) - amd64-linux? ( ${MY_P_AMD64}.tar.bz2 ) - x86-linux? ( ${MY_P_X86}.tar.bz2 )" - -LICENSE="Mendeley-terms" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="bindist fetch" - -DEPEND="" -BDEPEND="" -RDEPEND="${PYTHON_DEPS} - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwebkit:5 - dev-qt/qtxml:5 - sys-libs/zlib - virtual/opengl - x11-libs/libX11 -" - -QA_PREBUILT="/opt/mendeleydesktop/.*" - -PATCHES=( - "${FILESDIR}"/${PN}-1.17.8-libdir.patch - "${FILESDIR}"/${PN}-1.17.8-qt5plugins.patch - "${FILESDIR}"/${PN}-1.17.8-unix-distro-build.patch -) - -pkg_nofetch() { - elog "Please download ${A} from:" - elog "http://www.mendeley.com/download-mendeley-desktop/"; - elog "and move it to your DISTDIR directory." -} - -src_unpack() { - unpack ${A} - - cd "${WORKDIR}" || die - - if use amd64 || use amd64-linux ; then - mv -f "${MY_P_AMD64}" "${P}" || die - else - mv -f "${MY_P_X86}" "${P}" || die - fi -} - -src_prepare() { - xdg_src_prepare - - # remove bundled Qt libraries - rm -r lib/mendeleydesktop/plugins \ - || die "failed to remove plugin directory" - rm -r lib/qt || die - - # fix qt library path - sed -e "s:/usr/lib/qt5/plugins:${EROOT}/usr/$(get_libdir)/qt5/plugins:g" \ - -i bin/mendeleydesktop || die - - # fix library paths - sed -e "s:lib/mendeleydesktop:$(get_libdir)/mendeleydesktop:g" \ - -e "s:MENDELEY_BASE'] + \"/lib/\":MENDELEY_BASE'] + \"/$(get_libdir)/\":g" \ - -i bin/mendeleydesktop || die -} - -src_install() { - # install menu - domenu share/applications/${PN}.desktop - - # install application icons - insinto /usr/share/icons - doins -r share/icons/hicolor - - # install default icon - insinto /usr/share/pixmaps - doins share/icons/hicolor/48x48/apps/${PN}.png - - # install documentation, but no license file - dodoc share/doc/${PN}/Readme.txt - - # install binary - python_fix_shebang bin/${PN} - into /opt/${PN} - dobin bin/* - - # install libraries - dolib.so lib/lib*.so* - - # remove qtconf and qt-5.10 workaround - rm lib/mendeleydesktop/libexec/qt.conf - rm "lib/mendeleydesktop/libexec/QtWebEngineProcess --type=zygote --lang=en-US" - - # install programs - exeinto /opt/mendeleydesktop/$(get_libdir)/mendeleydesktop/libexec - doexe lib/mendeleydesktop/libexec/* - - # install shared files - insinto /opt/${PN}/share - doins -r share/mendeleydesktop - - # symlink launch script - dosym ../mendeleydesktop/bin/mendeleydesktop /opt/bin/mendeleydesktop -} diff --git a/sci-misc/mendeleydesktop/metadata.xml b/sci-misc/mendeleydesktop/metadata.xml deleted file mode 100644 index df5efbe78c2..00000000000 --- a/sci-misc/mendeleydesktop/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription> -Mendeley(TM) is a free reference manager and academic social network that can -help you organize your research, collaborate with others online, and discover -the latest research. -</longdescription> -</pkgmetadata>
