summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin65126 -> 65131 bytes
-rw-r--r--media-libs/libgig/Manifest4
-rw-r--r--media-libs/libgig/libgig-4.3.0.ebuild37
-rw-r--r--media-libs/libgig/libgig-9999.ebuild4
-rw-r--r--media-libs/libmng/Manifest2
-rw-r--r--media-libs/libmng/libmng-2.0.3-r1.ebuild2
-rw-r--r--media-libs/libpano13/Manifest4
-rw-r--r--media-libs/libpano13/libpano13-2.9.19.ebuild39
-rw-r--r--media-libs/libpano13/libpano13-2.9.20.ebuild2
-rw-r--r--media-libs/libsdl2/Manifest2
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild2
-rw-r--r--media-libs/netpbm/Manifest8
-rw-r--r--[-rwxr-xr-x]media-libs/netpbm/files/make-tarball.sh0
-rw-r--r--media-libs/netpbm/files/netpbm-10.86.21-build.patch64
-rw-r--r--media-libs/netpbm/files/netpbm-10.86.21-format-security.patch18
-rw-r--r--media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch68
-rw-r--r--media-libs/netpbm/files/netpbm-10.86.21-test.patch10
-rw-r--r--media-libs/netpbm/metadata.xml9
-rw-r--r--media-libs/netpbm/netpbm-10.86.21.ebuild208
-rw-r--r--media-libs/phonon-vlc/Manifest2
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild (renamed from media-libs/phonon-vlc/phonon-vlc-0.11.3.ebuild)2
21 files changed, 433 insertions, 54 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e64722c466f3..3e5ab4f82729 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/libgig/Manifest b/media-libs/libgig/Manifest
index 3adc85a84889..f6a82c3c8284 100644
--- a/media-libs/libgig/Manifest
+++ b/media-libs/libgig/Manifest
@@ -1,4 +1,6 @@
DIST libgig-4.2.0.tar.bz2 746637 BLAKE2B a1ee9a0e77a662395c21995c465b8c4e57331de1ba0ae6636015eefc846698341980e908d7aa30cb607bfe6fb48f84999ea88995b0a254fea2465d21b2b9919b SHA512 52c8c749c7852e229c76c17211398dbf5dd5891a1ee9d8e8bc61d55b825c5676595b20b26014e739b9bfd387db36895152b380519609a928a8fa68f4a20279f6
+DIST libgig-4.3.0.tar.bz2 761973 BLAKE2B 9d1482b4e704dc96bdc44b2b95ed1479f27488567e5f5216dfdf84e7eb51a07a9f8b9550ce6208156e9f2bc43a3495ab6a77c2672e564e2f36fd9734cb4a88fd SHA512 683c09b1d17acf69020c631452b7dfb25ac54c3701db5e97471d4e7973e9a06267667bf19bfe4eb00d2964223e8446f248d93b4cf29c062dec2588758b4dfba2
EBUILD libgig-4.2.0.ebuild 774 BLAKE2B 807d558a753bb569dde2c5efd1e8f938f0ca980ef131762c5debea120fa6566e8589beb2026db4d2973af4d6fa61d23b61c5acf90de60b1d4e9288680140b534 SHA512 e43d9b1637a59a3e98d7f251275a60cf470ca7a2672c18c073f23bdab2c55e362606326cfbe675f0f204cbe6a9152ca6e9992079daf6e9b1bbfcd3dae36ad2a2
-EBUILD libgig-9999.ebuild 851 BLAKE2B ee61ed3123e3e45d21dd4653231e0163ab2459b412524c1f09a486e789b72abc569913777251ab27aa75801dd003d0d9df3fc7a5230c73387c3d6585ef8f1a64 SHA512 9f839169b0ab8e055519c0089b5414357347039ba29a6ee4acb058c2c49921f660bde6839489956095f170d52f7268afb8a57631bb2ee5f7265837aa03d7484e
+EBUILD libgig-4.3.0.ebuild 783 BLAKE2B 7b9e5270dce8a64e064118741fb6960b98dac5df7c9132536357ae831ad83250cbe318296d3ca90657feb47da4f37bfae8b651bf47e5a0b290629bef743b7043 SHA512 a37ce392f33d433c84aae653ca5aaeb53f8ee80511e1a7d1a6f50e6b03153670bed96b7b5e0136e4eb817f48b6ee158c781d3f3b289c3f323aee033c6cd28247
+EBUILD libgig-9999.ebuild 858 BLAKE2B 7face0e502a5a58ae95c7edc677858fb2cef9ea0e4eec90d04059e40c984a7180fba13d6faad77c622acd9b87db220f17dd95ebe7b7cd28c3c08051a19dddb46 SHA512 ed568450278a9b7fb5c807dc31ca4f054239c867afc796d0439ff41057c348f5ca55d4f0ff2661a6fd7fdd94012006f984a1098a3937ea9047670ff3fa387671
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libgig/libgig-4.3.0.ebuild b/media-libs/libgig/libgig-4.3.0.ebuild
new file mode 100644
index 000000000000..28e971ce67c9
--- /dev/null
+++ b/media-libs/libgig/libgig-4.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for loading Gigasampler and DLS level 1/2 files"
+HOMEPAGE="https://www.linuxsampler.org/libgig/"
+SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="
+ media-libs/audiofile
+ media-libs/libsndfile"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+src_compile() {
+ emake
+ use doc && emake docs
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ use doc && HTML_DOCS=( doc/html/. )
+ einstalldocs
+
+ # For libgig.so to be found at runtime
+ printf "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/libgig/\"" > 99${PN} || die
+ doenvd "99${PN}"
+}
diff --git a/media-libs/libgig/libgig-9999.ebuild b/media-libs/libgig/libgig-9999.ebuild
index 561d6f46afc3..3ffea9ed65bf 100644
--- a/media-libs/libgig/libgig-9999.ebuild
+++ b/media-libs/libgig/libgig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,6 @@ src_install() {
einstalldocs
# For libgig.so to be found at runtime
- printf "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/libgig/\"" > 99${PN}
+ printf "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/libgig/\"" > 99${PN} || die
doenvd "99${PN}"
}
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 2e429e35e1f9..43a8c507496e 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,5 +1,5 @@
AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
-EBUILD libmng-2.0.3-r1.ebuild 1183 BLAKE2B 2dd7af04fafb9c9af1f56b5b0b4e95ddc5d4090277f4fb5948c1bf8a7b55c058b23a13265d6338e111d9a4d843ebb2de2f38157d2a9116ae02abf00108c59d83 SHA512 58f8a7f24783eb53aaa6fb037f8288762e52a7174786ff5be329443a56badf17d1105d3cc661b2a3c04d67aee3476bd7f1046edb455bf39167c36001789574ab
+EBUILD libmng-2.0.3-r1.ebuild 1176 BLAKE2B bfe03984708e67885728e396aa1bd88319c2331ddb0e412927526a2f99c6d5d44688c6c8a768572c0589fe3e722a428043812eee7fd977c10656b528e322a312 SHA512 1d7dbcaf2e1d99b647710c426b2d784ceb94992762457d9a6fd842b534d24aaa5a7faaeca0ca5329c76dff2dc56c6bea63577afdb9567dd4dfe9074a55c45294
EBUILD libmng-2.0.3.ebuild 1221 BLAKE2B 0463241e6eb9f36fb561c0661d213838b100727b4e7ef0ef81ae9e903b330b365a711a23f5d70d5400d509b66c30a3d321d29bf0015999b80ff03fc93cdb6bab SHA512 739abb6ab344fa3c2f30897af3eb7ce99a9ee913863fc6784a725fc617eb0e60967c36f1624030724b98e909888f36a9532a540158bf4b1f432b92f679e8926b
MISC metadata.xml 291 BLAKE2B a9b24a9ed6218970d09a574357f76445e0966a927f5d12cf72b2be8b01a7dc6070562bdcb13d7f341b16ea695d45bf0330eb8a9e416593f79eff1fd5171638b1 SHA512 662be34d4175954a83c5dafae699a79ddefd0faef98f541d0c7ab1cccf930e1e980f9cb1c9efe085dafe4ed6373a254aee9d5f2f936b537da29acfa0cf5ea02c
diff --git a/media-libs/libmng/libmng-2.0.3-r1.ebuild b/media-libs/libmng/libmng-2.0.3-r1.ebuild
index 02fad4102451..2a462dcbbc22 100644
--- a/media-libs/libmng/libmng-2.0.3-r1.ebuild
+++ b/media-libs/libmng/libmng-2.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
LICENSE="libmng"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="lcms"
RDEPEND="
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 6780781d9f18..dd4628165067 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,5 +1,3 @@
-DIST libpano13-2.9.19.tar.gz 3527845 BLAKE2B 59d6b46b75de60a3230eb46e42bbb0f7b8826ac5b84d1dc32d28cc384b6690b258c0c3a6b75d3423a1583daccbd0aecd3f010eb58fb356cae5c54d29e05672f0 SHA512 f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868
DIST libpano13-2.9.20.tar.gz 3564544 BLAKE2B aabf9d8a3dac5b01e4a5bdb6d5ad6b56ea3e672f143b002c06b7108fae19cd6a00e8b524a4c18cbe16c65f41242fc12e7b19dd71c00bf6b553db65472fe8798d SHA512 18da5cb3760f06df8007622a64c4121c3acdadf8b02faa2125f319acde30532378cec5d97ccd5a65d6d2c1960c1b4946c80ffa850da2dc790051f5c0b76f8a86
-EBUILD libpano13-2.9.19.ebuild 883 BLAKE2B 1cedb29f99b8b987c86bdb9b3930545a8f41b2ff54a5a9012983e21c32c3b4a19cf0a711c6d9a3c5dcc57a242b1f8e9f19584f396a5db9e76858726e28d8b76c SHA512 e4796a286ec4fd9ddc666e6c5fbff7fb4b41800b8b4ec904710c997c25b03688acc994b0ff45a23fc958a1707a8e268f5bcab6d21823fa4520fcc426762cd9e2
-EBUILD libpano13-2.9.20.ebuild 866 BLAKE2B b60d021a143de4504834dcf384f9aff9acd590a1bbbf4c7b955b7b01711fb9328cbdfc3c132a7b8c75086473d9513e5997f8870a92befd1aed78ae72cc21f0fd SHA512 a466f5b447f9b59902414725e451a2e15c5fa113fea134e811d58d924bfc18d84b6ffed1a5350d87a7408a1f57c777686aa32ef617d1cbf887da26472be2ce36
+EBUILD libpano13-2.9.20.ebuild 863 BLAKE2B bfedeb2bdacaaf0869fc81b94639696d8e3a55780ece792315d106bf4b273f24ef37e3616277d36d78397f19fdedb79ddc826cb7d0eb6454dd046ee7f82c5d29 SHA512 70a3d1b93416a41481a5de719aee25a322caaf5093eb781b257c5e23d115e642531297110d785d90e552d98d0ff435b6c457e650234e801b43a5392fefc706ee
MISC metadata.xml 324 BLAKE2B 04d40b636b02143022e3a5e9d5733a8bb758937d86d0800faf7dcf21b501f97ff8e970e13b5e842492e74f237dfed8f07efb40ce3e952172c41a208196a4cf23 SHA512 40a9330f4bbbfdc98598c5677d7b9ce485fe13e96bfc976f3829e881c5da234e8abc6d5c9e8db7522ba32536d953b2a0daddc878bc09fb474d446139da33f3a6
diff --git a/media-libs/libpano13/libpano13-2.9.19.ebuild b/media-libs/libpano13/libpano13-2.9.19.ebuild
deleted file mode 100644
index eb91c186da4d..000000000000
--- a/media-libs/libpano13/libpano13-2.9.19.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator java-pkg-opt-2 ltprune
-
-DESCRIPTION="Helmut Dersch's panorama toolbox library"
-HOMEPAGE="http://panotools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="java static-libs"
-
-DEPEND="media-libs/libpng:0=
- media-libs/tiff:0
- sys-libs/zlib
- virtual/jpeg:0
- java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_configure() {
- LIBS="-lm" econf \
- $(use_with java java ${JAVA_HOME}) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README README.linux AUTHORS NEWS doc/*.txt
-
- if ! use static-libs ; then
- prune_libtool_files
- fi
-}
diff --git a/media-libs/libpano13/libpano13-2.9.20.ebuild b/media-libs/libpano13/libpano13-2.9.20.ebuild
index fd5ec44fc28f..8312b798bdb8 100644
--- a/media-libs/libpano13/libpano13-2.9.20.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="java static-libs"
DEPEND="media-libs/libpng:0=
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 1e679bed8d61..a42145fc4f54 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,6 +6,6 @@ AUX libsdl2-2.0.14-vulkan.patch 554 BLAKE2B 654415d20fc1782ee8d3a979355dcb743537
DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
EBUILD libsdl2-2.0.12-r2.ebuild 5880 BLAKE2B b762d683d18fca57041ef5abdc328258bd8ae7f9bb79f1b3baae9aa40337acc873a71ba1c558754bb08862b5e39bcce37d68625fd770965bac3cdcc5f65a249b SHA512 4c5ce2040cbedede83c4103aaa6a4fea4c4d26d654b0ae3da1ea8d704d64e3e7b9f7f7cf89b208d8900c61a29ba85ad2f5948ad2905ba499ba8017dd2574c8dd
-EBUILD libsdl2-2.0.14-r1.ebuild 6043 BLAKE2B 2e277b84d1d5e55971e613ed6352b4cef0a3d569c83bea20764e9f774c0d24dbdcb36e7a8c873b9f5a66988a973dec4d4a40b29aff6a7e79cb58486c52707ef1 SHA512 f96a6a92a7201bbc1f0d714627523a17c336f739f41bc0929cf0c90499a130bf7cee8358dc1d84a7b95f17ceef431f3b51be323d1ac259e4153b583bbe5db24c
+EBUILD libsdl2-2.0.14-r1.ebuild 6042 BLAKE2B fdfa03ea09941f9bc5f25a849025bfd4449b36397c7a0a8fe369f50ddf7e097f4bce95564eb65fd43a0f5e988e4722729b50cd64cb154d1605684b9e4af4fadc SHA512 79c358c001ae930a5136aa4d09cd6f35d63f3b98d8d1502a039029f481e2d3691bc83056d2ecfafe696c894d91c0ca7c3fe736a087e13b6bd32d3f82962b8e18
EBUILD libsdl2-2.0.14-r2.ebuild 6155 BLAKE2B db8f074cfd21ca9dd922c79228d5ff85d191872909c8da1bae03ed2613919300a37e8c9929d7295103cb29be96189db1da424c3a5bfad2d7ec517dfa64920004 SHA512 21e44e143bc637862fb9a6c760857205fe1a11abae1d055cf236b2a40ad27b2ab080c80797f46731e422f67050c4d2761f2595ac3dbda2e18062401d1676e8fc
MISC metadata.xml 1863 BLAKE2B 96b91c7b6e7dd08e8410626cedfdd6b5e563be61356573405c740d0f2ef5fa1dc6e060a38fcd4b60a5adab81591ab7d9cd2196be68bf9f705a1d0244982418bb SHA512 60ddaf41efbbcddfe9f4a9a02e82108831c6326c86410d16d9e4c5dc008cddef3f7159e2d2d2612c2d278f235f0604c0350771d17dc620d46986699e455751c3
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
index 336acb8f99b7..80f626e5bab7 100644
--- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
REQUIRED_USE="
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index df97dd33df16..399a1708979c 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -6,8 +6,14 @@ AUX netpbm-10.76.00-build.patch 1295 BLAKE2B 5ce1a973f503ded256fad7d8c2dddf24663
AUX netpbm-10.76.00-misc-deps.patch 1677 BLAKE2B 2b54610958755b452bffd186e6bdbac16db9c7b0a0242776798a7cc4b6685c4b0a26bcea7810e392437bba25a8839b5852a84fc3acc2daa50e1a893d7c58d702 SHA512 a632c2eb9afd3fcd4ed7a9467293ad9ac6201296c0910d150f6a1c94121cf0dac9654531fd18c5aec7b412c3fae203a28e62b00cff877629f89e4f995ab730b2
AUX netpbm-10.76.00-pbmtext-test.patch 711 BLAKE2B 7e1b825bd9735ace1e91c1e705df4843aebbec61d090ec3903e680aac3facba80075ffa518340140657e33cd6c36ae84cd669e9dcddb920d832caed218b6651e SHA512 32be11758652105a6964bca3a9b08c06ed34e2f9ea00370c8d3a961a0ba8b64102120881238fe016d0b0ca4f10882b25f655691bbd75be8ceb700e68a624d5ca
AUX netpbm-10.76.00-test.patch 6045 BLAKE2B ec4bf18a2022e67b26b78a591f3949552e103d9dbaec0793707988265ecd9f1006e576b094e4a47c9a94de5aa0ac2be00702493d3234364e91e727ac90ca4f61 SHA512 36244194a688d7b3f9ef632ecc3a56ea9aae3e28ad68d4dc5f1a804c19203a76b76fd75c1d999661dea4aa6e529e7200fd195383d8585d129d6df088a0c633b5
+AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55cc6e990186f506c67496fce774fdfef1ba23843129fd493f8aa3e4ad5f74cfcf1d2388da95225ac2ef19f0c949f425 SHA512 459c54dac19067f2185a02ef812932e8fcb6a73d6267c32578bd3b7d3b12494052e929b24663407ad919e1e98aa2df58ed8e27be3f18eeb2fbe2402e4ff9e629
+AUX netpbm-10.86.21-format-security.patch 730 BLAKE2B 2957d10c75264688a47a6b42a43915c4a29e97c8c097008d30adcb9783a90575bc7526121dea02d9016eb456dfbd08bd06cb2a76d22eef36620223be266dcb06 SHA512 e7b90662d8f2bb786bc0473151c949c6cb1d467e122114b5d4c8018e4b8cf3b6b2dc49a1a8b1deae95706b81d8d61bee38506b6deb82eb30d40762d4d8e6d934
+AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd3764368be33f264929bdc338bb724ace03471949467e5c84144636a9f4ee9130395dad77e23aa6686998bf9700dbde224cbf SHA512 f274ede7d11ed0f2a1825a4412a52fd9e30f5caf470c6111b606a87f1e67b16278c9f2a901d512ea3516ba033e30a3c08386cc5af1a555f868b7d7175fbfeed0
+AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
+DIST netpbm-10.86.21.tar.xz 3768736 BLAKE2B 19d641f3519f55d737aa6cd22f60847b2b241f71134bc7f9fa558e681cbffb1bff53f16e4d89e7a85b20b86e0bf0f4d9c341dde656ca07a7bc20adc94e811e36 SHA512 caa6c18039be72c47419b3ef60b64e0a04123752beb27bab178adcbb48e5311da05b422205f52c784149bb0636be1e3155e6bbf7703ec5c5775cb9981de1008e
EBUILD netpbm-10.70.00.ebuild 5373 BLAKE2B bae61227e2fd3e65aa4005e4abb612cbf8e4ab749ff61921c9999eb4fa9203eea7efc9256df0149b47f3877aa2dad9c91a05df774801272e3c467e16ea578fb2 SHA512 b94aeeb1d9c1b7e721708711e1eb5d2bbdfd69692540edd1b79a102c191fb8bad1cc57e6ce18a0ba2e36a417416ddb7ec233381a0ca482cbad8757b90cde5e02
EBUILD netpbm-10.76.00.ebuild 5261 BLAKE2B 56e5848b5c56ea78e54c7b2d09ef1bf942afe4aa8148ae3b534c8df9db9bae562753b0f1139e681bcc52e9758dedad4fa8ea2a6922260ae301e5607e168683ce SHA512 c75b3a3715371cd535c73811c667cc7c4d97f0e37089c017d769a572d7c716cb9b23a93f7f06f84760e0cd3d2203d6df61165c67533663f5a47f8607cca4d3e0
-MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b
+EBUILD netpbm-10.86.21.ebuild 5547 BLAKE2B b692572c523bd7840f60e955b584166996bec57629ee1bbf0a8d8a719233d7f5ba65e62c3f8609dc06024a7543f2aacfc793a3742871bcdeda4ee58f086c1b56 SHA512 c00bc6a48866f4e105d40558ae6bcac12f0d9660f1cbbb52efe92cb3dc55fae0489ceb9cf554cdbd433faa634cd92f612c444f4ae9661b18b9d8c8c9c9edba2c
+MISC metadata.xml 577 BLAKE2B c70497704f1a34aa7b8bcf905c05560e554957e6350b7c219ea2050815215aa926f4242ae233c9f6b11a1dd9900fcbef0956cb45d50044720769857c15808b4b SHA512 9813c0b3d04c040a54dadbcedb1e88f1d90cbff7001381f7136c84ae3909788423496c7c97242cb989c63bf5127df5196d62e75c503fb2475f14f14cfd3741f0
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
index 29ad4b3d92e4..29ad4b3d92e4 100755..100644
--- a/media-libs/netpbm/files/make-tarball.sh
+++ b/media-libs/netpbm/files/make-tarball.sh
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-build.patch b/media-libs/netpbm/files/netpbm-10.86.21-build.patch
new file mode 100644
index 000000000000..7995c6daaf48
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.21-build.patch
@@ -0,0 +1,64 @@
+- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
+- Try to fix parallel building
+
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -221,7 +221,7 @@
+ .PHONY: install.lib
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install a Unix-style shared library
+-install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink
++install.lib: $(PKGDIR)/lib
+ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
+ $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
+ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/
+@@ -263,29 +263,29 @@
+ $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/
+
+ .PHONY: install.staticlib
+-install.staticlib: $(PKGDIR)/staticlink
++install.staticlib: $(PKGDIR)/lib
+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
+- $(PKGDIR)/staticlink
++ $(PKGDIR)/lib
+
+ # Install a shared library stub -- the ".so" file used at link time to
+ # prepare a program for dynamically linking a library at run time
+ .PHONY: install.sharedlibstub
+-install.sharedlibstub: $(PKGDIR)/sharedlink
++install.sharedlibstub: $(PKGDIR)/lib
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install the link-time (.so) links to the runtime libraries
+- cd $(PKGDIR)/sharedlink ; \
++ cd $(PKGDIR)/lib ; \
+ rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
+- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
++ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
+ libnetpbm.$(NETPBMLIBSUFFIX)
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)
+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \
+- $(PKGDIR)/sharedlink
++ $(PKGDIR)/lib
+ endif
+ ifeq ($(NETPBMLIBTYPE),dylib)
+- cd $(PKGDIR)/sharedlink/ ; \
++ cd $(PKGDIR)/lib/ ; \
+ rm -f libnetpbm.dylib; \
+- $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib
++ $(SYMLINK) libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib
+ endif
+
+ distclean clean: localclean
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -102,6 +102,9 @@
+ .PHONY: nonmerge
+ nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
+
++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
++converter/all analyzer/all editor/all generator/all other/all: lib/all
++
+ # Completely parallel make (make --jobs) does not work because there are
+ # multiple targets somewhere in the Netpbm build that depend upon pm_config.h
+ # and similar targets, and the threads building those multiple targets might
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch b/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch
new file mode 100644
index 000000000000..a7afc259ff5c
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch
@@ -0,0 +1,18 @@
+Fix compiling with `CFLAGS` `-Werror=format-security`
+See also https://bugs.gentoo.org/517524
+
+--- a/converter/ppm/ximtoppm.c
++++ b/converter/ppm/ximtoppm.c
+@@ -117,9 +117,9 @@
+ */
+ header->bits_channel = atoi(a_head.bits_per_channel);
+ header->alpha_flag = atoi(a_head.alpha_channel);
+- pm_asprintf(&header->author, a_head.author);
+- pm_asprintf(&header->date, a_head.date);
+- pm_asprintf(&header->program, a_head.program);
++ pm_asprintf(&header->author, "%s", a_head.author);
++ pm_asprintf(&header->date, "%s", a_head.date);
++ pm_asprintf(&header->program, "%s", a_head.program);
+ /* Do double checking for bakwards compatibility */
+ if (header->npics == 0)
+ header->npics = 1;
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch
new file mode 100644
index 000000000000..78c7670c9a8f
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch
@@ -0,0 +1,68 @@
+do not autoprobe deps when we disabled them
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -75,7 +75,10 @@
+
+ PROG_SUBDIRS = converter analyzer editor generator other
+ PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
+-SUPPORT_SUBDIRS = urt icon buildtools test
++SUPPORT_SUBDIRS = icon buildtools test
++ifeq ($(URTLIB),$(BUNDLED_URTLIB))
++SUPPORT_SUBDIRS += urt
++endif
+
+ SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
+
+--- a/converter/other/Makefile
++++ b/converter/other/Makefile
+@@ -7,6 +7,7 @@
+
+ include $(BUILDDIR)/config.mk
+
++ifneq ($(XML2_LIBS),NONE)
+ TEST_PKGCONFIG_LIBXML2 = if $(PKG_CONFIG) libxml-2.0; then echo exists; fi
+
+ ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
+@@ -22,6 +23,7 @@
+ XML2_CFLAGS=$(shell xml2-config --cflags)
+ endif
+ endif
++endif
+
+ SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
+ ifneq ($(BUILD_FIASCO), N)
+@@ -34,6 +36,7 @@
+ endif
+ endif
+
++ifneq ($(PNGLIB),NONE)
+ TEST_PKGCONFIG_LIBPNG = if $(PKG_CONFIG) libpng$(PNGVER); then echo exists; fi
+
+ ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
+@@ -58,6 +61,7 @@
+ endif
+ endif
+ endif
++endif
+
+ ifneq ($(JPEGLIB),NONE)
+ ifneq ($(JPEGHDR_DIR)x,x)
+--- a/other/pamx/Makefile
++++ b/other/pamx/Makefile
+@@ -9,6 +9,7 @@
+
+ EXTERN_INCLUDE =
+
++ifneq ($(X11LIB),NONE)
+ ifeq ($(shell $(PKG_CONFIG) x11 --modversion --silence-errors),)
+ # Pkg-config has never heard of X11, or doesn't even exist
+
+@@ -23,6 +24,7 @@
+ X11LIB = $(shell $(PKG_CONFIG) x11 --libs)
+ EXTERN_INCLUDES += $(shell $(PKG_CONFIG) x11 --cflags)
+ endif
++endif
+
+ ifeq ($(HAVE_X11LIB),Y)
+ PORTBINARIES += pamx
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-test.patch b/media-libs/netpbm/files/netpbm-10.86.21-test.patch
new file mode 100644
index 000000000000..b7758fdbd61e
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.21-test.patch
@@ -0,0 +1,10 @@
+`print ("got color map\n");` removed from `editor/pnmquantall` so remove from test
+Do this from the patch instead of ebuild because if upstream also fixes it the patch will fail, sed would not
+
+--- a/test/pnmquantall.ok
++++ b/test/pnmquantall.ok
+@@ -1,4 +1,3 @@
+-got color map
+ 2373957371 33838
+ 3892560659 33838
+ 1383839923 33838
diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
index 788f49b6fe29..d5e770850fa4 100644
--- a/media-libs/netpbm/metadata.xml
+++ b/media-libs/netpbm/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>ceamac.paragon@gmail.com</email>
+ <name>Viorel Munteanu</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag>
</use>
diff --git a/media-libs/netpbm/netpbm-10.86.21.ebuild b/media-libs/netpbm/netpbm-10.86.21.ebuild
new file mode 100644
index 000000000000..342952e16c90
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.86.21.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.21/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+
+BDEPEND="
+ app-arch/xz-utils
+ sys-devel/flex
+ virtual/pkgconfig
+"
+RDEPEND="jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ png? ( >=media-libs/libpng-1.4:0 )
+ postscript? ( app-text/ghostscript-gpl )
+ rle? ( media-libs/urt )
+ svga? ( media-libs/svgalib )
+ tiff? ( >=media-libs/tiff-3.5.5:0 )
+ xml? ( dev-libs/libxml2 )
+ zlib? ( sys-libs/zlib )
+ X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/netpbm-10.86.21-build.patch
+ "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
+ "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
+ "${FILESDIR}"/netpbm-10.86.21-format-security.patch #517524
+)
+
+netpbm_libtype() {
+ case ${CHOST} in
+ *-darwin*) echo dylib;;
+ *) echo unixshared;;
+ esac
+}
+
+netpbm_libsuffix() {
+ local suffix=$(get_libname)
+ echo ${suffix//\.}
+}
+
+netpbm_ldshlib() {
+ case ${CHOST} in
+ *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+ *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+ esac
+}
+netpbm_config() {
+ if use ${1} ; then
+ [[ ${2} != "!" ]] && echo -l${2:-$1}
+ else
+ echo NONE
+ fi
+}
+
+src_prepare() {
+ default
+
+ # make sure we use system libs
+ sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+ rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+ # take care of the importinc stuff ourselves by only doing it once
+ # at the top level and having all subdirs use that one set #149843
+ sed -i \
+ -e '/^importinc:/s|^|importinc:\nmanual_|' \
+ -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
+ common.mk || die
+ sed -i \
+ -e '/%.c/s: importinc$::' \
+ common.mk lib/Makefile lib/util/Makefile || die
+ sed -i \
+ -e 's:pkg-config:$(PKG_CONFIG):' \
+ GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+ # The postscript knob is currently bound up with a fork test.
+ if ! use postscript ; then
+ sed -i \
+ -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+ converter/other/Makefile generator/Makefile || die
+ sed -i -r \
+ -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i -e '/^$/d' test/all-in-place.ok || die
+ sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
+ fi
+
+ # Do not test png if not built
+ if ! use png ; then
+ sed -i -r \
+ -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i -e '/^$/d' test/all-in-place.ok || die
+
+ sed -i -r \
+ -e 's:(pamrgbatopng|pngtopnm).*::' \
+ test/legacy-names.{ok,test} || die
+ sed -i -e '/^$/d' test/legacy-names.ok || die
+ fi
+
+ # avoid ugly depend.mk warnings
+ touch $(find . -name Makefile -exec sed "s:Makefile:depend.mk:g" {} + || die)
+}
+
+src_configure() {
+ cat config.mk.in - >> config.mk <<-EOF || die
+ # Misc crap
+ BUILD_FIASCO = N
+ SYMLINK = ln -sf
+
+ # These vars let src_test work by default
+ PKGDIR_DEFAULT = ${T}/netpbm
+ RESULTDIR_DEFAULT = ${T}/netpbm-test
+
+ # Toolchain options
+ CC = $(tc-getCC) -Wall
+ LD = \$(CC)
+ CC_FOR_BUILD = $(tc-getBUILD_CC)
+ LD_FOR_BUILD = \$(CC_FOR_BUILD)
+ AR = $(tc-getAR)
+ RANLIB = $(tc-getRANLIB)
+ PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+ STRIPFLAG =
+ CFLAGS_SHLIB = -fPIC
+
+ LDRELOC = \$(LD) -r
+ LDSHLIB = $(netpbm_ldshlib)
+ LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+ LINKERISCOMPILER = Y
+ NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+ NETPBMLIBTYPE = $(netpbm_libtype)
+ STATICLIB_TOO = $(usex static-libs Y N)
+
+ # The var is called SSE, but the code is actually SSE2.
+ WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
+
+ # Gentoo build options
+ TIFFLIB = $(netpbm_config tiff)
+ # Let tiff worry about its own dependencies #395753
+ TIFFLIB_NEEDS_JPEG = N
+ TIFFLIB_NEEDS_Z = N
+ JPEGLIB = $(netpbm_config jpeg)
+ PNGLIB = $(netpbm_config png)
+ ZLIB = $(netpbm_config zlib z)
+ LINUXSVGALIB = $(netpbm_config svga vga)
+ XML2_LIBS = $(netpbm_config xml xml2)
+ JBIGLIB = $(netpbm_config jbig)
+ JBIGHDR_DIR =
+ JASPERLIB = NONE
+ JASPERHDR_DIR =
+ URTLIB = $(netpbm_config rle)
+ URTHDR_DIR =
+ X11LIB = $(netpbm_config X X11)
+ X11HDR_DIR =
+ EOF
+ # cannot chain the die with the heredoc above as bash-3
+ # has a parser bug in that setup #282902
+ [[ $? -eq 0 ]] || die "writing config.mk failed"
+}
+
+src_compile() {
+ emake -j1 pm_config.h version.h manual_importinc #149843
+ emake
+}
+
+src_test() {
+ # The code wants to install everything first and then test the result.
+ emake install.{bin,lib,data}
+ emake check
+}
+
+src_install() {
+ # Subdir make targets like to use `mkdir` all over the place
+ # without any actual dependencies, thus the -j1.
+ emake -j1 package pkgdir="${ED}"/usr
+
+ if [[ $(get_libdir) != "lib" ]] ; then
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+ fi
+
+ # Remove cruft that we don't need, and move around stuff we want
+ rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+ dodir /usr/share
+ mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+ doman userguide/*.[0-9]
+ dodoc README
+
+ cd doc || die
+ dodoc HISTORY Netpbm.programming USERDOC
+ docinto html
+ dodoc -r *.html
+
+ use doc && dodoc -r ../userguide/*.html
+}
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index d3e0653cc5ab..a49fe6a7574e 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,3 +1,3 @@
DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033
-EBUILD phonon-vlc-0.11.3.ebuild 717 BLAKE2B 7fa8f381da00c763ebd2d034ecb1ed0c7a1979555adba123be4c26cce0b9d9fedac44aad8cc3e8a5dd57c38817aec659dac700a46951a37020dda5c3f2424535 SHA512 214d511afa39d94ba184634d6030ec971158a87d3e1ce22be6075e2a53e26e0be1437e0edc63e7de16e63a9dcc65cd653368f9f757dd80431a7fabba781cec75
+EBUILD phonon-vlc-0.11.3-r1.ebuild 720 BLAKE2B b870872bcdfb3d8860ca5e075a79599981496aa05d35826ae425340489ee587427022f7cd1a8b8d6d8e69be56cb1d36f6b153812c65598c6273d8edf9e2b60fd SHA512 c90f52fdd23f912f93dfd51121145933d7a7bdf215aa182b63e1915b5851f56754231d10e7e831435f7dce017fc552392eac64ab65888591d89f122538d3a793
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.3.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild
index 053592789a18..b87d9b50405a 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.11.3.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qtwidgets:5
>=media-libs/phonon-4.11.0
- media-video/vlc:=[dbus,ogg,vorbis]
+ media-video/vlc:=[dbus,ogg,vorbis(+)]
"
RDEPEND="${DEPEND}"