From d42200bec37eef2a7478d88988ff00addd0a9202 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Jan 2020 11:50:47 +0000 Subject: gentoo resync : 25.01.2020 --- app-text/Manifest.gz | Bin 51515 -> 51508 bytes app-text/calibre/Manifest | 5 + app-text/calibre/calibre-4.9.0.ebuild | 266 ++++++++++++++++++++ app-text/calibre/calibre-4.9.1-r1.ebuild | 269 +++++++++++++++++++++ app-text/calibre/calibre-4.9.1.ebuild | 266 ++++++++++++++++++++ app-text/discount/Manifest | 4 +- app-text/discount/discount-2.2.6.ebuild | 65 +++++ app-text/discount/metadata.xml | 5 +- app-text/mandoc/Manifest | 2 +- app-text/mandoc/mandoc-1.14.5.ebuild | 9 +- .../mpage/files/mpage-2.5.6-fix-buildsystem.patch | 43 ++++ .../mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch | 80 ++++++ .../files/o3read-0.0.4-fix-buildsystem.patch | 36 +++ .../files/xml2doc-20030510-gcc10-no-common.patch | 18 ++ .../xml2doc/files/xml2doc-20030510-makefile.patch | 100 ++++++++ 15 files changed, 1164 insertions(+), 4 deletions(-) create mode 100644 app-text/calibre/calibre-4.9.0.ebuild create mode 100644 app-text/calibre/calibre-4.9.1-r1.ebuild create mode 100644 app-text/calibre/calibre-4.9.1.ebuild create mode 100644 app-text/discount/discount-2.2.6.ebuild create mode 100644 app-text/mpage/files/mpage-2.5.6-fix-buildsystem.patch create mode 100644 app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch create mode 100644 app-text/o3read/files/o3read-0.0.4-fix-buildsystem.patch create mode 100644 app-text/xml2doc/files/xml2doc-20030510-gcc10-no-common.patch create mode 100644 app-text/xml2doc/files/xml2doc-20030510-makefile.patch (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 7b6c3c6e7cc3..deb955ac82de 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 40b512e6b168..9e623b64d3e9 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -5,7 +5,12 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220 DIST calibre-4.7.0.tar.xz 37432756 BLAKE2B 5030bee02506c2051949c248a941289da7b4e6b48aa638abcf14ab9c56f6552b1043f85bc6fbae644e33843711ad11d03da4ac3a320cb7cf4590bc1d0bf92ed8 SHA512 852f3ff45cbf055571c47754b55b51607ede63865fe04263a9c8d5d59973eaa8c5da718f589d2b830567796f59d5bd5189c8e5e9455e3f98e879a37acb7174e3 DIST calibre-4.8.0.tar.xz 37448552 BLAKE2B 416500da33c5a7e0bb84e521db757c1ba5c6e38f04c2b92ad08c2039c64a7c7cc6daddf379cffe120e966e856468cb99da6d80feab75c518a3218a2e07c9cfd9 SHA512 5ab2340d9f4a8e4592aa5929827513127830bca5830f4861db97699fe491845dd17018158dc7c143255ce57730bc9e5ba556ddebb033d18086d0e1901388f840 +DIST calibre-4.9.0.tar.xz 37536676 BLAKE2B 6dd57d1c0e57197b299d253ed7b9b0a941664dccef4fe37cb5586bc32ca29617355db8d84944d8fa9f56e09d3cfea54e9cb893f2eec07f3f359516b6c47ea074 SHA512 5442daf6143571bac5c970ff5f6285cbcd63ec30ce6e77603ef7966fa4e033b3b575fec65887defe5e511b2157ae114349851e2d0f398c117e5fccc799e01046 +DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71 EBUILD calibre-3.48.0-r1.ebuild 8006 BLAKE2B ce4c88fd00d7c02d884b59568beb8ed80cd30cfa72d7017efa2fa0999b0655279ce5592deadd57145e0fc85b15e3dc533d85bcf90c2328a0aa1de13ea1adfb8f SHA512 7092be18d020aef0d5b5ce3b204f3b01a4eee3df8c343c51d914318e90c1bd8ed2c2829fb41f9fc31eb43e234a4c1e9df3216f28a6eeabc49d9dbc70a00aa3e4 EBUILD calibre-4.7.0-r1.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca EBUILD calibre-4.8.0-r1.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca +EBUILD calibre-4.9.0.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca +EBUILD calibre-4.9.1-r1.ebuild 8286 BLAKE2B 65d8355bf16393b7a6311cc8f95732a038548733530f19e59f9ad570a690e9b5fb2d806302dfd74fcdb5df75601320bcc41092f0af68ea14b86970890a20514f SHA512 03f8d2a9256ee2fc39fee5c6e4e7c8f09b65128fe1b60bd9f118c325b882d2a667d68e1bccd9407092f340ee07b284a77db04229f39107aeaa774d183840ba8e +EBUILD calibre-4.9.1.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5 diff --git a/app-text/calibre/calibre-4.9.0.ebuild b/app-text/calibre/calibre-4.9.0.ebuild new file mode 100644 index 000000000000..3049f662198d --- /dev/null +++ b/app-text/calibre/calibre-4.9.0.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils + +DESCRIPTION="Ebook management application" +HOMEPAGE="https://calibre-ebook.com/" +SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz" + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 +" +KEYWORDS="~amd64 ~arm ~x86" +SLOT="0" +IUSE="ios +udisks" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/hunspell-1.7:= + >=app-text/podofo-0.9.6_pre20171027:= + >=app-text/poppler-0.26.5[qt5] + >=dev-libs/chmlib-0.40:= + dev-libs/glib:2= + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/libinput:= + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}] + >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}] + >=dev-libs/dbus-glib-0.106 + >=sys-apps/dbus-1.10.8 + dev-python/dnspython[${PYTHON_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}] + >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-qt/qtcore:5= + dev-qt/qtdbus:5= + dev-qt/qtgui:5= + >=dev-qt/qtwebengine-5.12 + dev-qt/qtwidgets:5= + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache + media-fonts/liberation-fonts + media-libs/fontconfig:= + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.11:= + >=media-libs/libwmf-0.2.8 + >=media-gfx/optipng-0.7.6 + >=sys-libs/zlib-1.2.11:= + virtual/libusb:1= + x11-libs/libxkbcommon:= + x11-libs/libX11:= + x11-libs/libXext:= + x11-libs/libXrender:= + x11-misc/shared-mime-info + >=x11-misc/xdg-utils-1.0.2-r2 + ios? ( + >=app-pda/usbmuxd-1.0.8 + >=app-pda/libimobiledevice-1.2.0 + ) + udisks? ( virtual/libudev )" +RDEPEND="${COMMON_DEPEND} + udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" +DEPEND="${COMMON_DEPEND} + >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + >=virtual/podofo-build-0.9.6_pre20171027 + virtual/pkgconfig" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then + eerror "Calibre cannot be built with this version of gcc." + eerror "You need at least gcc-6.0" + die "Your C compiler is too old for this package." + fi +} + +src_prepare() { + # no_updates: do not annoy user with "new version is availible all the time + # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface + eapply \ + "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ + "${FILESDIR}/${PN}-disable_plugins.patch" + + eapply_user + + # Fix outdated version constant. + #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ + # -i src/calibre/constants.py || \ + # die "sed failed to patch constants.py" + + # Avoid sandbox violation in /usr/share/gnome/apps when linux.py + # calls xdg-* (bug #258938). + sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \ + -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ + -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \ + -e "s|, PreserveMIMEDefaults():|:|" \ + -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \ + -e "s|cmd\[2\]|cmd[4]|" \ + -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ + -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \ + -i src/calibre/linux.py || die "sed failed to patch linux.py" + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ +'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ +'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ +'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ +'-i', 'Makefile'])" \ + -i setup/build.py || die "sed failed to patch build.py" +} + +src_install() { + # Bypass kbuildsycoca and update-mime-database in order to + # avoid sandbox violations if xdg-mime tries to call them. + cat - > "${T}/kbuildsycoca" <<-EOF + #!${BASH} + echo $0 : $@ + exit 0 + EOF + + cp "${T}"/{kbuildsycoca,update-mime-database} || die + chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die + + export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake" + + # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox + # violation with kbuildsycoca as in bug #287067, comment #13. + export -n DISPLAY + + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANG LANGUAGE ${!LC_*} + export LC_ALL=C #684484 + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export XDG_CONFIG_HOME="${HOME}/.config" + export XDG_DATA_HOME="${HOME}/.local/share" + export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre" + mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die + + tc-export CC CXX + # Bug #334243 - respect LDFLAGS when building extensions + export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" + local libdir=$(get_libdir) + [[ -n $libdir ]] || die "get_libdir returned an empty string" + + addpredict /dev/dri #665310 + + PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ + "${PYTHON}" setup.py install \ + --root="${D}" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/${libdir}" \ + --staging-root="${ED}/usr" \ + --staging-libdir="${ED}/usr/${libdir}" || die + + rm "${ED}/usr/share/applications/defaults.list" || die + find "${ED}"/usr/share -type d -empty -delete + + cd "${ED}"/usr/share/calibre/fonts/liberation || die + local x + for x in * ; do + [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue + ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die + done + + einfo "Converting python shebangs" + python_fix_shebang --force "${ED}" + + einfo "Compiling python modules" + python_optimize "${ED}"/usr/lib/calibre + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server + + bashcomp_alias calibre \ + lrfviewer \ + calibre-debug \ + ebook-meta \ + calibre-server \ + ebook-viewer \ + ebook-polish \ + fetch-ebook-metadata \ + lrf2lrs \ + ebook-convert \ + ebook-edit \ + calibre-smtp \ + ebook-device + +} + +pkg_preinst() { + # Indentify stray directories from upstream's "Binary install" + # method (see bug 622728). + CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre + CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do + printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}" +} + +pkg_postinst() { + [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" + local x + for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do + if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then + elog "Purging '${x}'" + rm -rf "${x}" + fi + done + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.9.1-r1.ebuild new file mode 100644 index 000000000000..a158ed8ff2e7 --- /dev/null +++ b/app-text/calibre/calibre-4.9.1-r1.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils + +DESCRIPTION="Ebook management application" +HOMEPAGE="https://calibre-ebook.com/" +SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz" + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 +" +KEYWORDS="~amd64 ~arm ~x86" +SLOT="0" +IUSE="ios +udisks" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/hunspell-1.7:= + >=app-text/podofo-0.9.6_pre20171027:= + >=app-text/poppler-0.26.5[qt5] + >=dev-libs/chmlib-0.40:= + dev-libs/glib:2= + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/libinput:= + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}] + >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}] + >=dev-libs/dbus-glib-0.106 + >=sys-apps/dbus-1.10.8 + dev-python/dnspython[${PYTHON_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}] + >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-qt/qtcore:5= + dev-qt/qtdbus:5= + dev-qt/qtgui:5= + >=dev-qt/qtwebengine-5.12 + dev-qt/qtwidgets:5= + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache + media-fonts/liberation-fonts + media-libs/fontconfig:= + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.11:= + >=media-libs/libwmf-0.2.8 + >=media-gfx/optipng-0.7.6 + >=sys-libs/zlib-1.2.11:= + virtual/libusb:1= + x11-libs/libxkbcommon:= + x11-libs/libX11:= + x11-libs/libXext:= + x11-libs/libXrender:= + x11-misc/shared-mime-info + >=x11-misc/xdg-utils-1.0.2-r2 + ios? ( + >=app-pda/usbmuxd-1.0.8 + >=app-pda/libimobiledevice-1.2.0 + ) + udisks? ( virtual/libudev )" +RDEPEND="${COMMON_DEPEND} + udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" +DEPEND="${COMMON_DEPEND} + >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + >=virtual/podofo-build-0.9.6_pre20171027 + virtual/pkgconfig" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then + eerror "Calibre cannot be built with this version of gcc." + eerror "You need at least gcc-6.0" + die "Your C compiler is too old for this package." + fi +} + +src_prepare() { + # no_updates: do not annoy user with "new version is availible all the time + # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface + eapply \ + "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ + "${FILESDIR}/${PN}-disable_plugins.patch" + + eapply_user + + # Fix outdated version constant. + #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ + # -i src/calibre/constants.py || \ + # die "sed failed to patch constants.py" + + # Avoid sandbox violation in /usr/share/gnome/apps when linux.py + # calls xdg-* (bug #258938). + sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \ + -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ + -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \ + -e "s|, PreserveMIMEDefaults():|:|" \ + -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \ + -e "s|cmd\[2\]|cmd[4]|" \ + -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ + -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \ + -i src/calibre/linux.py || die "sed failed to patch linux.py" + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ +'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ +'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ +'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ +'-i', 'Makefile'])" \ + -i setup/build.py || die "sed failed to patch build.py" +} + +src_install() { + # calibre works with python 3, so remove the python 2 constraint + export CALIBRE_PY3_PORT=1 + + # Bypass kbuildsycoca and update-mime-database in order to + # avoid sandbox violations if xdg-mime tries to call them. + cat - > "${T}/kbuildsycoca" <<-EOF + #!${BASH} + echo $0 : $@ + exit 0 + EOF + + cp "${T}"/{kbuildsycoca,update-mime-database} || die + chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die + + export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake" + + # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox + # violation with kbuildsycoca as in bug #287067, comment #13. + export -n DISPLAY + + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANG LANGUAGE ${!LC_*} + export LC_ALL=C #684484 + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export XDG_CONFIG_HOME="${HOME}/.config" + export XDG_DATA_HOME="${HOME}/.local/share" + export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre" + mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die + + tc-export CC CXX + # Bug #334243 - respect LDFLAGS when building extensions + export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" + local libdir=$(get_libdir) + [[ -n $libdir ]] || die "get_libdir returned an empty string" + + addpredict /dev/dri #665310 + + PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ + "${PYTHON}" setup.py install \ + --root="${D}" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/${libdir}" \ + --staging-root="${ED}/usr" \ + --staging-libdir="${ED}/usr/${libdir}" || die + + rm "${ED}/usr/share/applications/defaults.list" || die + find "${ED}"/usr/share -type d -empty -delete + + cd "${ED}"/usr/share/calibre/fonts/liberation || die + local x + for x in * ; do + [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue + ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die + done + + einfo "Converting python shebangs" + python_fix_shebang --force "${ED}" + + einfo "Compiling python modules" + python_optimize "${ED}"/usr/lib/calibre + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server + + bashcomp_alias calibre \ + lrfviewer \ + calibre-debug \ + ebook-meta \ + calibre-server \ + ebook-viewer \ + ebook-polish \ + fetch-ebook-metadata \ + lrf2lrs \ + ebook-convert \ + ebook-edit \ + calibre-smtp \ + ebook-device + +} + +pkg_preinst() { + # Indentify stray directories from upstream's "Binary install" + # method (see bug 622728). + CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre + CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do + printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}" +} + +pkg_postinst() { + [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" + local x + for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do + if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then + elog "Purging '${x}'" + rm -rf "${x}" + fi + done + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} diff --git a/app-text/calibre/calibre-4.9.1.ebuild b/app-text/calibre/calibre-4.9.1.ebuild new file mode 100644 index 000000000000..3049f662198d --- /dev/null +++ b/app-text/calibre/calibre-4.9.1.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils + +DESCRIPTION="Ebook management application" +HOMEPAGE="https://calibre-ebook.com/" +SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz" + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 +" +KEYWORDS="~amd64 ~arm ~x86" +SLOT="0" +IUSE="ios +udisks" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/hunspell-1.7:= + >=app-text/podofo-0.9.6_pre20171027:= + >=app-text/poppler-0.26.5[qt5] + >=dev-libs/chmlib-0.40:= + dev-libs/glib:2= + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/libinput:= + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}] + >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}] + >=dev-libs/dbus-glib-0.106 + >=sys-apps/dbus-1.10.8 + dev-python/dnspython[${PYTHON_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}] + >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-qt/qtcore:5= + dev-qt/qtdbus:5= + dev-qt/qtgui:5= + >=dev-qt/qtwebengine-5.12 + dev-qt/qtwidgets:5= + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache + media-fonts/liberation-fonts + media-libs/fontconfig:= + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.11:= + >=media-libs/libwmf-0.2.8 + >=media-gfx/optipng-0.7.6 + >=sys-libs/zlib-1.2.11:= + virtual/libusb:1= + x11-libs/libxkbcommon:= + x11-libs/libX11:= + x11-libs/libXext:= + x11-libs/libXrender:= + x11-misc/shared-mime-info + >=x11-misc/xdg-utils-1.0.2-r2 + ios? ( + >=app-pda/usbmuxd-1.0.8 + >=app-pda/libimobiledevice-1.2.0 + ) + udisks? ( virtual/libudev )" +RDEPEND="${COMMON_DEPEND} + udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" +DEPEND="${COMMON_DEPEND} + >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + >=virtual/podofo-build-0.9.6_pre20171027 + virtual/pkgconfig" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then + eerror "Calibre cannot be built with this version of gcc." + eerror "You need at least gcc-6.0" + die "Your C compiler is too old for this package." + fi +} + +src_prepare() { + # no_updates: do not annoy user with "new version is availible all the time + # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface + eapply \ + "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ + "${FILESDIR}/${PN}-disable_plugins.patch" + + eapply_user + + # Fix outdated version constant. + #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ + # -i src/calibre/constants.py || \ + # die "sed failed to patch constants.py" + + # Avoid sandbox violation in /usr/share/gnome/apps when linux.py + # calls xdg-* (bug #258938). + sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \ + -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ + -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \ + -e "s|, PreserveMIMEDefaults():|:|" \ + -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \ + -e "s|cmd\[2\]|cmd[4]|" \ + -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ + -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \ + -i src/calibre/linux.py || die "sed failed to patch linux.py" + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ +'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ +'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ +'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ +'-i', 'Makefile'])" \ + -i setup/build.py || die "sed failed to patch build.py" +} + +src_install() { + # Bypass kbuildsycoca and update-mime-database in order to + # avoid sandbox violations if xdg-mime tries to call them. + cat - > "${T}/kbuildsycoca" <<-EOF + #!${BASH} + echo $0 : $@ + exit 0 + EOF + + cp "${T}"/{kbuildsycoca,update-mime-database} || die + chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die + + export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake" + + # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox + # violation with kbuildsycoca as in bug #287067, comment #13. + export -n DISPLAY + + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANG LANGUAGE ${!LC_*} + export LC_ALL=C #684484 + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export XDG_CONFIG_HOME="${HOME}/.config" + export XDG_DATA_HOME="${HOME}/.local/share" + export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre" + mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die + + tc-export CC CXX + # Bug #334243 - respect LDFLAGS when building extensions + export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" + local libdir=$(get_libdir) + [[ -n $libdir ]] || die "get_libdir returned an empty string" + + addpredict /dev/dri #665310 + + PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ + "${PYTHON}" setup.py install \ + --root="${D}" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/${libdir}" \ + --staging-root="${ED}/usr" \ + --staging-libdir="${ED}/usr/${libdir}" || die + + rm "${ED}/usr/share/applications/defaults.list" || die + find "${ED}"/usr/share -type d -empty -delete + + cd "${ED}"/usr/share/calibre/fonts/liberation || die + local x + for x in * ; do + [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue + ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die + done + + einfo "Converting python shebangs" + python_fix_shebang --force "${ED}" + + einfo "Compiling python modules" + python_optimize "${ED}"/usr/lib/calibre + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server + + bashcomp_alias calibre \ + lrfviewer \ + calibre-debug \ + ebook-meta \ + calibre-server \ + ebook-viewer \ + ebook-polish \ + fetch-ebook-metadata \ + lrf2lrs \ + ebook-convert \ + ebook-edit \ + calibre-smtp \ + ebook-device + +} + +pkg_preinst() { + # Indentify stray directories from upstream's "Binary install" + # method (see bug 622728). + CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre + CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do + printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}" +} + +pkg_postinst() { + [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" + local x + for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do + if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then + elog "Purging '${x}'" + rm -rf "${x}" + fi + done + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest index 55acec09c47d..49fec8b3e215 100644 --- a/app-text/discount/Manifest +++ b/app-text/discount/Manifest @@ -1,3 +1,5 @@ DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf +DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd194a6746dd08e4782cb4b7e60cf47c44f244884fc10372fc2b052fff7d70e6c263e6f4175829d1aedbc8c2ea15c6 SHA512 b67395afed0899563e28fdd2ddd5016d4f382b6b7e46612d12853d701ba191b90771d40e1223e24e3fbf497cad01fdd2e1c67a6b2bf4f6cf082f3fbe981bd002 EBUILD discount-2.2.4.ebuild 1819 BLAKE2B f4b36bf7d003bf01a4a0db7d8b6c5c086b992a73d1c43da5c1d23d2cef856d7f86b84fdf4b962b5e8396d82e212e102386ea2d08ddf715d53f8ada7d070cefa2 SHA512 4a1038c3289588bfb2535ea4ed556e359d12d43f4cf7cb368cbcc704c0a08c36949a6de0bc848962b1966800dc0a980a3475ed6601cbe053546befe84cfc8cca -MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 +EBUILD discount-2.2.6.ebuild 1643 BLAKE2B eea19be77f9800f55465a5faf27690a18c94469e90151e1905c3f5cfff972610cd16ea65ce517e7ae70850884707f43531ea678b82673d5d6935b25a475de549 SHA512 a526b82efa2f3a26ca5cbd5b70b2b651b85dac9fbb17c687b2c0ca3b0971a5f893da66d65818a1d315e08e8748c9df4052acbbe61b7b29df7b9621230b284aae +MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784 diff --git a/app-text/discount/discount-2.2.6.ebuild b/app-text/discount/discount-2.2.6.ebuild new file mode 100644 index 000000000000..9d8ffa589581 --- /dev/null +++ b/app-text/discount/discount-2.2.6.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="A Markdown-to HTML translator written in C" +HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/" +SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="minimal test" +RESTRICT="!test? ( test )" + +src_prepare() { + default + + # for QA, we remove the Makefile’s usage of install -s. + # Drop ldconfig invocation. + # Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS + # at that point). + sed -i \ + -e '/INSTALL_PROGRAM/s,\$_strip ,,' \ + -e 's/\(LDCONFIG=\).*/\1:/' \ + -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \ + configure.inc || die "sed configure.inc failed" +} + +src_configure() { + local configure_call=( + ./configure.sh + --libdir="${EPREFIX}"usr/"$(get_libdir)" + --prefix="${EPREFIX}"usr + --mandir="${EPREFIX}"usr/share/man + --shared + --pkg-config + $(usex minimal '' --enable-all-features) + # Enable deterministic HTML generation behavior. Otherwise, will + # actually call rand() as part of its serialization code... + --debian-glitch + ) + einfo "Running ${configure_call[@]}" + CC="$(tc-getCC)" \ + "${configure_call[@]}" || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + $(usex minimal install install.everything) \ + SAMPLE_PFX="${PN}-" + + insinto /usr/$(get_libdir)/pkgconfig + doins libmarkdown.pc +} + +pkg_postinst() { + if ! use minimal; then + elog 'Sample binaries with overly-generic names have been' + elog "prefixed with \"${PN}-\"." + fi +} diff --git a/app-text/discount/metadata.xml b/app-text/discount/metadata.xml index 7a38bb900964..c67d4dcaca5b 100644 --- a/app-text/discount/metadata.xml +++ b/app-text/discount/metadata.xml @@ -1,5 +1,8 @@ - + + bkohler@gentoo.org + Ben Kohler + diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest index 08f41fe85fa7..fbd48be9c11b 100644 --- a/app-text/mandoc/Manifest +++ b/app-text/mandoc/Manifest @@ -1,5 +1,5 @@ DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52 EBUILD mandoc-1.14.4.ebuild 1538 BLAKE2B 5a9fc9e4967702dbc191ea4ad4e5cfb12b7a1fe2a254f125a4be9ffe6b151db4d1f96cdd99f8dd631f858e38adf43c8379eaf62407afb7eebe47680f9d0fad2d SHA512 bc6480c6a8092eede870763a637ccb9a678f8da143e7aa011bd0111bb6d1943ba90109a79b7b12ef03bbc775d565822332e9ded08a9cc7b2276ccdefa0924d08 -EBUILD mandoc-1.14.5.ebuild 1535 BLAKE2B 01da2e0709c002bdd7f759b2656cd7a0eeb1e0c3970bbf3e1d1aaacfe4f7cf21c4b2bde943a23379e012b5fcc7e3c3dd2d8e3dda16a1ca739fd39840b30a6fbe SHA512 5a9ee80eec5a06fb2e1652a6a23a160f687b47867d844387f6d3ae2e1b83d38c7b1f9aaec58daf95474b7de06ec53f78c21d354ae347df1aea1280b1a2c4eb1c +EBUILD mandoc-1.14.5.ebuild 1720 BLAKE2B 9f273f2cd786495c36cb21b8b7e333a06734534042234943fa726e38d8c9e561412d3991f2975e0be73e4e063a7cf13772adff8b604d23e7326b119cc0a65d1e SHA512 18a61c7ccf76c220d337069cd0ca329b9652250b35046a5cd61ea8aa61ab87a1c164257798f8d576be0382cb1e0914bb8987d5560069bd3fc31aa0cc9ee2f650 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32 diff --git a/app-text/mandoc/mandoc-1.14.5.ebuild b/app-text/mandoc/mandoc-1.14.5.ebuild index 029a69eeadc9..5fdb433abdbd 100644 --- a/app-text/mandoc/mandoc-1.14.5.ebuild +++ b/app-text/mandoc/mandoc-1.14.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -28,6 +28,13 @@ src_prepare() { -e '/^db-install:/s:$: base-install:' \ Makefile || die + # make-4.3 doesn't like the CC line (bug #706024) + # and "echo -n" is not portable + sed \ + -e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \ + -e 's@echo -n@printf@g' \ + -i configure || die + cat <<-EOF > "configure.local" PREFIX="${EPREFIX}/usr" BINDIR="${EPREFIX}/usr/bin" diff --git a/app-text/mpage/files/mpage-2.5.6-fix-buildsystem.patch b/app-text/mpage/files/mpage-2.5.6-fix-buildsystem.patch new file mode 100644 index 000000000000..790d49880649 --- /dev/null +++ b/app-text/mpage/files/mpage-2.5.6-fix-buildsystem.patch @@ -0,0 +1,43 @@ +--- a/Makefile ++++ b/Makefile +@@ -24,7 +24,6 @@ + # Set this to an ANSI compatible C compiler (preferably gcc) + # See also system specific settings below + #CC=cc +-CC=gcc + + ############################################################################ + # +@@ -107,7 +106,7 @@ + # If you are using gcc, you probably don't need to change anything here. + + # Linux: +-CFLAGS = -O2 -s $(DEFS) -Wall ++CPPFLAGS += $(DEFS) + + # AIX (xlC on aix 4): + #CFLAGS = -O2 -s $(DEFS) +@@ -134,10 +133,6 @@ + # END OF CONFIGURATION OPTIONS + # + +-# pattern rules. Should we define these? +-%$(O): %.c +- $(CC) $(CFLAGS) -c -o $@ $< +- + + HEAD = mpage.h + DENC = encoding.h +@@ -150,10 +145,10 @@ + @echo Done! + + mpage$(E): $(MOBJ) +- $(CC) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS) + + msample$(E): $(SOBJ) +- $(CC) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS) + + mpage.1: mpage.1.in + sed 's:PREFIX:${PREFIX}:' < mpage.1.in > mpage.1 diff --git a/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch b/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch new file mode 100644 index 000000000000..c9c37e2efac2 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch @@ -0,0 +1,80 @@ +From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 21 Jan 2020 22:33:49 +0000 +Subject: [PATCH] fg_gl2: fix build failure against gcc-10 + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` +[ 31%] Linking C executable bin/Lorenz_static +/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1 +/usr/lib/ccache/bin/cc -Wall -pedantic -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \ + -o bin/Lorenz_static -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi +ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0): + multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here +ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8): + multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here +``` + +Note: duplicate definition comes here from 'fg_gl2.h'. +The fix is to move declaration to a 'fg_gl2.c' file. + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Bug: https://bugs.gentoo.org/705840 +Signed-off-by: Sergei Trofimovich +--- + freeglut/freeglut/src/fg_gl2.c | 12 ++++++++++++ + freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- + 2 files changed, 19 insertions(+), 7 deletions(-) + +--- a/thirdparty/freeglut/src/fg_gl2.c ++++ b/thirdparty/freeglut/src/fg_gl2.c +@@ -27,6 +27,18 @@ + #include "fg_internal.h" + #include "fg_gl2.h" + ++#ifdef GL_ES_VERSION_2_0 ++/* Use existing functions on GLES 2.0 */ ++#else ++FGH_PFNGLGENBUFFERSPROC fghGenBuffers; ++FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; ++FGH_PFNGLBINDBUFFERPROC fghBindBuffer; ++FGH_PFNGLBUFFERDATAPROC fghBufferData; ++FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; ++FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; ++FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; ++#endif ++ + void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { + if (fgStructure.CurrentWindow != NULL) + fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; +--- a/thirdparty/freeglut/src/fg_gl2.h ++++ b/thirdparty/freeglut/src/fg_gl2.h +@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); + typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); + typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); + +-FGH_PFNGLGENBUFFERSPROC fghGenBuffers; +-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; +-FGH_PFNGLBINDBUFFERPROC fghBindBuffer; +-FGH_PFNGLBUFFERDATAPROC fghBufferData; +-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; +-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; +-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; ++extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; ++extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; ++extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; ++extern FGH_PFNGLBUFFERDATAPROC fghBufferData; ++extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; ++extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; ++extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; + + # endif + +-- +2.25.0 + diff --git a/app-text/o3read/files/o3read-0.0.4-fix-buildsystem.patch b/app-text/o3read/files/o3read-0.0.4-fix-buildsystem.patch new file mode 100644 index 000000000000..63dcf95c0def --- /dev/null +++ b/app-text/o3read/files/o3read-0.0.4-fix-buildsystem.patch @@ -0,0 +1,36 @@ +--- a/Makefile ++++ b/Makefile +@@ -2,8 +2,6 @@ + PACKAGE = o3read + VERSION = 0.0.4 + +-CC = gcc +-CFLAGS = -Wall -ansi -pedantic -O -g + PREFIX = /usr/local + BINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/man/man1 +@@ -16,20 +14,13 @@ + + all: $(BINS) + +-utf8tolatin1: utf8tolatin1.o +- $(CC) -o utf8tolatin1 utf8tolatin1.o ++o3totxt: o3read.o + +-o3totxt: o3totxt.o o3read.o +- $(CC) -o o3totxt o3totxt.o o3read.o ++o3tohtml: o3read.o + +-o3tohtml: o3tohtml.o o3read.o +- $(CC) -o o3tohtml o3tohtml.o o3read.o ++o3tosiag: o3read.o + +-o3tosiag: o3tosiag.o o3read.o +- $(CC) -o o3tosiag o3tosiag.o o3read.o +- +-o3read: main.o o3read.o +- $(CC) -o o3read main.o o3read.o ++o3read: main.o + + dist: + rm -rf $(PACKAGE)-$(VERSION) diff --git a/app-text/xml2doc/files/xml2doc-20030510-gcc10-no-common.patch b/app-text/xml2doc/files/xml2doc-20030510-gcc10-no-common.patch new file mode 100644 index 000000000000..17965c946abe --- /dev/null +++ b/app-text/xml2doc/files/xml2doc-20030510-gcc10-no-common.patch @@ -0,0 +1,18 @@ +--- a/src/defs.h ++++ b/src/defs.h +@@ -18,13 +18,13 @@ + + /* Global vars */ + +-enum ++enum align + { + ALIGN_RIGHT, + ALIGN_LEFT, + ALIGN_JUSTIFY, + ALIGN_CENTER +-} align; ++}; + + typedef struct + { diff --git a/app-text/xml2doc/files/xml2doc-20030510-makefile.patch b/app-text/xml2doc/files/xml2doc-20030510-makefile.patch new file mode 100644 index 000000000000..1023352d0a77 --- /dev/null +++ b/app-text/xml2doc/files/xml2doc-20030510-makefile.patch @@ -0,0 +1,100 @@ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -9,19 +9,16 @@ + DEBUG=@DEBUG@ + PREFIX=@PREFIX@ + +-CC=gcc + OBJ=main.o defs.o parse.o parse_include.o parse_info.o parse_img.o parse_t.o parse_page.o parse_default.o parse_bookmark.o parse_add.o parse_list.o parse_sep.o output_t.o output_doc.o output_img.o output_info.o output_page.o output_sep.o output_list.o parm.o + IPATH=-I/usr/pkg/include/libxml2 -I/usr/include/libxml2 -I. -I/usr/pkg/include -I/usr/local/include + LPATH=-L/usr/pkg/lib -L/usr/local/lib + CFLAGS+=-Wall -c $(IPATH) $(I_PDF)\ + -DVERSION=\"$(VERSION)\" $(DEBUG)\ +- -fno-asm -funroll-all-loops -fstrength-reduce -frerun-loop-opt \ + -x c -fshort-enums + LFLAGS=-lxml2 $(L_PDF) $(LPATH) + BIN=xml2doc + +-all: +- @printf "\e[32mUse make in the parent directory :)\e[0m\n" ++all: build + + install: build + @printf "\e[32mInstalling binaries...\e[0m\n" +@@ -34,75 +31,49 @@ + + build: $(OBJ) + @printf "\n\e[32mLinking objects...\e[0m\n" +- $(CC) $(LFLAGS) $(OBJ) -o $(BIN) +- @if ( test -z "$(DEBUG)" ); then \ +- echo "Stripping symbols..."; \ +- strip -s $(BIN); \ +- fi +- @printf "\n\n\e[32mCompilation process done.\e[0m\n" ++ $(CC) $(LDFLAGS) $(L_PDF) $^ -lxml2 -o $(BIN) + + main.o: main.c main.h +- $(CC) $(CFLAGS) main.c + + parm.o: parm.c parm.h +- $(CC) $(CFLAGS) parm.c + + output_doc.o: output_doc.c output.h +- $(CC) $(CFLAGS) output_doc.c + + output_img.o: output_img.c output.h +- $(CC) $(CFLAGS) output_img.c + + output_info.o: output_info.c output.h +- $(CC) $(CFLAGS) output_info.c + + output_page.o: output_page.c output.h +- $(CC) $(CFLAGS) output_page.c + + output_sep.o: output_sep.c output.h +- $(CC) $(CFLAGS) output_sep.c + + output_list.o: output_list.c output.h +- $(CC) $(CFLAGS) output_list.c + + output_t.o: output_t.c output.h +- $(CC) $(CFLAGS) output_t.c + + parse_add.o: parse_add.c defs.h +- $(CC) $(CFLAGS) parse_add.c + + parse_sep.o: parse_sep.c defs.h +- $(CC) $(CFLAGS) parse_sep.c + + defs.o: defs.c defs.h +- $(CC) $(CFLAGS) defs.c + + parse.o: parse.c defs.h +- $(CC) $(CFLAGS) parse.c + + parse_include.o: parse_include.c defs.h +- $(CC) $(CFLAGS) parse_include.c + + parse_info.o: parse_info.c defs.h +- $(CC) $(CFLAGS) parse_info.c + + parse_img.o: parse_img.c defs.h +- $(CC) $(CFLAGS) parse_img.c + + parse_t.o: parse_t.c defs.h +- $(CC) $(CFLAGS) parse_t.c + + parse_page.o: parse_page.c defs.h +- $(CC) $(CFLAGS) parse_page.c + + parse_default.o: parse_default.c defs.h +- $(CC) $(CFLAGS) parse_default.c + + parse_bookmark.o: parse_bookmark.c defs.h +- $(CC) $(CFLAGS) parse_bookmark.c + + parse_list.o: parse_list.c defs.h +- $(CC) $(CFLAGS) parse_list.c + + clean: + rm -rf $(OBJ) $(BIN) *.o a.out *~ DEADJOE .*.swp *.txt *.pdf *.html *.xml -- cgit v1.2.3