Remove configure and let kde.eclass handle it wrt #255882.

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

6 files changed, 15 insertions, 94 deletions

diff --git a/media-sound/soundkonverter/ChangeLog b/media-sound/soundkonverter/ChangeLog
index b19efc7abf5b..e5c8f04fa917 100644
--- a/media-sound/soundkonverter/ChangeLog
+++ b/media-sound/soundkonverter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/soundkonverter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/ChangeLog,v 1.9 2009/05/13 18:45:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/ChangeLog,v 1.10 2009/05/14 04:58:31 ssuominen Exp $
+
+  14 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -files/soundkonverter-0.3.6-gcc43.patch, -soundkonverter-0.3.8-r1.ebuild,
+  -files/soundkonverter-0.3.8-desktop-file.diff,
+  soundkonverter-0.3.9.ebuild:
+  Remove configure and let kde.eclass handle it wrt #255882.
 
 *soundkonverter-0.3.9 (13 May 2009)
 
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index d81785a043fd..249fc11d8bb5 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,10 +1,6 @@
-AUX soundkonverter-0.3.6-gcc43.patch 1116 RMD160 61c29bb8991388f7a7be3ea48565dccaf03c48e2 SHA1 b3c4953dd1c3b9d4285ee714d1d25a63ac434b61 SHA256 3395b62ba379efc9f87820f41ce6c6f5a5d2d8570dd33b682ee73c01616335d6
-AUX soundkonverter-0.3.8-desktop-file.diff 345 RMD160 2382c2b3531f889a03929161d0f7e16c45afef34 SHA1 42f5fe202e0c70b9ef15660535e65b0abbd6e5c7 SHA256 a4ad78fb2aa04745bfbce25af23d0514be3793066716035af4db51922ea9980c
 AUX soundkonverter-0.3.9-desktop_entry.patch 500 RMD160 44703986daa65e5a2d5e9052b39af1e6bd700939 SHA1 bd1704e40b7bc1d761361328bc0afba67d4e5fa9 SHA256 0a5cff9137f70bfa91e38b3b32b61bcaa9da2e6c5d4ee3313b7c5926d77c7000
 AUX soundkonverter-0.3.9-gcc44.patch 3991 RMD160 abce9612e533225a259ff0542c132766f805a3f6 SHA1 a3e6dee99894d76da8aaccbeb905857fa53341a2 SHA256 051015c24952d62188c9c1cc01253717ae569636e7c815b073c27cb47de494ad
-DIST soundkonverter-0.3.8.tar.bz2 706344 RMD160 323ab26606d9632fb9b11ef7e05c12b0aa2d2bcf SHA1 7abe52f1976cdce5fa396d8cbcbd036af7e71482 SHA256 71031842e0e02714a1a00668e65e93222d339d9f995088f7cd4e3e6caf1067ee
 DIST soundkonverter-0.3.9.tar.bz2 729068 RMD160 67984cac234653943ff666832625537702f0318e SHA1 758dfada8d482ad29adac1fea1afd092353573a8 SHA256 576fe13eed7da4ecd534419ab916f754d9faeda14441c488ea19e50e6835e4a5
-EBUILD soundkonverter-0.3.8-r1.ebuild 1542 RMD160 2480d63253d0b114b98eb84d93f0adf77142ac0d SHA1 43ec9545b44883ef7ad38c1d6b182319fbc1e04d SHA256 13ab66e64c01daf54ee141ec873aa2c0dbd730c7ad464dd50b9de43bdf71b826
-EBUILD soundkonverter-0.3.9.ebuild 1407 RMD160 34f394958b4da701ff8e71bb252d9c3f5c146c08 SHA1 9e22d400ddde8dcabe02c68f7c9cc1e5219f3edd SHA256 8860bea487eb82627e1287a45cbc0dcb03f808b24ab9a4f2578c54f207f93f17
-MISC ChangeLog 2015 RMD160 5ba3fa7cc1d4824d05da0db10447451a03399eae SHA1 3d2cdac62d6219333fd3592e41f2f3c65f2b3773 SHA256 a9a68db9db57cdd738227b50436a422ed4eb45eb62dd20072a557dfbdf479ac1
+EBUILD soundkonverter-0.3.9.ebuild 1465 RMD160 0cf3f27f545f8c5495cbd2f17d902ef84b8e704a SHA1 56561f0e96c5249b98ac7de92d6c8aa17c81a273 SHA256 3324ddaf2da157de872e0c8b565f3c8cd60c953dffc38772c183c878c40e2f4f
+MISC ChangeLog 2288 RMD160 842ad4acb48a11042e4e3509ad94e21924551f49 SHA1 ad5f39a40d3897119735aa7372d556a1d191f3ff SHA256 5ae4ef8c061ff40aaeaca0a2d6642550a675c787166e94d273e049929d772303
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/soundkonverter/files/soundkonverter-0.3.6-gcc43.patch b/media-sound/soundkonverter/files/soundkonverter-0.3.6-gcc43.patch
deleted file mode 100644
index fea5eaa8e018..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-0.3.6-gcc43.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urb src-orig/metadata/ape/taglib_monkeysaudiofiletyperesolver.cpp src/metadata/ape/taglib_monkeysaudiofiletyperesolver.cpp
---- src-orig/metadata/ape/taglib_monkeysaudiofiletyperesolver.cpp	2008-04-23 19:46:24.000000000 +0200
-+++ src/metadata/ape/taglib_monkeysaudiofiletyperesolver.cpp	2008-04-23 19:46:35.000000000 +0200
-@@ -4,6 +4,7 @@
- 
- #include "taglib_monkeysaudiofiletyperesolver.h"
- #include <taglib/mpcfile.h>
-+#include <cstring>
- 
- TagLib::File *MonkeysAudioFileTypeResolver::createFile(const char *fileName,
-         bool readProperties,
-diff -urb src-orig/metadata/optimfrog/taglib_optimfrogfiletyperesolver.cpp src/metadata/optimfrog/taglib_optimfrogfiletyperesolver.cpp
---- src-orig/metadata/optimfrog/taglib_optimfrogfiletyperesolver.cpp	2008-04-23 19:46:24.000000000 +0200
-+++ src/metadata/optimfrog/taglib_optimfrogfiletyperesolver.cpp	2008-04-23 19:47:08.000000000 +0200
-@@ -4,6 +4,7 @@
- 
- #include "taglib_optimfrogfiletyperesolver.h"
- #include <taglib/mpcfile.h>
-+#include <cstring>
- 
- TagLib::File *OptimFrogFileTypeResolver::createFile(const char *fileName,
-         bool readProperties,
diff --git a/media-sound/soundkonverter/files/soundkonverter-0.3.8-desktop-file.diff b/media-sound/soundkonverter/files/soundkonverter-0.3.8-desktop-file.diff
deleted file mode 100644
index 878da43b5748..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-0.3.8-desktop-file.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/soundkonverter.desktop.o	2009-02-14 00:43:22.000000000 +0100
-+++ src/soundkonverter.desktop	2009-02-14 00:43:31.000000000 +0100
-@@ -1,6 +1,5 @@
- [Desktop Entry]
--Categories=Qt;KDE;AudioVideo;AudioVideoEditing
--Encoding=UTF-8
-+Categories=Qt;KDE;AudioVideo;AudioVideoEditing;
- Name=soundKonverter
- Exec=soundkonverter
- Icon=soundkonverter
diff --git a/media-sound/soundkonverter/soundkonverter-0.3.8-r1.ebuild b/media-sound/soundkonverter/soundkonverter-0.3.8-r1.ebuild
deleted file mode 100644
index fd307cc39a9b..000000000000
--- a/media-sound/soundkonverter/soundkonverter-0.3.8-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-0.3.8-r1.ebuild,v 1.2 2009/02/14 06:31:17 mr_bones_ Exp $
-
-ARTS_REQUIRED="never"
-
-EAPI="1"
-
-inherit kde eutils
-
-DESCRIPTION="SoundKonverter: A frontend to various audio converters for KDE."
-HOMEPAGE="http://kde-apps.org/content/show.php?content=29024"
-SRC_URI="http://hessijames.googlepages.com/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg flac mp3 musepack vorbis"
-
-DEPEND=">=media-libs/taglib-1.4
-	>=media-sound/cdparanoia-3.9.8-r5"
-RDEPEND="${DEPEND}
-	mp3? ( >=media-sound/lame-3.96 )
-	vorbis? ( >=media-sound/vorbis-tools-1 )
-	flac? ( >=media-libs/flac-1.1.1 )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
-	musepack? ( >=media-sound/musepack-tools-1.15u )"
-
-need-kde 3.5
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.6-gcc43.patch"
-	"${FILESDIR}/soundkonverter-0.3.8-desktop-file.diff"
-	)
-
-src_compile() {
-	append-flags -fno-inline
-	local myconf="--without-mp4v2"
-	kde_src_compile || die "kde_src_compile failed."
-}
-
-src_install() {
-	kde_src_install || die "kde_src_install failed."
-	mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-
-	elog "The audio USE flags are for your convience, but are not required."
-	elog "For AmaroK users there is a script included with this package."
-	elog "You can enable it with the Script Manager tool in Amarok, after"
-	elog "installing kde-base/qtruby."
-}
diff --git a/media-sound/soundkonverter/soundkonverter-0.3.9.ebuild b/media-sound/soundkonverter/soundkonverter-0.3.9.ebuild
index 0d49d876e239..d16426b70bc3 100644
--- a/media-sound/soundkonverter/soundkonverter-0.3.9.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-0.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-0.3.9.ebuild,v 1.1 2009/05/13 18:45:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-0.3.9.ebuild,v 1.2 2009/05/14 04:58:31 ssuominen Exp $
 
 EAPI=1
 ARTS_REQUIRED=never
@@ -28,6 +28,11 @@ need-kde 3.5
 
 PATCHES=( "${FILESDIR}/${P}-desktop_entry.patch" "${FILESDIR}/${P}-gcc44.patch" )
 
+src_unpack() {
+	kde_src_unpack
+	rm -f "${S}"/configure
+}
+
 src_compile() {
 	append-flags -fno-inline
 	local myconf="--without-mp4v2"