summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/libcacard/libcacard-2.6.0.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-10.8.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-11.3.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.4.22.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.5.17.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.6.13.ebuild2
-rw-r--r--eclass/savedconfig.eclass2
-rw-r--r--media-gfx/iscan-data/Manifest2
-rw-r--r--media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild46
-rw-r--r--media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild44
-rw-r--r--media-gfx/iscan/Manifest1
-rw-r--r--media-gfx/iscan/iscan-2.30.2.2-r1.ebuild166
-rw-r--r--media-gfx/iscan/iscan-2.30.2.2.ebuild174
-rw-r--r--media-gfx/krita/Manifest2
-rw-r--r--media-gfx/krita/krita-4.2.1.ebuild (renamed from media-gfx/krita/krita-4.2.0.ebuild)2
-rw-r--r--x11-misc/virtualgl/virtualgl-2.5.2.ebuild88
16 files changed, 9 insertions, 530 deletions
diff --git a/app-emulation/libcacard/libcacard-2.6.0.ebuild b/app-emulation/libcacard/libcacard-2.6.0.ebuild
index 724f2f32cb0e..dbf88978709d 100644
--- a/app-emulation/libcacard/libcacard-2.6.0.ebuild
+++ b/app-emulation/libcacard/libcacard-2.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
IUSE="+passthrough static-libs"
RDEPEND=">=dev-libs/nss-3.13
diff --git a/dev-db/postgresql/postgresql-10.8.ebuild b/dev-db/postgresql/postgresql-10.8.ebuild
index 260642e26385..47ae80fb8d59 100644
--- a/dev-db/postgresql/postgresql-10.8.ebuild
+++ b/dev-db/postgresql/postgresql-10.8.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT=$(get_major_version)
diff --git a/dev-db/postgresql/postgresql-11.3.ebuild b/dev-db/postgresql/postgresql-11.3.ebuild
index 7f38e0a3f32a..7239df5930ad 100644
--- a/dev-db/postgresql/postgresql-11.3.ebuild
+++ b/dev-db/postgresql/postgresql-11.3.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(get_major_version)
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index c3aa3d92ac10..28f87e69f167 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index 6d619e7de510..85adcb053287 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index b7dd8fbf3d44..a41fea170fee 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index c4a0ccdc8fa0..e0b1953d56d0 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -34,7 +34,7 @@ inherit portability
IUSE="savedconfig"
case ${EAPI} in
- [4-7]) ;;
+ [5-7]) ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
diff --git a/media-gfx/iscan-data/Manifest b/media-gfx/iscan-data/Manifest
index aa1d15d8f368..f5431d0bcd85 100644
--- a/media-gfx/iscan-data/Manifest
+++ b/media-gfx/iscan-data/Manifest
@@ -1,3 +1 @@
-DIST iscan-data_1.36.0-1.tar.gz 100218 BLAKE2B 7731266ae58b44541ca9e39621026aa667707cb46774e8199711e627d773fc1029fecb401de2df7746a476a162774ec1eeec75b9d0bfda82567ccef706547baa SHA512 a9711264c852dd4bdcdb10c1153f725a111bd74b03705c99265b6692bf47236c6e4f5e7e4813991eb5991deb198adeee272c8c3eb53da641ba189d923916d3cb
-DIST iscan-data_1.37.0-3.tar.gz 100499 BLAKE2B 8710a69702306b50bb4d9a21a924dd9bf14748b5310ecbe53d7b4ba24bf47122da9c4bfb57a0769f166aa1ce9c732a943703fe1bfafb9500636654f480026f28 SHA512 051b5a3de2af3d621a3ebc181314809edd25598d3d2dc3868abd3423562aa5c2c00808c5e22ada6253588036b4072644dcf979012645c1ae580e9f701544bd40
DIST iscan-data_1.39.0-1.tar.gz 100793 BLAKE2B 690ce06ed82e817658bd05611a66f9bf6d895bdc17185c585c83c0a8b9c020f0354f782bf991dd4913336799a75d3d424085624e488ca4a77f797088a327fda6 SHA512 15e456d5e64bfe9bea77c3f2a349a2e50c4d8a8cbd1347dfac4ef1f692793561d0d3d32fb3cec10176f013d3b0e46f62d6d24f0870c199088e2e65ec82b4326a
diff --git a/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild
deleted file mode 100644
index 8cb288324b4a..000000000000
--- a/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator udev multilib
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-
-DESCRIPTION="Image Scan! for Linux data files"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-# Use a gentoo hosted url since upstream uses a session based url that causes the
-# files to no longer be available after the session expires.
-SRC_URI="https://dev.gentoo.org/~idella4/tarballs//${PN}_${MY_PVR}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="udev"
-
-DEPEND="udev? (
- dev-libs/libxslt
- media-gfx/sane-backends
- )"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS )
-
-src_install() {
- ewarn ""; ewarn "Some profiles automatically enable udev which will cause install to fail"
- ewarn "if media-gfx/sane-backends is not already installed."; ewarn ""
- default
-
- if use udev; then
- # create udev rules
- local rulesdir=$(get_udevdir)/rules.d
- dodir ${rulesdir}
- "${D}usr/$(get_libdir)/iscan-data/make-policy-file" \
- --force --mode udev \
- -d "${D}usr/share/iscan-data/epkowa.desc" \
- -o "${D}${rulesdir}/99-iscan.rules" || die
- fi
-}
diff --git a/media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild b/media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild
deleted file mode 100644
index b6288026a6cf..000000000000
--- a/media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev multilib
-
-MY_PV="$(ver_cut 1-3)"
-MY_PVR="$(ver_rs 3 -)"
-
-DESCRIPTION="Image Scan! for Linux data files"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="udev"
-
-DEPEND="udev? (
- dev-libs/libxslt
- media-gfx/sane-backends
- )"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS )
-
-src_install() {
- ewarn ""; ewarn "Some profiles automatically enable udev which will cause install to fail"
- ewarn "if media-gfx/sane-backends is not already installed."; ewarn ""
- default
-
- if use udev; then
- # create udev rules
- local rulesdir=$(get_udevdir)/rules.d
- dodir ${rulesdir}
- "${D}/usr/$(get_libdir)/iscan-data/make-policy-file" \
- --force --mode udev \
- -d "${D}/usr/share/iscan-data/epkowa.desc" \
- -o "${D}${rulesdir}/99-iscan.rules" || die
- fi
-}
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 8b76d3a39954..94b2fb3de0d9 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,3 @@
-DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
diff --git a/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
deleted file mode 100644
index be96146638b0..000000000000
--- a/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop flag-o-matic versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-MY_DOC="userg_revQ"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz
- doc? (
- https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
- )"
-
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc gimp jpeg png tiff l10n_ja"
-REQUIRED_USE="gimp? ( X )
- jpeg? ( X )
- png? ( X )
- tiff? ( X )"
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
- media-gfx/iscan-data
- media-gfx/sane-backends
- virtual/udev
- virtual/libusb:1
- X? ( x11-libs/gtk+:2 )
- gimp? ( media-gfx/gimp )
- jpeg? ( virtual/jpeg:= )
- png? ( media-libs/libpng:= )
- tiff? ( media-libs/tiff:= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
- "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
- "${FILESDIR}"/iscan-2.29.1-png-libs.patch
- "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
- "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
-)
-
-QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-src_prepare() {
- local i
-
- # convert japanese docs to UTF-8
- if use l10n_ja; then
- for i in {NEWS,README}.ja non-free/*.ja.txt; do
- if [[ -f ${i} ]]; then
- elog ">>> Converting ${i} to UTF-8"
- iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- fi
- done
- fi
-
- # disable checks for gtk+
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
- fi
-
- default
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE # needed for 'strndup'
- # Fix selector box bug 388073
- replace-flags "-O[0-9s]" "-O1"
-
- local myconf=(
- --enable-dependency-reduction
- --disable-static
- $(use_enable X frontend)
- $(use_enable gimp)
- $(use_enable jpeg)
- $(use_enable png)
- $(use_enable tiff)
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- local MY_LIB="${EPREFIX}/usr/$(get_libdir)"
- emake DESTDIR="${D}" install
-
- # install docs
- dodoc AUTHORS NEWS README
- use l10n_ja && dodoc NEWS.ja README.ja
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # install extra docs
- use doc && dodoc "${DISTDIR}"/${MY_DOC}_$(usex l10n_ja j e).pdf
-
- # link iscan so it is seen as a plugin in gimp
- if use X && use gimp; then
- local plugindir
- if [[ -x ${EPREFIX}/usr/bin/gimptool ]]; then
- plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- elif [[ -x ${EPREFIX}/usr/bin/gimptool-2.0 ]]; then
- plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- else
- die "Can't find GIMP plugin directory."
- fi
- dodir "${plugindir}"
- dosym /usr/bin/iscan "${plugindir}"/iscan
- fi
-
- # install desktop entry
- if use X; then
- make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
- fi
-}
-
-pkg_postinst() {
- local i
- local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
- local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
-
- elog
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF} || die
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
diff --git a/media-gfx/iscan/iscan-2.30.2.2.ebuild b/media-gfx/iscan/iscan-2.30.2.2.ebuild
deleted file mode 100644
index 3cf3ccb4a96d..000000000000
--- a/media-gfx/iscan/iscan-2.30.2.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-KEYWORDS="amd64 x86"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-MY_DOC="userg_revQ"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz
- doc? (
- https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
- )"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X doc gimp jpeg png tiff l10n_ja"
-
-REQUIRED_USE="gimp? ( X )
- jpeg? ( X )
- png? ( X )
- tiff? ( X )"
-
-QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
- media-gfx/iscan-data
- media-gfx/sane-backends
- virtual/udev
- virtual/libusb:1
- X? ( x11-libs/gtk+:2 )
- gimp? ( media-gfx/gimp )
- jpeg? ( virtual/jpeg:= )
- png? ( media-libs/libpng:= )
- tiff? ( media-libs/tiff:= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- eapply_user
- local i
-
- # convert japanese docs to UTF-8
- if use l10n_ja; then
- for i in {NEWS,README}.ja non-free/*.ja.txt; do
- if [ -f "${i}" ]; then
- echo ">>> Converting ${i} to UTF-8"
- iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- fi
- done
- fi
-
- # disable checks for gtk+
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
- fi
-
- epatch "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
- epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
- epatch "${FILESDIR}"/iscan-2.29.1-png-libs.patch
- epatch "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
- epatch "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
-
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE # needed for 'strndup'
- # Fix selector box bug 388073
- replace-flags "-O[0-9s]" "-O1"
-
- local myconf=(
- --enable-dependency-reduction
- --disable-static
- $(use_enable X frontend)
- $(use_enable gimp)
- $(use_enable jpeg)
- $(use_enable png)
- $(use_enable tiff)
- )
- econf ${myconf[@]}
-}
-
-src_install() {
- local MY_LIB="/usr/$(get_libdir)"
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # install docs
- dodoc AUTHORS NEWS README
- use l10n_ja && dodoc NEWS.ja README.ja
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # install extra docs
- if use doc; then
- insinto /usr/share/doc/${PF}
- if use l10n_ja; then
- doins "${DISTDIR}/${MY_DOC}_j.pdf"
- else
- doins "${DISTDIR}/${MY_DOC}_e.pdf"
- fi
- fi
-
- # link iscan so it is seen as a plugin in gimp
- if use X && use gimp; then
- local plugindir
- if [ -x /usr/bin/gimptool ]; then
- plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- elif [ -x /usr/bin/gimptool-2.0 ]; then
- plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
- else
- die "Can't find GIMP plugin directory."
- fi
- dodir "${plugindir}"
- dosym /usr/bin/iscan "${plugindir}"/iscan
- fi
-
- # install desktop entry
- if use X; then
- make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
- fi
-}
-
-pkg_postinst() {
- local i
- local DLL_CONF="/etc/sane.d/dll.conf"
- local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
- elog
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF}
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 00caf204e911..41abb11141a5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,2 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.0.tar.gz 240015177 BLAKE2B 09992b50dfa4e244c809dd576c3b7c0d1cb09b19fde0985c3d72b57543e5a06aa863b9011d655432a089fb6869e2e7fdb23939877b0c4ee6aaf44a1c88e7084c SHA512 a6f373839e47c4e97f5680d266d1ea9f438db6636d3f8749f7fbf6d93b5329e1d46f7233af901dd224722c08100c4fc3b162a163c721299ebfa2d4939032ae44
+DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
diff --git a/media-gfx/krita/krita-4.2.0.ebuild b/media-gfx/krita/krita-4.2.1.ebuild
index 3153c3eba368..f9b39e3a7afa 100644
--- a/media-gfx/krita/krita-4.2.0.ebuild
+++ b/media-gfx/krita/krita-4.2.1.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${COMMON_DEPEND}
# bug 630508
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.2.0-tests-optional.patch" )
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
deleted file mode 100644
index 7b5b05a5b7cf..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib flag-o-matic multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
- )
- media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXv[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- amd64? ( abi_x86_32? (
- >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
- >=x11-libs/libX11-1.6.2[abi_x86_32]
- >=x11-libs/libXext-1.3.2[abi_x86_32]
- >=x11-libs/libXv-1.0.10[abi_x86_32]
- >=virtual/glu-9.0-r1[abi_x86_32]
- >=virtual/opengl-7.0-r1[abi_x86_32]
- ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Use /var/lib, bug #428122
- sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
- server/vglrun.in server/vglgenkey server/vglserver_config || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # Completely breaks steam/wine for discrete graphics otherwise
- # see https://github.com/VirtualGL/virtualgl/issues/16
- append-ldflags "-Wl,--no-as-needed"
-
- abi_configure() {
- local mycmakeargs=(
- -DVGL_USESSL="$(usex ssl)"
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
- -DTJPEG_INCLUDE_DIR=/usr/include
- -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
- -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
- -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
- )
- cmake-utils_src_configure
- }
- multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
- cmake-multilib_src_install
-
- # Make config dir
- dodir /var/lib/VirtualGL
- fowners root:video /var/lib/VirtualGL
- fperms 0750 /var/lib/VirtualGL
- newinitd "${FILESDIR}/vgl.initd-r3" vgl
- newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
- exeinto /usr/libexec
- doexe "${FILESDIR}/vgl-helper.sh"
- systemd_dounit "${FILESDIR}/vgl.service"
-
- # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
- mv "${D}"/usr/bin/{,v}glxinfo || die
-
- # Remove license files, bug 536284
- rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}