Bump for #225799. Remove old. Installation of docs was breaking. Punted. If you need documentation for clicking, you're not our audience :-)

(Portage version: 2.1.5.4)

8 files changed, 61 insertions, 397 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index ca1b571a5fdf..a964f6c5a39e 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/kid3
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.29 2007/12/08 10:50:44 mattepiu Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.30 2008/06/11 20:03:08 loki_val Exp $
+
+*kid3-1.0 (11 Jun 2008)
+
+  11 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/kid3-0.5-configure.patch, -kid3-0.5.ebuild, -kid3-0.6.ebuild,
+  -kid3-0.7.ebuild, -kid3-0.9.ebuild, -kid3-0.10.ebuild, +kid3-1.0.ebuild:
+  Bump for #225799. Remove old. Installation of docs was breaking. Punted.
+  If you need documentation for clicking, you're not our audience :-)
 
 *kid3-0.10 (08 Dec 2007)
 
diff --git a/media-sound/kid3/files/kid3-0.5-configure.patch b/media-sound/kid3/files/kid3-0.5-configure.patch
deleted file mode 100644
index 2737bd258273..000000000000
--- a/media-sound/kid3/files/kid3-0.5-configure.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- configure.orig	2004-11-10 23:33:24.903907112 +0000
-+++ configure	2004-11-10 23:34:19.501607000 +0000
-@@ -23936,138 +23936,6 @@
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for mcopidl" >&5
--echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
--   if test -n "$MCOPIDL"; then
--        kde_cv_path="$MCOPIDL";
--   else
--        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
--
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--        kde_cv_path="NONE"
--	dirs="$kde_default_bindirs"
--	kde_save_IFS=$IFS
--	IFS=':'
--	for dir in $PATH; do
--	  dirs="$dirs $dir"
--        done
--	IFS=$kde_save_IFS
--
--        for dir in $dirs; do
--	  if test -x "$dir/mcopidl"; then
--	    if test -n ""
--	    then
--              evalstr="$dir/mcopidl  2>&1 "
--	      if eval $evalstr; then
--                kde_cv_path="$dir/mcopidl"
--                break
--	      fi
--            else
--		kde_cv_path="$dir/mcopidl"
--                break
--	    fi
--          fi
--        done
--
--        eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
--      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
--   fi
--
--   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--
--    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
--Please check whether you installed aRts correctly.
--" >&5
--echo "$as_me: error: The important program mcopidl was not found!
--Please check whether you installed aRts correctly.
--" >&2;}
--   { (exit 1); exit 1; }; }
--
--   else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
--      MCOPIDL=$kde_cv_path
--
--   fi
--
--
--   echo "$as_me:$LINENO: checking for artsc-config" >&5
--echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
--   if test -n "$ARTSCCONFIG"; then
--        kde_cv_path="$ARTSCCONFIG";
--   else
--        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
--
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--        kde_cv_path="NONE"
--	dirs="$kde_default_bindirs"
--	kde_save_IFS=$IFS
--	IFS=':'
--	for dir in $PATH; do
--	  dirs="$dirs $dir"
--        done
--	IFS=$kde_save_IFS
--
--        for dir in $dirs; do
--	  if test -x "$dir/artsc-config"; then
--	    if test -n ""
--	    then
--              evalstr="$dir/artsc-config  2>&1 "
--	      if eval $evalstr; then
--                kde_cv_path="$dir/artsc-config"
--                break
--	      fi
--            else
--		kde_cv_path="$dir/artsc-config"
--                break
--	    fi
--          fi
--        done
--
--        eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
--      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
--   fi
--
--   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--
--    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
--Please check whether you installed aRts correctly.
--" >&5
--echo "$as_me: error: The important program artsc-config was not found!
--Please check whether you installed aRts correctly.
--" >&2;}
--   { (exit 1); exit 1; }; }
--
--   else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
--      ARTSCCONFIG=$kde_cv_path
--
--   fi
--
--
-    echo "$as_me:$LINENO: checking for kde-config" >&5
- echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
-    if test -n "$KDECONFIG"; then
diff --git a/media-sound/kid3/kid3-0.10.ebuild b/media-sound/kid3/kid3-0.10.ebuild
deleted file mode 100644
index 4e7c3093a65c..000000000000
--- a/media-sound/kid3/kid3-0.10.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.10.ebuild,v 1.1 2007/12/08 10:50:44 mattepiu Exp $
-
-inherit kde
-
-DESCRIPTION="A simple ID3 tag editor for QT/KDE."
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac taglib vorbis"
-
-DEPEND=">=media-libs/id3lib-3.8.3
-	taglib? ( >=media-libs/taglib-1.4-r1 )
-	vorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac )"
-
-need-kde 3
-
-LANGS="de es fr ru"
-LANGS_DOC="de en"
-
-for X in ${LANGS} ${LANGS_DOC} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
-		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
-		eerror "Please enable the cxx USE flag for media-libs/flac"
-		die "Missing FLAC C++ bindings."
-	fi
-
-	kde_pkg_setup
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	local MAKE_LANGS
-	cd "${WORKDIR}/${P}/po"
-	for X in ${LANGS} ; do
-		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}.po"
-	done
-	sed -i -e "s:POFILES =.*:POFILES = ${MAKE_LANGS}:" Makefile.am
-
-	MAKE_LANGS=""
-	cd "${WORKDIR}/${P}/doc"
-	for X in ${LANGS_DOC} ; do
-		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}"
-	done
-	sed -i -e "s:SUBDIRS =.*:SUBDIRS = ${MAKE_LANGS}:" Makefile.am
-	rm -f "${S}/configure"
-}
-
-# Support for the KDE libraries is optional,
-# but the configure step that detects them
-# cannot be avoided. So KDE support is forced on.
-
-src_compile() {
-	local myconf="--with-kde
-				$(use_with vorbis)
-				$(use_with flac)
-				$(use_with taglib)
-				--without-musicbrainz"
-
-	kde_src_compile
-}
diff --git a/media-sound/kid3/kid3-0.5.ebuild b/media-sound/kid3/kid3-0.5.ebuild
deleted file mode 100644
index 016e9084ebb7..000000000000
--- a/media-sound/kid3/kid3-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.5.ebuild,v 1.8 2005/11/05 20:08:04 greg_g Exp $
-
-IUSE="arts"
-
-inherit kde eutils
-
-DESCRIPTION="A simple ID3 tag editor for QT/KDE."
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-
-SLOT="0"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEPEND=">=media-libs/id3lib-3.8.3"
-need-kde 3.1
-
-src_unpack() {
-	kde_src_unpack
-
-	use arts || epatch ${FILESDIR}/${P}-configure.patch
-}
diff --git a/media-sound/kid3/kid3-0.6.ebuild b/media-sound/kid3/kid3-0.6.ebuild
deleted file mode 100644
index a0ad5ea0f542..000000000000
--- a/media-sound/kid3/kid3-0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.6.ebuild,v 1.5 2007/11/18 21:52:08 aballier Exp $
-
-inherit kde
-
-DESCRIPTION="A simple ID3 tag editor for QT/KDE."
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac vorbis"
-
-DEPEND=">=media-libs/id3lib-3.8.3
-	vorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac )"
-
-need-kde 3
-
-pkg_setup() {
-	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
-		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
-		eerror "Please enable the cxx USE flag for media-libs/flac"
-		die "Missing FLAC C++ bindings."
-	fi
-
-	kde_pkg_setup
-}
-
-# Support for the KDE libraries is optional,
-# but the configure step that detects them
-# cannot be avoided. So KDE support is forced on.
-
-src_compile() {
-	local myconf="--with-kde
-				  $(use_with vorbis)
-				  $(use_with flac)
-				  --without-musicbrainz"
-
-	kde_src_compile
-}
diff --git a/media-sound/kid3/kid3-0.7.ebuild b/media-sound/kid3/kid3-0.7.ebuild
deleted file mode 100644
index 0f8cd5cec52c..000000000000
--- a/media-sound/kid3/kid3-0.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.7.ebuild,v 1.2 2007/11/18 21:52:08 aballier Exp $
-
-inherit kde
-
-DESCRIPTION="A simple ID3 tag editor for QT/KDE."
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac vorbis"
-
-DEPEND=">=media-libs/id3lib-3.8.3
-	vorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac )"
-RDEPEND="${DEPEND}"
-
-need-kde 3
-
-pkg_setup() {
-	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
-		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
-		eerror "Please enable the cxx USE flag for media-libs/flac"
-		die "Missing FLAC C++ bindings."
-	fi
-
-	kde_pkg_setup
-}
-
-# Support for the KDE libraries is optional,
-# but the configure step that detects them
-# cannot be avoided. So KDE support is forced on.
-
-src_compile() {
-	local myconf="--with-kde
-				  $(use_with vorbis)
-				  $(use_with flac)
-				  --without-musicbrainz"
-
-	kde_src_compile
-}
diff --git a/media-sound/kid3/kid3-0.9.ebuild b/media-sound/kid3/kid3-0.9.ebuild
deleted file mode 100644
index 9abc5d5c5b8a..000000000000
--- a/media-sound/kid3/kid3-0.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.9.ebuild,v 1.3 2007/12/08 10:50:44 mattepiu Exp $
-
-inherit kde
-
-DESCRIPTION="A simple ID3 tag editor for QT/KDE."
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac taglib vorbis"
-
-DEPEND=">=media-libs/id3lib-3.8.3
-	taglib? ( >=media-libs/taglib-1.4-r1 )
-	vorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac )"
-
-need-kde 3
-
-LANGS="de es fr ru"
-LANGS_DOC="de en"
-
-for X in ${LANGS} ${LANGS_DOC} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
-		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
-		eerror "Please enable the cxx USE flag for media-libs/flac"
-		die "Missing FLAC C++ bindings."
-	fi
-
-	kde_pkg_setup
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	local MAKE_LANGS
-	cd "${WORKDIR}/${P}/po"
-	for X in ${LANGS} ; do
-		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}.po"
-	done
-	sed -i -e "s:POFILES =.*:POFILES = ${MAKE_LANGS}:" Makefile.am
-
-	MAKE_LANGS=""
-	cd "${WORKDIR}/${P}/doc"
-	for X in ${LANGS_DOC} ; do
-		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}"
-	done
-	sed -i -e "s:SUBDIRS =.*:SUBDIRS = ${MAKE_LANGS}:" Makefile.am
-	rm -f "${S}/configure"
-}
-
-# Support for the KDE libraries is optional,
-# but the configure step that detects them
-# cannot be avoided. So KDE support is forced on.
-
-src_compile() {
-	local myconf="--with-kde
-				$(use_with vorbis)
-				$(use_with flac)
-				$(use_with taglib)
-				--without-musicbrainz"
-
-	kde_src_compile
-}
diff --git a/media-sound/kid3/kid3-1.0.ebuild b/media-sound/kid3/kid3-1.0.ebuild
new file mode 100644
index 000000000000..693688b5f05c
--- /dev/null
+++ b/media-sound/kid3/kid3-1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.0.ebuild,v 1.1 2008/06/11 20:03:08 loki_val Exp $
+
+EAPI=1
+ARTS_REQUIRED=never
+
+inherit kde
+
+DESCRIPTION="A simple ID3 tag editor for QT/KDE."
+HOMEPAGE="http://kid3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+flac +musicbrainz +vorbis"
+
+DEPEND=">=media-libs/id3lib-3.8.3
+	>=media-libs/taglib-1.4-r1
+	media-libs/libmp4v2
+	media-libs/libvorbis
+	flac? (
+		media-libs/flac
+	)
+	musicbrainz? (
+		media-libs/musicbrainz:3
+		media-libs/tunepimp
+	)"
+
+need-kde 3
+
+pkg_setup() {
+	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
+		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
+		eerror "Please enable the cxx USE flag for media-libs/flac"
+		die "Missing FLAC C++ bindings."
+	fi
+
+	# Support for the KDE libraries is optional,
+	# but the configure step that detects them
+	# cannot be avoided. So KDE support is forced on.
+	# Compile fails without taglib, forced on.
+	# Ditto for vorbis, so there you go.
+	myconf="--with-kde
+		--with-taglib
+		--without-arts
+		--with-vorbis
+		$(use_with flac)
+		$(use_with musicbrainz)"
+}