gentoo resync : 20.12.2017

3 files changed, 34 insertions, 6 deletions

diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 808e80f2528c..012ba2ba91a4 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,10 +1,11 @@
 AUX cdrdao-1.2.3-ax_pthread.patch 16862 BLAKE2B 657da0dd5107302c97b2eb2096e61326d4aacfab3c7adf881ae40fde1b6bf0ede3860105f117b2d0b29966aeed3e7002ad8ed12edcc5ae01b663eddd7b7ab5f3 SHA512 ae881b74fbf8ae80ad1f5742bc57034f8edf99bd8972b69202d026a8df5b6645710f7b96fef85469c34a72ee4d0fda3d48abe3dce9585de65a2ba66992195f00
 AUX cdrdao-1.2.3-glibc212.patch 260 BLAKE2B 6f84d32fc4b3e2254c61453f6e0a77c99b6fb5de7622ab1ce444348f9ae9fccde3450023421ef54a55e248b8280b1177373b632abb543908c6d728d2ee66b03b SHA512 3954d77f301beb1063292000f7f0bc07b1f1f8908bbc7dc31717e3ad0afbe51e398157edff943c8679155000e6f494e396527b02419191036bdfcd549f94d04d
+AUX cdrdao-1.2.3-lame-3.100.patch 737 BLAKE2B 63765fe4b6a689705bc9eaf08ce823e3b8e0f004d1d5141c65d133e743c58b52bfcd599e950d6114450f12230b3c932a76ae903a54c2d1a77ffe803654af52a8 SHA512 bf6aa3cba34317c87a008c2c6b698be51a7e544a28bb6f7d5d42719a71e78e08903a89e7544ffd54b8d7d9d01d1f996e6d599263f0f10a4f043e33b1b45e8913
 AUX cdrdao-1.2.3-unsigned-char.patch 1119 BLAKE2B e5e52f03541d77740dd4a61f6b275e2f6edf0045c1671539745d42b60c11fda623e3b983801efa6979bdea1fdefad23293d2156ebbce37d7fdf39d20eb7f98f1 SHA512 77227662a86f17a10841e4b3085d9c40067f7a1c46694e188371018e200ec8bd94ae2fdd86143bba9cc345211abfdaf197e4aa2dd8cb1b1749b954ef70055cf2
 AUX cdrdao-1.2.3-wformat-security.patch 6279 BLAKE2B dabab6d2575e24b5bfcf690daa634cfbd795d18930e03fc9acfcf630408fcb6e60af077053a577507725365a23083c273f43f5efea65f8c58189279085a2e472 SHA512 aff829cf227658ac1a11975c818385999ee91582f239bd70ad440021cd08554cf80c29470683f55ca9d50aef05e33b326e853ba022ecfa9e7eae84fb4c51acd3
 DIST cdrdao-1.2.3.tar.bz2 1428695 BLAKE2B d5d8e9f2f17b4e4a385e226233d219afdf48fa98bade0dad57292ba45fc4f25c3bb146289884c9ad35224c26a826b305c6f8a1e43c22fe7f1cbd812f1a69790a SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
 EBUILD cdrdao-1.2.3-r1.ebuild 1225 BLAKE2B 7a5d890a09f3a5995d41c8c1c526ea1f8953cb3b522257e7e99b3475dca955c2cdcbb12f573821ee5d868e0c6a8a786523df8e59ae1df90e55e6f636a0cbdf4b SHA512 064815cc5707df6b5df51ebae19ad2307f51718880aa7e34a96cd9debd29cee48dd567c4cd76972b1a3094a3e41d2e6a3e8b221daf6bfad74aea810a70c7bc31
 EBUILD cdrdao-1.2.3-r2.ebuild 1488 BLAKE2B af92997633e6fed178f50c7bd42ffc636875e59e55e4ae4425b06f258551aa2a7f349c30ff063db6ac606de01e6534c5353c25c79b707b3725f0099f2413cd40 SHA512 90fc2a859b0c426eb055c63331f2f704e870cfe5df9d6c35a0ebbe063d87639cca8b183e2b1b4a92d359b816f5f47519641c22353171bed293094cfa22312187
 EBUILD cdrdao-1.2.3-r3.ebuild 1431 BLAKE2B 51e0bd15ea6471255ec6847cd36d48c3de1d92c1a483ae4c46cf3161b8b16e5656f0530b7aa14b7467ea4e49acb0b849c47042560fea28cab0574f34367c448e SHA512 0e890720a5a0b899fa1f1dd3289dfd73b95c199fb4ec7b8ab262428aef008dac771e55b2f19f7b4b5cc5465ccca6d8dfb6caa4838904a1c1e8dea380d39f13bd
-EBUILD cdrdao-1.2.3-r4.ebuild 1282 BLAKE2B 52586bb5d4987c1498c988f406d9907c1d4b4e83e5b935a68ab03395d36bc1d4a3f6042f1dc6c93ea95b9627a2360450ba068f126f740d82eb364e745efea0e1 SHA512 bb1fc48867f5088d7aef78805ffac1b656b634ebc890016034bbfb3e73967273aa58b6cdd94e769eb3938aea49d9acf7afc6117149c44c0791b1cf2f09151450
+EBUILD cdrdao-1.2.3-r4.ebuild 1358 BLAKE2B 1dbc3e4fbe06e4df4edc30d5ef4bfe3503e229ffd4cd885b4cf9cfa504ffc2ef8f2cf6fbf8e66ff31dc11f2b965d1e48554da071d8e42f3309439293bad7bd97 SHA512 9775a5d127119fc4a4017de4a481795462b1871a1b618143d7d2a0669978e6d37d2462ace30164852e0e69963bcf1b6e163181ca95ca8e5fec07533f756b0b4c
 MISC metadata.xml 748 BLAKE2B b9caa60cdf02da19f40f7a87d728ee2e21ac85f359c7ff98a92db20198279006c94dae6a091dbe812454ffb8c7b6df4b1c50e9c8c1c92632588e449e9b5579ab SHA512 eaedc0afbbd68bc6ea7b5e5b8b07fa25f8be0748867b845c0d8346d5ef83556ef53986e4ac70e37df483bfa0caa6a38f3f5be0da34a5c509386230f8d84bd85b
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
index 8f7487c4dd4f..9f93e4dc6929 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
@@ -19,26 +19,29 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="encode mad vorbis"
 
-RDEPEND="virtual/cdrtools
+COMMON_DEPEND="
+	virtual/cdrtools
 	encode? ( >=media-sound/lame-3.99 )
 	mad? (
 		media-libs/libmad
 		media-libs/libao
-		)
+	)
 	vorbis? (
 		media-libs/libvorbis
 		media-libs/libao
-		)
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
 	!app-cdr/cue2toc
 	!dev-util/pccts"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-glibc212.patch"
 	"${FILESDIR}/${P}-unsigned-char.patch"
 	"${FILESDIR}/${P}-ax_pthread.patch"
 	"${FILESDIR}/${P}-wformat-security.patch"
+	"${FILESDIR}/${P}-lame-3.100.patch"
 )
 
 S="${WORKDIR}/${P/_}"
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch
new file mode 100644
index 000000000000..c712de2394c7
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch
@@ -0,0 +1,24 @@
+--- a/utils/toc2mp3.cc
++++ b/utils/toc2mp3.cc
+@@ -143,8 +143,8 @@
+ 
+   message(0, "LAME encoder version: %s", get_lame_version());
+   message(0, "Supported bit rates: ");
+-  for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) {
+-    message(0, "%d ", bitrate_table[1][i]);
++  for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) {
++    message(0, "%d ", lame_get_bitrate(1, i));
+   }
+   message(0, "");
+ }
+@@ -238,8 +238,8 @@
+   lame_global_flags *lf;
+   int bitrateOk = 0;
+ 
+-  for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) {
+-    if (bitrate == bitrate_table[1][i])
++  for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) {
++    if (bitrate == lame_get_bitrate(1, i))
+       bitrateOk = 1;
+   }
+