Fixes bug #156185.
authorIoannis Aslanidis <deathwing00@gentoo.org>
Mon, 27 Nov 2006 11:00:50 +0000 (11:00 +0000)
committerIoannis Aslanidis <deathwing00@gentoo.org>
Mon, 27 Nov 2006 11:00:50 +0000 (11:00 +0000)
Package-Manager: portage-2.1.2_rc2-r1

app-cdr/k3b/Manifest
app-cdr/k3b/files/k3b-1.0_pre2+flac-1.1.3.patch [deleted file]
app-cdr/k3b/files/k3b-1.0_pre2-flac-beta.patch [deleted file]
app-cdr/k3b/k3b-1.0_pre1.ebuild [deleted file]
app-cdr/k3b/k3b-1.0_pre2.ebuild [deleted file]

index 52624d13db6fdc9552e535e8846ae6f9b3f0c358..22ad5ed126f195b6ff00d802c90f925cb101c2e5 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX k3b-0.12.17+flac-1.1.3.patch 5567 RMD160 a20b5ae7a752b9f91c479218e75ba173af48be44 SHA1 41eae878580d21341ef6b1549a7d43df39c470d6 SHA256 4df6f523d8a05485bf1ccd3cda367460d234dc1b47564e6e8a52bfa58413149c
 MD5 3c1b356f78064e41f208592f55a90c87 files/k3b-0.12.17+flac-1.1.3.patch 5567
 RMD160 a20b5ae7a752b9f91c479218e75ba173af48be44 files/k3b-0.12.17+flac-1.1.3.patch 5567
@@ -6,21 +9,11 @@ AUX k3b-0.12.17-flac-beta.patch 1282 RMD160 c91a54ca3f54e34cd6805b39e5bbbdc058ea
 MD5 346499b52a07847a38dbd070a384c9f4 files/k3b-0.12.17-flac-beta.patch 1282
 RMD160 c91a54ca3f54e34cd6805b39e5bbbdc058eaa394 files/k3b-0.12.17-flac-beta.patch 1282
 SHA256 6f74700e5920ac2ec751ee16a8933cb3de5a6b3d6ea90d3a4e1d3d3815b7b8bc files/k3b-0.12.17-flac-beta.patch 1282
-AUX k3b-1.0_pre2+flac-1.1.3.patch 5609 RMD160 b6bd25cb62ce9cc29b063ae7dc0e944c9f418e01 SHA1 ade2a5c79861041a673f7742ea1ee3925ce163e4 SHA256 e095bb0a63430fabb239a2e5dada90ae71ee0cadb9bb0260d8005fac7270fe3b
-MD5 b88ac085c31602e6cabbaa62c8bfb976 files/k3b-1.0_pre2+flac-1.1.3.patch 5609
-RMD160 b6bd25cb62ce9cc29b063ae7dc0e944c9f418e01 files/k3b-1.0_pre2+flac-1.1.3.patch 5609
-SHA256 e095bb0a63430fabb239a2e5dada90ae71ee0cadb9bb0260d8005fac7270fe3b files/k3b-1.0_pre2+flac-1.1.3.patch 5609
-AUX k3b-1.0_pre2-flac-beta.patch 1108 RMD160 9435f82bc2fcbd2f3f60ff7d08a73fef62730759 SHA1 984c81d245a1d7190c5ea0167dd75e8336ccb525 SHA256 0bba1574407ac11ae373a79d23cb2923dbc7431904968834462f86f83a1d6db8
-MD5 9c6655cdbfa6fb7ee1205e1d8b3627cd files/k3b-1.0_pre2-flac-beta.patch 1108
-RMD160 9435f82bc2fcbd2f3f60ff7d08a73fef62730759 files/k3b-1.0_pre2-flac-beta.patch 1108
-SHA256 0bba1574407ac11ae373a79d23cb2923dbc7431904968834462f86f83a1d6db8 files/k3b-1.0_pre2-flac-beta.patch 1108
 DIST k3b-0.12.14.tar.bz2 4096391 RMD160 fc06fce15d7f4140de9810257c46a217f022caf9 SHA1 02cef09cb6d8f3bfcfd60099aa55fb2706dd5a8e SHA256 00e88c3c1f04b0f8c5e124fced6729bfc7e078fe5d1d449bb07b1f3746eb6ead
 DIST k3b-0.12.15.tar.bz2 4000389 RMD160 9d0ff14b394153d97ef61fcf7b46894ec5d3d511 SHA1 4f2768f6473032fbf6cde2d13b1c2729b7e91e3f SHA256 5e6cb62f38dcb17c5296e53df89d7bb709f0d336b6a41db9be1b464d4638f32a
 DIST k3b-0.12.16.tar.bz2 4004784 RMD160 b4b64924096581bcb0c3432f99f0e27ffe0aca79 SHA1 875ebae1e5bc4ef0f186c1025087ed8005c10248 SHA256 bc686f6e596df32f2c305a1f4948ceddbbfb067045e6b9b314af615319d11fe6
 DIST k3b-0.12.17.tar.bz2 4008650 RMD160 bb791d7d003285f6623229eae213cf224fd3a128 SHA1 ae23be594b6e2c116fd4c2af8cefb438423d1285 SHA256 067ef9d621bed9a1c385c201b13810f11305edf03a7da0793cb059bb578700b7
 DIST k3b-1.0beta1.tar.bz2 3829912 RMD160 4218c3f444622142dbf3514ca1dfcb774932e8dd SHA1 51acc449c1963db0dadfe1bf658d958e4284f385 SHA256 f66f12a9b5b6bfcfde888b1bc623e2fa6f2bc86e0667a2164a00567d18eeeabe
-DIST k3b-1.0pre1.tar.bz2 3797891 RMD160 ac5866e3d79c464307390f8ea0c733e73342d33b SHA1 19084065a8c9fd2056b8aa7155319faa61069933 SHA256 686320b0bf836c277b685fc2edfd19f9f5875615fa4f19509a617dd5d6c113ed
-DIST k3b-1.0pre2.tar.bz2 3794771 RMD160 3fe6594cef06e6b996711716e77dde82881a4b2b SHA1 c0bbc090f83227a7f2afb2efd58e7b0500169d25 SHA256 2a13326f83a5a6067a69dc3c6ca4a489ce8d8f22edd8f447c3208c2065ca66f2
 DIST k3b-i18n-0.12.14.tar.bz2 4744451 RMD160 489d650e223a5dfca7d36318dc08d3a6a1854547 SHA1 92f7ee7105cf216a7c01fbf673bca7f282c8380b SHA256 fa3a94b8631eee6d48d796749d51f949a563a1e97b7386a0cc8c1f6ef76a20c4
 DIST k3b-i18n-0.12.15.tar.bz2 4683857 RMD160 053ed2acadb3fb627ce02e73dc63c825840c5e90 SHA1 0e3ecc7c79def1b50d72d09ceca4af2c603466d1 SHA256 39f4a3278875792d7eba0cddaab15e6c04b411e673d20babda0fc82df62f60fd
 DIST k3b-i18n-0.12.16.tar.bz2 5020555 RMD160 de87783da39d82981fc7bed731cf8031afb70501 SHA1 1b8fedd7b4b16e8704ad1ad934d621e59f40c9cd SHA256 6cb9466878f2386e3b30347b013405322f2306f48d037e527febf6aca56b1ff5
@@ -45,18 +38,10 @@ EBUILD k3b-1.0_beta1.ebuild 4095 RMD160 8cc9c190a71d78543fa89332da4c1243f27d4ad1
 MD5 ba083fc904e2cc73f4c6cb9f4f7aa4a1 k3b-1.0_beta1.ebuild 4095
 RMD160 8cc9c190a71d78543fa89332da4c1243f27d4ad1 k3b-1.0_beta1.ebuild 4095
 SHA256 b6b18198b713badb46bb6cb33a9619f4e5222f69a5aed18e5a550ae89e754e3d k3b-1.0_beta1.ebuild 4095
-EBUILD k3b-1.0_pre1.ebuild 3791 RMD160 9cbe90e5aa4f3ecc7e463af9b8ebdaff42ec8663 SHA1 835a814292a5ed3b425da9dff987cf10ebcf3801 SHA256 7db6148e0fda34d4c774ae2b10fc617915fbfc585e483fae4e9d21ab0ea722dc
-MD5 f8a780c6f941b75eb4d65a41f6e9599c k3b-1.0_pre1.ebuild 3791
-RMD160 9cbe90e5aa4f3ecc7e463af9b8ebdaff42ec8663 k3b-1.0_pre1.ebuild 3791
-SHA256 7db6148e0fda34d4c774ae2b10fc617915fbfc585e483fae4e9d21ab0ea722dc k3b-1.0_pre1.ebuild 3791
-EBUILD k3b-1.0_pre2.ebuild 4142 RMD160 39005e07a30ab974d91051d3cc41ee96b8754811 SHA1 27df5a2cefbd950898432302290dda1c8fbe7c81 SHA256 1c669c383cd25e3f047ad3ef3f8e6d8d444f66e3ade07d24d2031fa7d5e6d18c
-MD5 d529ea682b411f7054b1aae41337308c k3b-1.0_pre2.ebuild 4142
-RMD160 39005e07a30ab974d91051d3cc41ee96b8754811 k3b-1.0_pre2.ebuild 4142
-SHA256 1c669c383cd25e3f047ad3ef3f8e6d8d444f66e3ade07d24d2031fa7d5e6d18c k3b-1.0_pre2.ebuild 4142
-MISC ChangeLog 24730 RMD160 834ef0d9df5ed16b103d54e53efb43296e30cef0 SHA1 883b77bd962e292f9668c2b43b0856019507033c SHA256 c75ef88158fee751b816b32f40d59a3902d7e6feba4fd91b8735985b6202e92a
-MD5 1e8387b53e7ae2348a0ff68e9e771f94 ChangeLog 24730
-RMD160 834ef0d9df5ed16b103d54e53efb43296e30cef0 ChangeLog 24730
-SHA256 c75ef88158fee751b816b32f40d59a3902d7e6feba4fd91b8735985b6202e92a ChangeLog 24730
+MISC ChangeLog 25042 RMD160 a0fa1b3fff6a40dd77cb99e2b56effe85ba6ad6d SHA1 364ad84d6047efa2b536b05e805c13392b4d991a SHA256 d1517a7d58d1267f4791851fa5ec930f0e39a538e3f1aeb129097f8cdc40600b
+MD5 50c06dbb41a4da79eb0639447a56a6a9 ChangeLog 25042
+RMD160 a0fa1b3fff6a40dd77cb99e2b56effe85ba6ad6d ChangeLog 25042
+SHA256 d1517a7d58d1267f4791851fa5ec930f0e39a538e3f1aeb129097f8cdc40600b ChangeLog 25042
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
 MD5 6cac9f56ab7373612097cef824badcf7 metadata.xml 183
 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f metadata.xml 183
@@ -76,9 +61,10 @@ SHA256 8a5728ab9f0d6e61ebd95fba006b5da987c550b44fdaf988046dc7404bcdf816 files/di
 MD5 b7803ee521cdb387691f0a10fad48847 files/digest-k3b-1.0_beta1 244
 RMD160 9a00ec818e3541edeb733c266f9c53936874419f files/digest-k3b-1.0_beta1 244
 SHA256 32f50a47422a5d9c873270128893e82da323185eda62f47208479a473a1a37e4 files/digest-k3b-1.0_beta1 244
-MD5 7e39c50bee50014231b6467c9195609b files/digest-k3b-1.0_pre1 241
-RMD160 dcbb4a459c0380884ef17e892b425ef9af878748 files/digest-k3b-1.0_pre1 241
-SHA256 a391a1aae9365f6d0aafeb79773bfe9a9c32e166a82406e7f2aee01d0d7c8007 files/digest-k3b-1.0_pre1 241
-MD5 06c8228dcc70c7328e92858119e31378 files/digest-k3b-1.0_pre2 241
-RMD160 a0da4d6c56cec28f5b218bba7846654795425464 files/digest-k3b-1.0_pre2 241
-SHA256 d44cce2ed2deb1116b03f9b749e054956130ae925bc54ec7158d35e7e126dd76 files/digest-k3b-1.0_pre2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFasVeQVeVlgLp4x8RAkl5AJ9BKqWbbLjipz6/CNDGK8Mx6ANN8wCeNfi+
+61HzJe6jrtoqWkZVQzjnkZk=
+=BdwV
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/k3b-1.0_pre2+flac-1.1.3.patch b/app-cdr/k3b/files/k3b-1.0_pre2+flac-1.1.3.patch
deleted file mode 100644 (file)
index 35e45d8..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
---- k3b-1.0pre2/plugins/decoder/flac/configure.in.in   2006-08-23 00:32:30.000000000 -0700
-+++ k3b-1.0pre2-b2/plugins/decoder/flac/configure.in.in        2006-10-17 19:23:48.000000000 -0700
-@@ -248,7 +248,7 @@
- have_flac=no
- if test "$ac_cv_use_flac" = "yes"; then
-   KDE_CHECK_HEADERS(FLAC++/decoder.h, [
--     AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
-+     AC_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
-               have_flac=yes,[],$all_libraries)])
-   # Hack to get the flac version since I was not able to handle the code from
---- k3b-1.0pre2/plugins/decoder/flac/k3bflacdecoder.cpp        2006-08-23 00:31:46.000000000 -0700
-+++ k3b-1.0pre2-b2/plugins/decoder/flac/k3bflacdecoder.cpp     2006-10-18 14:32:24.000000000 -0700
-@@ -36,11 +36,21 @@
- #include <taglib/flacfile.h>
- #endif
-+#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- K_EXPORT_COMPONENT_FACTORY( libk3bflacdecoder, K3bPluginFactory<K3bFLACDecoderFactory>( "libk3bflacdecoder" ) )
- class K3bFLACDecoder::Private
-+#ifdef LEGACY_FLAC
-   : public FLAC::Decoder::SeekableStream
-+#else
-+  : public FLAC::Decoder::Stream
-+#endif
- {
- public:
-   void open(QFile* f) {
-@@ -64,7 +74,11 @@
-   }
-   Private(QFile* f)
-+#ifdef LEGACY_FLAC
-     : FLAC::Decoder::SeekableStream(),
-+#else
-+    : FLAC::Decoder::Stream(),
-+#endif
-       comments(0) {
-     internalBuffer = new QBuffer();
-     internalBuffer->open(IO_ReadWrite);
-@@ -93,10 +107,17 @@
-   FLAC__uint64 samples;
-   
- protected:
-+#ifdef LEGACY_FLAC
-   virtual FLAC__SeekableStreamDecoderReadStatus read_callback(FLAC__byte buffer[], unsigned *bytes);
-   virtual FLAC__SeekableStreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset);
-   virtual FLAC__SeekableStreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset);
-   virtual FLAC__SeekableStreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length);
-+#else
-+  virtual FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes);
-+  virtual FLAC__StreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset);
-+  virtual FLAC__StreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset);
-+  virtual FLAC__StreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length);
-+#endif
-   virtual bool eof_callback();
-   virtual void error_callback(FLAC__StreamDecoderErrorStatus){};
-   virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata);
-@@ -112,6 +133,7 @@
-   return file->atEnd();
- }
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderReadStatus K3bFLACDecoder::Private::read_callback(FLAC__byte buffer[],                                                                             unsigned *bytes) {
-   long retval =  file->readBlock((char *)buffer, (*bytes));
-   if(-1 == retval) {
-@@ -121,7 +143,19 @@
-     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
-   }
- }
-+#else
-+FLAC__StreamDecoderReadStatus K3bFLACDecoder::Private::read_callback(FLAC__byte buffer[],                                                                             size_t *bytes) {
-+  long retval =  file->readBlock((char *)buffer, (*bytes));
-+  if(-1 == retval) {
-+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-+  } else {
-+    (*bytes) = retval;
-+    return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-+  }
-+}
-+#endif
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderSeekStatus 
- K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) {
-   if(file->at(absolute_byte_offset) == FALSE)
-@@ -129,18 +163,43 @@
-   else
-     return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK;
- }
-+#else
-+FLAC__StreamDecoderSeekStatus 
-+K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) {
-+  if(file->at(absolute_byte_offset) == FALSE)
-+    return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
-+  else
-+    return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
-+}
-+#endif
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderTellStatus 
- K3bFLACDecoder::Private::tell_callback(FLAC__uint64 *absolute_byte_offset) {
-   (*absolute_byte_offset) = file->at();
-   return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
- }
-+#else
-+FLAC__StreamDecoderTellStatus 
-+K3bFLACDecoder::Private::tell_callback(FLAC__uint64 *absolute_byte_offset) {
-+  (*absolute_byte_offset) = file->at();
-+  return FLAC__STREAM_DECODER_TELL_STATUS_OK;
-+}
-+#endif
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderLengthStatus 
- K3bFLACDecoder::Private::length_callback(FLAC__uint64 *stream_length) {
-   (*stream_length) = file->size();
-   return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
- }
-+#else
-+FLAC__StreamDecoderLengthStatus 
-+K3bFLACDecoder::Private::length_callback(FLAC__uint64 *stream_length) {
-+  (*stream_length) = file->size();
-+  return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
-+}
-+#endif
- void K3bFLACDecoder::Private::metadata_callback(const FLAC__StreamMetadata *metadata) {
-@@ -260,6 +319,7 @@
-   int bytesCopied;
-   int bytesAvailable;
-+#ifdef LEGACY_FLAC
-   if(d->internalBuffer->size() == 0) {
-     // want more data
-     switch(d->get_state()) {
-@@ -274,6 +334,19 @@
-       return -1;
-     }
-   }
-+#else
-+  if(d->internalBuffer->size() == 0) {
-+    // want more data
-+    if(d->get_state() == FLAC__STREAM_DECODER_END_OF_STREAM)
-+      d->finish();
-+    else if(d->get_state() < FLAC__STREAM_DECODER_END_OF_STREAM) {
-+      if(! d->process_single())
-+        return -1;
-+    }
-+    else
-+      return -1;
-+  }
-+#endif
-   
-   bytesAvailable = d->internalBuffer->size() - d->internalBuffer->at();
-   bytesToCopy = QMIN(maxLen, bytesAvailable);
diff --git a/app-cdr/k3b/files/k3b-1.0_pre2-flac-beta.patch b/app-cdr/k3b/files/k3b-1.0_pre2-flac-beta.patch
deleted file mode 100644 (file)
index ec34de6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: k3b-1.0pre2/plugins/decoder/flac/configure.in.in
-===================================================================
---- k3b-1.0pre2.orig/plugins/decoder/flac/configure.in.in
-+++ k3b-1.0pre2/plugins/decoder/flac/configure.in.in
-@@ -22,9 +22,9 @@ if test "$ac_cv_use_flac" = "yes"; then
-   AC_CHECK_PROG( have_flac_bin, flac, 1, 0 )
-   if test "$have_flac_bin" = "1"; then
--    K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d "." -f 1`
--    K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d "." -f 2`
--    K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d "." -f 3`
-+    K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 1`
-+    K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 2`
-+    K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 3`
-     if test \( "$K3B_FLAC_VERSION_MAJOR" -gt 1 -o \
-       \( "$K3B_FLAC_VERSION_MAJOR" -eq 1 -a \( "$K3B_FLAC_VERSION_MINOR" -gt 1 -o \
-                                \( "$K3B_FLAC_VERSION_MINOR" -eq 1 -a "$K3B_FLAC_VERSION_PATCHLEVEL" -gt 1 \) \
diff --git a/app-cdr/k3b/k3b-1.0_pre1.ebuild b/app-cdr/k3b/k3b-1.0_pre1.ebuild
deleted file mode 100644 (file)
index c176ee8..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre1.ebuild,v 1.4 2006/11/19 19:53:50 cardoe Exp $
-
-inherit kde eutils
-
-MY_P=${P/_pre/pre}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa css dvdr encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis"
-
-DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-       hal? ( || ( dev-libs/dbus-qt3-old
-                       ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
-               sys-apps/hal )
-       media-libs/libsamplerate
-       media-libs/taglib
-       >=media-sound/cdparanoia-3.9.8
-       sndfile? ( media-libs/libsndfile )
-       ffmpeg? ( media-video/ffmpeg )
-       flac? ( ~media-libs/flac-1.1.2 )
-       mp3? ( media-libs/libmad )
-       musepack? ( media-libs/libmpcdec )
-       vorbis? ( media-libs/libvorbis )
-       musicbrainz? ( media-libs/musicbrainz )
-       encode? ( media-sound/lame )
-       alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}
-       virtual/cdrtools
-       >=app-cdr/cdrdao-1.1.7-r3
-       media-sound/normalize
-       dvdr? ( app-cdr/dvd+rw-tools )
-       css? ( media-libs/libdvdcss )
-       encode? ( media-sound/sox
-                         media-video/transcode )
-       vcd? ( media-video/vcdimager )"
-
-DEPEND="${DEPEND}
-       dev-util/pkgconfig"
-
-need-kde 3.4
-
-# The following commented lines will have to be uncommented once the final
-# release is done. This pre-release version does not support i18n.
-#I18N="${PN}-i18n-${PV}"
-
-# Supported languages and translated documentation
-#LANGS="af bg bn br bs ca cs cy da de el en_GB es et eu fr ga he hi hu is it ja km lt mk ms nb nds nl nn pa pl pt pt_BR ro ru se sl sr sr@Latn sv ta tr uk zh_CN"
-
-#for X in ${LANGS}; do
-#      SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-#      IUSE="${IUSE} linguas_${X}"
-#done
-
-pkg_setup() {
-       if use hal && ! built_with_use sys-apps/dbus qt3; then
-               eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
-               eerror "but sys-apps/dbus is not built with Qt3 support."
-               die "rebuild sys-apps/dbus with the qt3 useflag"
-       fi
-       if use encode && ! built_with_use media-video/transcode dvdread; then
-               eerror "You are trying to compile ${CATEGORY}/${PF} with the \"encode\" USE flag enabled,"
-               eerror "but media-video/transcode is not built with dvdread support."
-               die "rebuild media-video/transcode with the dvdread useflag"
-       fi
-
-       kde_pkg_setup
-}
-
-src_unpack() {
-       kde_src_unpack
-
-       if [ -d "${WORKDIR}/${I18N}" ]; then
-               cd "${WORKDIR}/${I18N}"
-               for X in ${LANGS}; do
-                       use linguas_${X} || rm -rf "${X}"
-               done
-               rm -f configure
-       fi
-}
-
-src_compile() {
-       local myconf="--enable-libsuffix= \
-                       --with-external-libsamplerate   \
-                       --without-resmgr                \
-                       $(use_with kde k3bsetup)        \
-                       $(use_with hal)                 \
-                       $(use_with encode lame)         \
-                       $(use_with ffmpeg)              \
-                       $(use_with flac)                \
-                       $(use_with vorbis oggvorbis)    \
-                       $(use_with sndfile)             \
-                       $(use_with mp3 libmad)          \
-                       $(use_with musepack)            \
-                       $(use_with musicbrainz)         \
-                       $(use_with alsa)"
-
-       # Build process of K3b
-       kde_src_compile
-
-       # Build process of K3b-i18n
-#      if [ -d "${WORKDIR}/${I18N}" ]; then
-#              KDE_S="${WORKDIR}/${I18N}" \
-#              kde_src_compile
-#      fi
-}
-
-src_install() {
-       kde_src_install
-       dodoc FAQ KNOWNBUGS PERMISSIONS
-
-#      if [ -d "${WORKDIR}/${I18N}" ]; then
-#              KDE_S="${WORKDIR}/${I18N}" \
-#              kde_src_install
-#      fi
-
-       # Move menu entry
-       if use kde; then
-               mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications/kde/
-       fi
-       rm -fR ${D}/usr/share/applnk/
-}
-
-pkg_postinst() {
-       echo
-       einfo "Make sure you have proper read/write permissions on the cdrom device(s)."
-       einfo "Usually, it is sufficient to be in the cdrom group."
-       echo
-}
diff --git a/app-cdr/k3b/k3b-1.0_pre2.ebuild b/app-cdr/k3b/k3b-1.0_pre2.ebuild
deleted file mode 100644 (file)
index 6674616..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.5 2006/11/19 19:53:50 cardoe Exp $
-
-inherit kde eutils
-
-MY_P=${P/_pre/pre}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa css dvdr dvdread encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis"
-
-DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-       hal? ( || ( dev-libs/dbus-qt3-old
-                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
-               sys-apps/hal )
-       media-libs/libsamplerate
-       media-libs/taglib
-       >=media-sound/cdparanoia-3.9.8
-       sndfile? ( media-libs/libsndfile )
-       ffmpeg? ( media-video/ffmpeg )
-       flac? ( media-libs/flac )
-       mp3? ( media-libs/libmad )
-       musepack? ( media-libs/libmpcdec )
-       vorbis? ( media-libs/libvorbis )
-       musicbrainz? ( media-libs/musicbrainz )
-       encode? ( media-sound/lame )
-       alsa? ( media-libs/alsa-lib )
-       dvdread? ( media-libs/libdvdread )"
-
-RDEPEND="${DEPEND}
-       virtual/cdrtools
-       >=app-cdr/cdrdao-1.1.7-r3
-       media-sound/normalize
-       dvdr? ( app-cdr/dvd+rw-tools )
-       css? ( media-libs/libdvdcss )
-       encode? ( media-sound/sox
-                         media-video/transcode )
-       vcd? ( media-video/vcdimager )"
-
-DEPEND="${DEPEND}
-       dev-util/pkgconfig"
-
-need-kde 3.2
-
-# The following commented lines will have to be uncommented once the final
-# release is done. This pre-release version does not support i18n.
-#I18N="${PN}-i18n-${PV}"
-
-# Supported languages and translated documentation
-#LANGS="af bg bn br bs ca cs cy da de el en_GB es et eu fr ga he hi hu is it ja km lt mk ms nb nds nl nn pa pl pt pt_BR ro ru se sl sr sr@Latn sv ta tr uk zh_CN"
-
-#for X in ${LANGS}; do
-#      SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-#      IUSE="${IUSE} linguas_${X}"
-#done
-
-pkg_setup() {
-       if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
-               eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
-               eerror "but sys-apps/dbus is not built with Qt3 support."
-               die "Please, rebuild sys-apps/dbus with the \"qt3\" USE flag."
-       fi
-       if use encode && ! built_with_use media-video/transcode dvdread; then
-               eerror "You are trying to compile ${CATEGORY}/${PF} with the \"encode\""
-               eerror "USE flag enabled, however media-video/transcode was not built"
-               eerror "with libdvdread support. Also keep in mind that enabling"
-               eerror "the dvdread USE flag will cause k3b to use libdvdread as well."
-               die "Please, rebuild media-video/transcode with the \"dvdread\" USE flag."
-       fi
-
-       kde_pkg_setup
-}
-
-src_unpack() {
-       kde_src_unpack
-
-       if [ -d "${WORKDIR}/${I18N}" ]; then
-               cd "${WORKDIR}/${I18N}"
-               for X in ${LANGS}; do
-                       use linguas_${X} || rm -rf "${X}"
-               done
-               rm -f configure
-       fi
-
-       cd "${S}"
-       epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
-       epatch "${FILESDIR}/${P}-flac-beta.patch"
-       rm -f "${S}/configure"
-}
-
-src_compile() {
-       local myconf="--enable-libsuffix= \
-                       --with-external-libsamplerate   \
-                       --without-resmgr                \
-                       $(use_with kde k3bsetup)        \
-                       $(use_with hal)                 \
-                       $(use_with encode lame)         \
-                       $(use_with ffmpeg)              \
-                       $(use_with flac)                \
-                       $(use_with vorbis oggvorbis)    \
-                       $(use_with sndfile)             \
-                       $(use_with mp3 libmad)          \
-                       $(use_with musepack)            \
-                       $(use_with musicbrainz)         \
-                       $(use_with alsa)"
-
-       # Build process of K3b
-       kde_src_compile
-
-       # Build process of K3b-i18n
-#      if [ -d "${WORKDIR}/${I18N}" ]; then
-#              KDE_S="${WORKDIR}/${I18N}" \
-#              kde_src_compile
-#      fi
-}
-
-src_install() {
-       kde_src_install
-       dodoc FAQ KNOWNBUGS PERMISSIONS
-
-#      if [ -d "${WORKDIR}/${I18N}" ]; then
-#              KDE_S="${WORKDIR}/${I18N}" \
-#              kde_src_install
-#      fi
-
-       # Move menu entry
-       if use kde; then
-               mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications/kde/
-       fi
-       rm -fR ${D}/usr/share/applnk/
-}
-
-pkg_postinst() {
-       echo
-       einfo "Make sure you have proper read/write permissions on the cdrom device(s)."
-       einfo "Usually, it is sufficient to be in the cdrom group."
-       echo
-}