summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2015-05-13 13:09:48 +0000
committerMichael Palimaka <kensington@gentoo.org>2015-05-13 13:09:48 +0000
commitfd80cc625a47cc40b4fd859b61776cb25995b138 (patch)
treebae75b3f557c898b4d90964b038534ec5e46c15a /app-cdr
parentRemove old. (diff)
downloadhistorical-fd80cc625a47cc40b4fd859b61776cb25995b138.tar.gz
historical-fd80cc625a47cc40b4fd859b61776cb25995b138.tar.bz2
historical-fd80cc625a47cc40b4fd859b61776cb25995b138.zip
Remove old.
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/k3b/ChangeLog8
-rw-r--r--app-cdr/k3b/Manifest39
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch96
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch19
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-libav9.patch22
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch22
-rw-r--r--app-cdr/k3b/k3b-2.0.2-r4.ebuild114
-rw-r--r--app-cdr/k3b/k3b-2.0.2_p20140225.ebuild106
8 files changed, 23 insertions, 403 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index ffd552eec67c..76b2abee1492 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-cdr/k3b
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.292 2015/05/13 09:31:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.293 2015/05/13 13:09:38 kensington Exp $
+
+ 13 May 2015; Michael Palimaka <kensington@gentoo.org>
+ -files/k3b-2.0.2-ffmpeg.patch, -files/k3b-2.0.2-ffmpeg2.patch,
+ -files/k3b-2.0.2-libav9.patch, -files/k3b-2.0.2-libavformat54.patch,
+ -k3b-2.0.2-r4.ebuild, -k3b-2.0.2_p20140225.ebuild:
+ Remove old.
13 May 2015; Agostino Sarubbo <ago@gentoo.org> k3b-2.0.3-r1.ebuild:
Stable for x86, wrt bug #547666
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 1ab77cac3337..a2b3520fc9f6 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,33 +1,26 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX k3b-2.0.2-ffmpeg.patch 3298 SHA256 4285080dd207ba7282bde1de73b98c49c80e0d02e7ab53cb0317a94b08a2a547 SHA512 ceea638638bbeb9c8d83b8ff3a660f5968dacf75a57e066782fc368396206584657372f1be55e435582e43284a50ff7df82371e63e9d51a657e06362ac7d1968 WHIRLPOOL b1aa447ed842a8f0c8a688728a59189e68ecd8000faf7b0449a71ddca54ca72ccc81bc4bcb4af2ab10d50b1c4a77192ad7c0d3eca352a73112c5dc59ee079946
-AUX k3b-2.0.2-ffmpeg2.patch 610 SHA256 10172f1720a1f762512d3db2358e84ad2b7aff6634a708c20533fbb9cceae987 SHA512 1657accc1d93b803f5b517d6342c8e686b0036d457daf0aa167e3ca81fff97a72ea22667fe8b108d0ef3816ac21db34d3028cbc5321e9907394dcf79e2ed037d WHIRLPOOL d0cf603c20d186183ae37305cbbcedeefa447f33f6a14274be25ca8c4f65584c91eb35c7a642219c8923cad18cdd4a7f1c183bb838e45a772b4629ce6eb9b0c4
-AUX k3b-2.0.2-libav9.patch 991 SHA256 fc69fb52fc6c0e1a6420c7b33600095f21c444397e188aa5d41e067ef5d9d1ef SHA512 3c33390b92f92ee6c914b58ead112671a90060b5a9d2a3d23564c30f2eb1f604b88675081b60cd4dbaf707f32a2c019f322ada4707c7fd0607e9f2b055f65eec WHIRLPOOL df0af01f885aa25f636cd11da2f63bc791c88f113ee9fccef088f50e7eb99f6f64b38c166616611aca1d283efe17b53de6d6b3d21a0f6f1cb271b48b21993fc0
-AUX k3b-2.0.2-libavformat54.patch 917 SHA256 516efa7ad0d9806c603f761769f8d1457fe9fa047a7475e7f11615db89ee1271 SHA512 bb43a19ce8a0b506a63dbe0472b558c24b543684981f10b35721e83903b2b4d2fdbc5893a0634463b0d37763f6d3efdec127f2ac7d937ce8ed0f3a5b8cda8b53 WHIRLPOOL 0fe3cf36bcb50886a1ee9e9f29ddf2844a3cf4087ca9c7a752335f32f4680d031a0cec972d8354818718c8036c714951b8b4c81e7f123dc48dc492ce663260dc
AUX k3b-2.0.3-libav-10.patch 608 SHA256 0123758e6694cef740ea0320c7ab6e7b335c32f8a16185ca7f3107cd318a5020 SHA512 22601ff0634516a68fb17723d16dadb438faf792b18a28ab5290db6796cfddd64777e504c39805e1949e31114e2604e460a7aabfc771b2ab97c188850e2b717c WHIRLPOOL aa1d7d791edf7e205a4c94279f821b043b1ebcf3cc7172a262c606d2a5a5acaa06997265eba38a947f2ae59332838e21463c710b877c123366b8949833d7dd7b
-DIST k3b-2.0.2.tar.bz2 12833321 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd SHA512 e0a3d357decf7120a67d391d2311aaa5992f42cddbd20c5dc67f3d0e2ce15d6c53c0978cf2de6c09b96d57d273bca915fbbc0ca28547d708e2db20c795b86aa9 WHIRLPOOL 0dc975344962c98c20f9a03e3fb9225499668bed206ed61ea58b17ebe4594c2f71e237cdfc94e84a85e08b585cad6d1eee1415b129e998da3664d0544218a171
-DIST k3b-2.0.2_p20140225.tar.xz 6297620 SHA256 562ea4335babd018e46d1d2bcc7567320ca8a888fb03562d4c14222dc2b68c33 SHA512 8d3450b4df42df9eef619b8ba05258e9e98d1197be4472f6b19d467c8c1d91436aacbf59d36c773d6576f3b179601dccff4cae695a73fada3504410c7f26af35 WHIRLPOOL e5d5bd692423027f40c7e6ff0ef7d27a518e95402f09988e7b8417bcb2dda9b9cdb187c033c006f27c3dac9fe34e3ba0e5d85e26c4ddd2fcb82a1065f4b58ad7
DIST k3b-2.0.3a.tar.xz 9864468 SHA256 2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081 SHA512 008d69f3d60dfcd39c787c8fb0b50cdf7b29f1cf551c2c0aa0b6e995ec9d67b26edcb0670d5cd428afcc4e2a60c9e6170a9316b90978dfcc3693d27db98e7472 WHIRLPOOL 5cc63f7355ead8585295c6be8909a07fb0f34df77c8feff14c42daffc52679e27fbb28f1b1912c1bdf22e9c79b4369b2af6f3f8592f25af0f401a59e2b3a2c50
-EBUILD k3b-2.0.2-r4.ebuild 3308 SHA256 abdb780d56d05a6e8d80ab7214d5aeb4ff7407fc70197d7b99feff20e339c724 SHA512 bb1fd03e93a799d1e5193cde2cecbac6e63e98e39088bc0aab060c01ea8d97e29636296faf8084b679b7fad0642edd5545a890365583c1c6c628425bcfada926 WHIRLPOOL e83380d1b9cbe871a32d49d5c82465daab82f1ead01d0420d83d43a55bc4cddcd175c54c001eef6400c0a69dd3a43bc8fd2b3381f10e55bde2a76e232466076f
-EBUILD k3b-2.0.2_p20140225.ebuild 3136 SHA256 8fb4653b55b6c9148e79e874a869730411178939def4f93c4779d13346f8cc03 SHA512 6e7c120fb7266b49f4c361e3f598133488afb14dd65cdb063d2899965bcf91862f6eb20b99c198f966b7525697a6510f6524612c73677aee5c61a3816ee13f0a WHIRLPOOL aad8266f96e1d4c3a24d148eba16c647647b2b8fdc6c4a900b4260dc80ef7c2071feb78974c9d26a0fa6d95514c06ac78ba057281118da509083b82903335670
EBUILD k3b-2.0.3-r1.ebuild 3292 SHA256 6c493966b82c4cc8e75241140a122f8de78b0ed2cad5fcdf2e4845b07d3909bd SHA512 f773c2f2bfb3398e982d434af9fa1bbbca49d5ef13f1abc396394447fde42b11bd934f485edd162acf2c35632bd83d692b7738ee486a576e6dd8b6d8de0ae5a9 WHIRLPOOL 646c9eda844faff35fd8c08be06612e1b6dc62cfb7efbe35d15a3bd0bb5d2a519270a232981bb34a8c1d2b256445b169d9fd2d3aef295f7826cfeba1e004fa4b
-MISC ChangeLog 42474 SHA256 25bc3b673adf67732e6e1f92c3689e57e1e53dafee74d819b83bc858f5059555 SHA512 c00dc5c021c2a3267e34163515999d4c1ce18bd9c84b55be554b2cb2fbeb80bc0c74b4e8107bd928784378900aa52fd2e120888eb77444ad206a280c602f3485 WHIRLPOOL 4f47f07972be271b8f572399e64cc3d32121d6a493cf1e04563033c84ba24fb149b15db7f7fb088c4ed18f57d2711404b0d2c58f5d1132ee5125bed969b81ea8
+MISC ChangeLog 42741 SHA256 a9af13955383a0002076bf473113c0c6ad259c5ad035e3be519443a1fb67e2e5 SHA512 021a8f59062c5949aa5480c3c69ebce25db629dd864cb40ed20c4bad4ca5e88b459d2ae39d8efe32ea15ae54561cac57e58e1aa3a8c2c89671d9a9f527167a55 WHIRLPOOL c6986744feda2cdc463f391df4b405ef31abfdfe259217ad42cfe811b979d905f0a2a9a9a147f889d2be7e9010bde46080abb809e4a1cdd1ffe5bd4ab26027c6
MISC metadata.xml 270 SHA256 626a45824e1218e7191dc6155c7d0c4aff38ab026b33a62882bb8c6cddffcbb2 SHA512 2b3c0ef93291f5171a0ca7d307be7ebbabb52d10cee0d977fe72242dae3cef0a3071bbc3fb5284913e010ea044ecf75f88303ecca600747ef23bfaa6e1ccbb19 WHIRLPOOL 89b94a087e37cf86b8c84cc2c02fde6e53f8dea9bb24e7b4fea87f71d8094759a140c0a8428a265ef429dcd63f396c270c65789387c34e21e6f7a37b02669cd9
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
-iQIcBAEBCAAGBQJVUxndAAoJELp701BxlEWfmDsQAJ9aSEiGgKtwTFLG7IpNsEjv
-iR3rehNf25YEcOieFk3f+OhWhKcqg5cx8Pr2tk+si7lzejJp/xRC+QWfpSADGn12
-9VO5u/rlrgGgK88QHEM/rXD/q2F75jN3IdNvBLahwfs40nkcFxTyIrCs/VL0vk3W
-sIwwa4A7teTL2MJuaFcRj8/3AHuQwPo0rog1O/OJzonb7y4bODr6/HvUxsUqOid3
-VCnYyzyqDpReSDwdQ2QZYU9F27s5hY23uC2qA0g++yFrDhrFcoCczDYOyVZRb5Cz
-NjNuhxx9L0FZ4+yvG1CwyC4nBNLnbNfqsjsg1HXdBZx1DkNEF6RtcQPU0Pv9MEhv
-xw8Xl8qlo7IhrGioQvVJdSPw5f3GoXye0NMNauQ/CZ4OkZTgUuCzmcS47d5BgH/p
-hmkv+qockcupIX1tjutAFww9sjr/+1fpyqNWeMNI1YLvqtIR2UUwj31u0cep2QNG
-jWWI7H9i3bZD9VdZYOFHn+QpxRwDcSLVCg6MvC6yvbaV/fIujiofgoYfvC8KKDSF
-bH9ugi1fq8UzJelwC+6NMPyfEGWDaThSySGpsLGFrNacE5aTjSX4+Gx5xhLPcSRQ
-rBNDnWIGRYI15xwFObjdp/NEVC9SzBJtxxzx0P3C9QSIUgSatws598FO2eiUic/I
-M53EqCD8k1uOMKViBEtE
-=wpY7
+iQJiBAEBCABMBQJVU00URRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7KEwD/93/VrrtatCIuzm6IKFqpVluHLE8fTz4CFe1QDCZq/5Y7aXMs8N4uMpSVOB
+drYByA5ZA8iQUs7Z1pIISc/xLlm7I8cnCCTvvkw3EqCc4AYozrvQojlNG0v4xZhF
+W4/Gyko57Ju33ziU+RTCr0nEuSPziRG+uI5Tho5vDIH3G2V6CKZrkQ0khjsx+dBw
+cNdMxuxEP4TFNmFCW6kUePazOczkq9AgYoE96zplv4330cDLzps2km4J8M0+e15I
+ZElImm69ca012qqNMAiZgfqMDDYV0Qj5w54XJUuu7xnSEP9ts0BsC6JkxNQevSvj
+85kCPVBoJ4QYaNeE+NAvDooXjcM8I5Adp3Q3u2El6FKo7Tm+HFOlZFahdJajXxcT
+7mHSx/21aYpNxCwhf1hfSM6F7jhom0CDWUQmZp0UXM/s9J9RN8KQdM1fSf8T066Q
+54x1r6vaNlF8QjOIf6K5XguQdqMQiVufFlT4I9Jd61i8alGHJanYWFXCf756D0f0
+6zPnjxlByOrkstczFFiF27tPekJE1Br2djkmJpxK07UljCDXB33SsRZINC1OKcDE
+J7NmVDcihTX3Lg3v7xKJxU+/juGOrPc9ecXP2z/lUSrRMzzm+kddieGEVvM/Jj7p
+hzR1o/SyEwgtCIeL9oKGstnVbyzuYsthwaT3OgxxrB0TUjCtxw==
+=j5uX
-----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch b/app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch
deleted file mode 100644
index 2878b1edcb06..000000000000
--- a/app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-commit 61ca30beb978f68e72257408777c6433f33129bd
-Author: Michal Malek <michalm@jabster.pl>
-Date: Sun Aug 28 20:18:53 2011 +0200
-
- Fixed compilation with new FFMPEG
-
- BUG: 274817
- FIXED-IN: 2.0.3
-
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-index 0ad59fc..0c5f366 100644
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
- #else
- ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
- #endif
-- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
-+ if( codecContext->codec_type !=
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ AVMEDIA_TYPE_AUDIO)
-+#else
-+ CODEC_TYPE_AUDIO)
-+#endif
-+ {
- kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
- return false;
- }
-@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
- QString K3bFFMpegFile::title() const
- {
- // FIXME: is this UTF8 or something??
-- if( d->formatContext->title[0] != '\0' )
-- return QString::fromLocal8Bit( d->formatContext->title );
-+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
-+ if( ade == NULL )
-+ return QString();
-+ if( ade->value != '\0' )
-+ return QString::fromLocal8Bit( ade->value );
- else
- return QString();
- }
-@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
- QString K3bFFMpegFile::author() const
- {
- // FIXME: is this UTF8 or something??
-- if( d->formatContext->author[0] != '\0' )
-- return QString::fromLocal8Bit( d->formatContext->author );
-+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
-+ if( ade == NULL )
-+ return QString();
-+ if( ade->value != '\0' )
-+ return QString::fromLocal8Bit( ade->value );
- else
- return QString();
- }
-@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
- QString K3bFFMpegFile::comment() const
- {
- // FIXME: is this UTF8 or something??
-- if( d->formatContext->comment[0] != '\0' )
-- return QString::fromLocal8Bit( d->formatContext->comment );
-+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
-+ if( ade == NULL )
-+ return QString();
-+ if( ade->value != '\0' )
-+ return QString::fromLocal8Bit( ade->value );
- else
- return QString();
- }
-@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
- #if LIBAVCODEC_VERSION_MAJOR < 52
- int len = ::avcodec_decode_audio(
- #else
-+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ int len = ::avcodec_decode_audio3(
-+ #else
- int len = ::avcodec_decode_audio2(
-+ #endif
- #endif
-+
- #ifdef FFMPEG_BUILD_PRE_4629
- &d->formatContext->streams[0]->codec,
- #else
-@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
- #endif
- (short*)d->alignedOutputBuffer,
- &d->outputBufferSize,
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ &d->packet );
-+#else
- d->packetData, d->packetSize );
-+#endif
-
- if( d->packetSize <= 0 || len < 0 )
- ::av_free_packet( &d->packet );
diff --git a/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch b/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch
deleted file mode 100644
index 5c34e0891ded..000000000000
--- a/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=476494
-
-A better patch using avcodec_decode_audio4 will be needed but for now this
-fixes the problem.
-
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-===================================================================
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -37,6 +37,9 @@ extern "C" {
-
- #include <klocale.h>
-
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4)
-+#endif
-
- #if LIBAVFORMAT_BUILD < 4629
- #define FFMPEG_BUILD_PRE_4629
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libav9.patch b/app-cdr/k3b/files/k3b-2.0.2-libav9.patch
deleted file mode 100644
index 42ec6632da68..000000000000
--- a/app-cdr/k3b/files/k3b-2.0.2-libav9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-===================================================================
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 17:46:13.523959500 +0200
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200
-@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open()
- }
-
- // analyze the streams
-- ::av_find_stream_info( d->formatContext );
-+ ::avformat_find_stream_info( d->formatContext, 0 );
-
- // we only handle files containing one audio stream
- if( d->formatContext->nb_streams != 1 ) {
-@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open()
-
- // open the codec on our context
- kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
-- if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
-+ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) {
- kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
- return false;
- }
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
deleted file mode 100644
index 174a776b8b93..000000000000
--- a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-===================================================================
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
- close();
-
- // open the file
-- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
-+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
- if( err < 0 ) {
- kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
- return false;
-@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
- }
-
- // dump some debugging info
-- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-
- return true;
- }
diff --git a/app-cdr/k3b/k3b-2.0.2-r4.ebuild b/app-cdr/k3b/k3b-2.0.2-r4.ebuild
deleted file mode 100644
index 0dd0c39068c3..000000000000
--- a/app-cdr/k3b/k3b-2.0.2-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.8 2014/04/26 11:29:46 johu Exp $
-
-EAPI=5
-
-MULTIMEDIA_REQUIRED="always"
-WEBKIT_REQUIRED="always"
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-
-# Translations are only in the tarballs, not in the git repo
-if [[ ${PV} != *9999* ]]; then
- KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
- gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
- se sk sl sv th tr uk zh_CN zh_TW"
-
- SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
- DOCS=( FAQ PERMISSIONS README )
- S=${WORKDIR}/${P/_*}
-else
- DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
-fi
-
-inherit kde4-base
-
-DESCRIPTION="The CD/DVD Kreator for KDE"
-HOMEPAGE="http://www.k3b.org/"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
-
-DEPEND="
- $(add_kdebase_dep libkcddb)
- media-libs/libsamplerate
- dvd? ( media-libs/libdvdread )
- ffmpeg? ( virtual/ffmpeg )
- flac? ( >=media-libs/flac-1.2[cxx] )
- mp3? ( media-sound/lame )
- mad? ( media-libs/libmad )
- musepack? ( >=media-sound/musepack-tools-444 )
- sndfile? ( media-libs/libsndfile )
- taglib? ( >=media-libs/taglib-1.5 )
- vorbis? ( media-libs/libvorbis )
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdelibs 'udev,udisks(+)')
- app-cdr/cdrdao
- media-sound/cdparanoia
- virtual/cdrtools
- dvd? (
- >=app-cdr/dvd+rw-tools-7
- encode? ( media-video/transcode[dvd] )
- )
- emovix? ( media-video/emovix )
- sox? ( media-sound/sox )
- vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog )
-
-PATCHES=(
- "${FILESDIR}/${P}-ffmpeg.patch"
- "${FILESDIR}/${P}-libavformat54.patch"
- "${FILESDIR}/${P}-libav9.patch"
- "${FILESDIR}/${P}-ffmpeg2.patch"
-)
-
-REQUIRED_USE="
- mp3? ( encode )
- sox? ( encode )
-"
-
-src_configure() {
- mycmakeargs=(
- -DK3B_BUILD_API_DOCS=OFF
- -DK3B_BUILD_K3BSETUP=OFF
- -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
- -DK3B_ENABLE_HAL_SUPPORT=OFF
- -DK3B_ENABLE_MUSICBRAINZ=OFF
- $(cmake-utils_use debug K3B_DEBUG)
- $(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
- $(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
- $(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
- $(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
- $(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
- $(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
- $(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
- $(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
- $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
- $(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
- $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
- $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
- )
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- echo
- elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
- elog "If you get warnings on start-up, uncheck the \"Check system"
- elog "configuration\" option in the \"Misc\" settings window."
- echo
-
- local group=cdrom
- use kernel_linux || group=operator
- elog "Make sure you have proper read/write permissions on the cdrom device(s)."
- elog "Usually, it is sufficient to be in the ${group} group."
- echo
-}
diff --git a/app-cdr/k3b/k3b-2.0.2_p20140225.ebuild b/app-cdr/k3b/k3b-2.0.2_p20140225.ebuild
deleted file mode 100644
index c16835df981b..000000000000
--- a/app-cdr/k3b/k3b-2.0.2_p20140225.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2_p20140225.ebuild,v 1.1 2014/02/25 16:53:57 creffett Exp $
-
-EAPI=5
-
-MULTIMEDIA_REQUIRED="always"
-WEBKIT_REQUIRED="always"
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-
-# Translations are not available, since this is a snapshot
-#KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
-#gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
-#se sk sl sv th tr uk zh_CN zh_TW"
-
-SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz"
-DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
-
-inherit kde4-base
-
-DESCRIPTION="The CD/DVD Kreator for KDE"
-HOMEPAGE="http://www.k3b.org/"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
-
-DEPEND="
- $(add_kdebase_dep libkcddb)
- media-libs/libsamplerate
- dvd? ( media-libs/libdvdread )
- ffmpeg? ( virtual/ffmpeg )
- flac? ( >=media-libs/flac-1.2[cxx] )
- mp3? ( media-sound/lame )
- mad? ( media-libs/libmad )
- musepack? ( >=media-sound/musepack-tools-444 )
- sndfile? ( media-libs/libsndfile )
- taglib? ( >=media-libs/taglib-1.5 )
- vorbis? ( media-libs/libvorbis )
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdelibs 'udev,udisks(+)')
- app-cdr/cdrdao
- media-sound/cdparanoia
- virtual/cdrtools
- dvd? (
- >=app-cdr/dvd+rw-tools-7
- encode? ( media-video/transcode[dvd] )
- )
- emovix? ( media-video/emovix )
- sox? ( media-sound/sox )
- vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog )
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.2-ffmpeg2.patch"
-)
-
-REQUIRED_USE="
- mp3? ( encode )
- sox? ( encode )
-"
-
-src_configure() {
- mycmakeargs=(
- -DK3B_BUILD_API_DOCS=OFF
- -DK3B_BUILD_K3BSETUP=OFF
- -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
- -DK3B_ENABLE_HAL_SUPPORT=OFF
- -DK3B_ENABLE_MUSICBRAINZ=OFF
- $(cmake-utils_use debug K3B_DEBUG)
- $(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
- $(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
- $(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
- $(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
- $(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
- $(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
- $(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
- $(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
- $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
- $(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
- $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
- $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
- )
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- echo
- elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
- elog "If you get warnings on start-up, uncheck the \"Check system"
- elog "configuration\" option in the \"Misc\" settings window."
- echo
-
- local group=cdrom
- use kernel_linux || group=operator
- elog "Make sure you have proper read/write permissions on the cdrom device(s)."
- elog "Usually, it is sufficient to be in the ${group} group."
- echo
-}