gentoo resync : 02.12.2017

8 files changed, 70 insertions, 8 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c7920d5c8d4c..bdf4a85c4c8e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 4a7d501ab757..af95928d8259 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -4,8 +4,10 @@ DIST grip-3.3.1.tar.gz 812562 SHA256 d46394a1062ed066f9c633b010fd1059e63d9ed791b
 DIST grip-3.4.3.tar.gz 740870 SHA256 34b7dd9f8c904f8f1984f691b3bfc62a68979eef62ab4e638817afedcc2fde0c SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361 WHIRLPOOL fe1465d60cb850e0eb9bfdafe288ee66e8527b9ad41e2cf4d4dfda21a972d9bd9f1fd69d23cb8d3873109a805c4dc9d571f68e8a7f9edfd97acdb7f2837cc1bf
 DIST grip-3.5.2.tar.gz 952153 SHA256 aa67931ef3a80ef57351d487be2210b2f7030a16b41ff2f38d22ccc76d7f89b7 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421 WHIRLPOOL cc883036a3a4a2073eb9d14c53f53e26ae568be81e0f21e709031586b5b541c04d03cd251bd99eb66bfda86fdf1167a6b1838517c85b89b1fa6acb72cd94e588
 DIST grip-3.6.1.tar.gz 958967 SHA256 88a7a1193de74ce65968106a1b48b62a3171aaeabb1a5edae9d0308e901d5e28 SHA512 ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf WHIRLPOOL a8b5cf838d205ce32ccf78df9df04f50c1095d87b0d61e44c9cfb7e661345c737173df968f5cafa2492e7a6a66b474ad00ce6a0922d41253d767cf880c61fa80
+DIST grip-3.6.2.tar.gz 959393 BLAKE2B 09f7c6bbd5e82ada26795f082feb0d35cd21e14bac0e5881502c65d1e64f501eb086d5843b5120408186435ce6a95771bcf94972881fc449d4c4c2130f929066 SHA512 8aba6dbf4cb374dbe76fb5358f4b550187840a1248f9a60d8441a123ad5abe49d6fe4bcd491047d19432dd90a6dbd9060737f9e2ba19fa60e5e4c50ec5fd8cf8
 EBUILD grip-3.3.1-r3.ebuild 1353 BLAKE2B b7b3afd31cfe23537df761d566b221f3f762ff807d5d3fa87b2b4524d15eaa7828d30ee5e80fd14f3e63d719ab777c50241013a6f5423c6b3e578cdc1f237ef7 SHA512 964b99dd264dda5e9309c47a998308ac4b6dc770847d14ae0d60e768ef5038ffd41ea3a0bd87cd5de1130f79d5ceaf5040588724db59516ab1a1e3acf92b9154
-EBUILD grip-3.4.3.ebuild 1209 BLAKE2B 838d7d0df0bd5f87b24cbb1cf6733021e7ca25a06bbd618e29aebe49034378e9d6bb8aca344e29006e153806afda55269be073007c4b27a19289f59e56076e05 SHA512 12232d370cc9d4951ebada3270210512fdc2e5849e16b94aeb2330bfee8bd0cd87d550fbabefc346fb2430b80f4172fc8f16ecb6962665af3f95df854b1231aa
+EBUILD grip-3.4.3.ebuild 1208 BLAKE2B 02a70b62576c3c42717e1492e3f2592a5e694722c4f527f5a34c39868df1b5307f812905d7c8d7e072cad9a0a2fa1138a198fde7e872394010dbac5d7ed8381f SHA512 7d9b2282e8c4ff9570fe382c2e8e99ae81505007a2da45379fc83682dcec1324efaf34d695effac0486563dad46a3e7cee8e007f2361e9c480a74e8d9fb6b88e
 EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.1.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
+EBUILD grip-3.6.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
index 3490727172cc..42a84e6794cf 100644
--- a/media-sound/grip/grip-3.4.3.ebuild
+++ b/media-sound/grip/grip-3.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/grip/grip-3.6.2.ebuild b/media-sound/grip/grip-3.6.2.ebuild
new file mode 100644
index 000000000000..5f7555472651
--- /dev/null
+++ b/media-sound/grip/grip-3.6.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	gnome-base/libgnome
+	>=gnome-base/libgnomeui-2.2.0
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:0
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf
+}
diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest
index 051c37cedc9c..eb172b44bd71 100644
--- a/media-sound/shntool/Manifest
+++ b/media-sound/shntool/Manifest
@@ -1,3 +1,3 @@
-DIST shntool-3.0.10.tar.gz 216061 SHA256 74302eac477ca08fb2b42b9f154cc870593aec8beab308676e4373a5e4ca2102 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d WHIRLPOOL fb7c11c99482e043da2827ab682aadde4b7309d5e0739a176589de2ac8db0af01d62826eb8d8c6451c2c72876078f4147fa8712ce41acff785ac495350d17322
-EBUILD shntool-3.0.10-r1.ebuild 704 BLAKE2B 117107b3c2dc7f2149e087c6f1c2b668975d624c0b9cb0580591d2b257dddab5997ed905826266e29eb397ee455265edb6b2fb8ae38cd8ca899caf670de18323 SHA512 74bacf40ffaf19f1bf4d9ff2762dfc8ccf8fec613e59d95d229e93fded3d41faf0ca7d5c39984befb11f8fc6af06b5eacfddf194abaec82a6e7799b56fa97054
+DIST shntool-3.0.10.tar.gz 216061 BLAKE2B b662c64992409c1a12dd3fffab5f39c69b2c1f8fb958cba590009f599e4363403aa1d353efdec8ab7529fc22cfac0b908368a132b60f7e5acd55dcae932909e2 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d
+EBUILD shntool-3.0.10-r1.ebuild 778 BLAKE2B 8dd9c0a67bc2fa0f5ff32d995f169abf6720d63dec8feb7fcd5556de0f6faba3935c789db74302d480b0c93846070784bf7483c315f60b1943a92148afb93253 SHA512 13ee328557b2f40c6177cf8b230eb55a3335b59102df8238490e6fd98d3d72a9c0779a4024bdd7d68743b28ab21e8a8ac47f37e5e40d0668a4c999298c338c16
 MISC metadata.xml 419 BLAKE2B ee01913318798b80d3bfd0b80eafaa243251f697b067105b204b2bd07a67ff27c81e1a0a2a7f53796495699cbd4b0335e263e1782b8fdc43acf19c9f16495c01 SHA512 6776c4523ec29fd9704ad9ae663d099d51eda469b2fe063bafa8c9a1f37da3ffe62f1e7f506534d28131db2fe0db98d815d81d8d0840e685a6f07449aecf65dc
diff --git a/media-sound/shntool/shntool-3.0.10-r1.ebuild b/media-sound/shntool/shntool-3.0.10-r1.ebuild
index 16c9434f3ea4..69859ce07241 100644
--- a/media-sound/shntool/shntool-3.0.10-r1.ebuild
+++ b/media-sound/shntool/shntool-3.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -21,3 +21,8 @@ RDEPEND="flac? ( media-libs/flac )
 DEPEND="${RDEPEND}"
 
 DOCS="NEWS README ChangeLog AUTHORS doc/*"
+
+src_configure() {
+	export CONFIG_SHELL=${BASH}  # bug #527310
+	default
+}
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index fc6332431d71..006542474110 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,4 +1,4 @@
 AUX soundkonverter-3.0.0-deps.patch 471 BLAKE2B 083b379ce0e3ecda5723095f5aa865a9bd88251bd522fab0420710864a288468d9230466d8908ed5ca2ba76f5523021530bf0e4791dd677f3e2a4c3b38806443 SHA512 936bbe4b157b5a0a500678b364889c6e080652c03fde19243111a866e8bfa58cd5edcd2c62ea997becf9ae3391f666b8011a56c9e82fe2b5942e28f9a742d542
 DIST soundkonverter-3.0.1.tar.gz 821278 SHA256 92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911 WHIRLPOOL 2dfe82c4400c0afd05dced2fb5b92f2f239a456ee87ebe6d3eb10c2474f70121d0d72700ee3fdbe2b31ea7f1a3d5fc78e65af0f89bb73c291467b5e698053e5c
-EBUILD soundkonverter-3.0.1.ebuild 1457 BLAKE2B 54a71f84beb8092dc2f6daae93836541db2ebe3ce1e349a1ed213a21bc0e406e66a6a7e0fadab89d5ca7cd8675977031bca2aa46274576b0a81689582e562de2 SHA512 2aed2d8a11551ada66308b0ee9670331563bfd105047aefd643416812c4b2c2f1aa24f24cf9c93548f07bfc93f7344a3739c9d603656fed62e2bf6ab6dab64de
+EBUILD soundkonverter-3.0.1.ebuild 1528 BLAKE2B 5c3dbae02d1c66bbcf2e680824a8675a93a1f5851ea295fdd41389319c2534342d9e594f5a000124baa625a0bea2957271a1a200d5f13b98a9c30d944162b22e SHA512 d195fa425ec96a3d47f1ab877528808efb4a33c07734679b6b1d3797c8e6eca3b7181285bc7eaec5c73b298e102a4b4863a182d1d861fa01f1be20f770ae4afb
 MISC metadata.xml 363 BLAKE2B 56ccd083e2b002a49f00ede22967d7c35a2ad7d765200a668876993780b243c30b8c77f162432c750e0f23b7f1310491854b7b070a426a518ccb47410a19d12b SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild
index 6da7c224a693..a3fc60e418b0 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -36,9 +36,12 @@ RDEPEND="
 	>=media-libs/taglib-1.10
 	media-sound/cdparanoia
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
+RDEPEND="${COMMON_DEPEND}
+	!media-sound/soundkonverter:4
+"
 
 PATCHES=( "${FILESDIR}/${PN}-3.0.0-deps.patch" )