Remove old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

4 files changed, 6 insertions, 154 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index f64dee9a19ce..aa1370c8db84 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
 # 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.297 2015/06/09 07:23:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.298 2015/06/09 10:37:06 mrueg Exp $
+
+  09 Jun 2015; Manuel Rüger <mrueg@gentoo.org> -files/k3b-2.0.3-libav-10.patch,
+  -k3b-2.0.3-r1.ebuild:
+  Remove old.
 
   09 Jun 2015; Agostino Sarubbo <ago@gentoo.org> k3b-2.0.3-r2.ebuild:
   Stable for x86, wrt bug #509332
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index d2d2704be635..03d9def5f0d3 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,27 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX k3b-2.0.3-libav-10.patch 608 SHA256 0123758e6694cef740ea0320c7ab6e7b335c32f8a16185ca7f3107cd318a5020 SHA512 22601ff0634516a68fb17723d16dadb438faf792b18a28ab5290db6796cfddd64777e504c39805e1949e31114e2604e460a7aabfc771b2ab97c188850e2b717c WHIRLPOOL aa1d7d791edf7e205a4c94279f821b043b1ebcf3cc7172a262c606d2a5a5acaa06997265eba38a947f2ae59332838e21463c710b877c123366b8949833d7dd7b
 AUX k3b-2.0.3-libav-11.patch 4270 SHA256 45f86ed4b058015d1153141a13f4d3be53fcc253a54ebf2fbdc06a25c630560f SHA512 d21bfab101f9a69aef57259fb39434859a5e935584bba15f83767f763c58be51285812e5328159a607a1e1b26f3e8945d85874ca26cd68b86d8859c10d88bbb6 WHIRLPOOL 1bbfbe65c90a5fa1df0da98d361f3df2c204c1fd22935e40ec7bb6a70e3acb32542285d09b7a291d0d66196c674eb0d7882138eec7c280746a65c6e427137995
 DIST k3b-2.0.3a.tar.xz 9864468 SHA256 2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081 SHA512 008d69f3d60dfcd39c787c8fb0b50cdf7b29f1cf551c2c0aa0b6e995ec9d67b26edcb0670d5cd428afcc4e2a60c9e6170a9316b90978dfcc3693d27db98e7472 WHIRLPOOL 5cc63f7355ead8585295c6be8909a07fb0f34df77c8feff14c42daffc52679e27fbb28f1b1912c1bdf22e9c79b4369b2af6f3f8592f25af0f401a59e2b3a2c50
-EBUILD k3b-2.0.3-r1.ebuild 3272 SHA256 fafe8e2b4f242fac37fe045030b1840c678671a84d2bbf733fb3d1c69867471f SHA512 15ba43a0ee3c86109b6f1a9f82c36e441a4708cc6fb56b5e94dae53fd4213856140fde25558f0b0c100c2142d25bfd368b60d7fd2b3484bbe0c8f30b083665c4 WHIRLPOOL 0794063800f92a14208ff2e8fd92079c200b065aace338a9933373f3b35b981ce72a8b86e795fe6e3e0b1c1f3667cc2c6444324e72448fbfd1540a327d230d8c
 EBUILD k3b-2.0.3-r2.ebuild 3257 SHA256 d1d24b11958fbf56a1d8c923d1993268c7fc6e2f4c49231418e8be7aba997dd4 SHA512 8079b516e6bcf57c17d366d32ba5cdfdbf236dd960c8ea531694279759aaaccf776bfc271e7503418b652f262ee0753fcc7cfa31ee2df6fe8c7476209f995e8e WHIRLPOOL 9b680ee94af84134db057c29a34e102a74b8191483b5687d07298cf6c8e691927baecd849fbb6ee9878ac1c7eef0e55dd96df26efecf917b47f2a19e990e3268
-MISC ChangeLog 43345 SHA256 a1d31a17d83ef14cfb8105d637fa0e688adf6d23426fbb10cd678e068a7bfda3 SHA512 a1dc4a6b141a80e8947766e8e2151e4e44578cc864691e05498925b89a11773851682482157ec628d178427d7d738eba6841c82f40b645c2c792a964d795341e WHIRLPOOL 61d199b21c834d5b2061e75d5987085632622ee2c7c44c81b0d4974747f432669e17915c4835e7f849730f5fa0b40039fdb33bf850ea22510879088efcb6be09
+MISC ChangeLog 43467 SHA256 a0c5438b04dfd15dbfc5b69e88daa1b174fb8b12db1a90a5857a44e91884bfb0 SHA512 6246bc1c6423fae5dfd68e72342a384db7adf227aa6ec5ba47c9c27efd0c4df51193bbaf605a031abbb148041f03fb7c84d0ecf208f2756728c2231e09959e42 WHIRLPOOL 4ff729f32ae2e8244e9da20a36267595f299f7b59bf48cabd371e9711992edd3f6f0464cbc4d3276b181efcb7e96a22ccc25caf0c31dea10b9a178c52e1a5366
 MISC metadata.xml 270 SHA256 626a45824e1218e7191dc6155c7d0c4aff38ab026b33a62882bb8c6cddffcbb2 SHA512 2b3c0ef93291f5171a0ca7d307be7ebbabb52d10cee0d977fe72242dae3cef0a3071bbc3fb5284913e010ea044ecf75f88303ecca600747ef23bfaa6e1ccbb19 WHIRLPOOL 89b94a087e37cf86b8c84cc2c02fde6e53f8dea9bb24e7b4fea87f71d8094759a140c0a8428a265ef429dcd63f396c270c65789387c34e21e6f7a37b02669cd9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVdpRiAAoJELp701BxlEWffOoQALdHjzCk3vuHCYz2Vys76ce4
-5V+Eo0ADz0jIAPJHPGL5mP1moWsz5Gxkc+QSB591sHj3Y86FD1Fiug1k5dEThqvo
-uas1ZJyQb/cuaXZgZdsEbD89CIdPMv/1EIagKdz3SEO1nY/IqR+m74WXJvr2Y7l8
-RBQdCTfp0i+bDC7BlDyXWQD08VhDSYAtsdQJtU+dGVjsULz/yg/K+qy19wAUOQIE
-Wvx6ebc8KMwTvruDNIB+bk4JGc29puUor+cRuGRiAd8yJyBk9R/+4JlAtvuGY49Y
-bf0esMhYMX3nZO70sy4ELxxJB+/T3HPg1oAEAb73EyAdcTjEaV+c9qm0O3F74uN+
-kRVwbQ4MWCjF5CpPlXgCdn1lJrc14bN7jOOEvuJtYqSXwzOAk8dHrE7kXXugdzhZ
-QAhw/oXPoRuynEX67iZBaHVYop3i28YWLHdUNJEvsl54Y1SXV/JIBs7/claVT3oB
-gQcE4m/Jl6/OXdrHdzqfpB6Y1fXLgizyz4LbNVzvpQK3hcAOKJpeCbVla1PCQE/f
-XYULYwjlvlDh3ar17EnsV0rLThWM1jIzUxZwHubkj+invkc9bObD39ts5quwy/ky
-BnQRR3jbZlZoQEWSCDF+ck4BW++NQn0Vuor9emVSF45l3yVIWixbrl+EEXzky8wI
-s1MIw6jrEyDVDhnzLu2d
-=RAIj
------END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch b/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch
deleted file mode 100644
index 32bf69c17978..000000000000
--- a/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/509332
-
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -423,9 +423,9 @@
-         // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
-         // its thing.
-         //
--        if( file->type() == CODEC_ID_WMAV1 ||
--            file->type() == CODEC_ID_WMAV2 ||
--            file->type() == CODEC_ID_AAC )
-+        if( file->type() == AV_CODEC_ID_WMAV1 ||
-+            file->type() == AV_CODEC_ID_WMAV2 ||
-+            file->type() == AV_CODEC_ID_AAC )
- #endif
-             return file;
-     }
diff --git a/app-cdr/k3b/k3b-2.0.3-r1.ebuild b/app-cdr/k3b/k3b-2.0.3-r1.ebuild
deleted file mode 100644
index 8d091da55ec9..000000000000
--- a/app-cdr/k3b/k3b-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.8 2015/06/04 18:58:16 kensington 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 bs 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 kk km ko ku lt lv mai mr ms nb nds nl nn oc pa pl
-pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk
-zh_CN zh_TW"
-
-SRC_URI="mirror://kde/stable/${PN}/${P}a.tar.xz"
-DOCS=( FAQ PERMISSIONS README )
-
-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 libav mad mp3 musepack sndfile sox taglib vcd vorbis"
-
-CDEPEND="
-	$(add_kdeapps_dep libkcddb)
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	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 )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${CDEPEND}
-	$(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.3-libav-10.patch" #509332
-)
-
-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
-}