Fix automagicness per bug #367059.

(Portage version: 2.2.0_alpha32/cvs/Linux x86_64)

4 files changed, 48 insertions, 54 deletions

diff --git a/media-sound/drumstick/ChangeLog b/media-sound/drumstick/ChangeLog
index 1781ec397787..19707f6e8179 100644
--- a/media-sound/drumstick/ChangeLog
+++ b/media-sound/drumstick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/drumstick
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/ChangeLog,v 1.10 2011/02/16 22:26:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/ChangeLog,v 1.11 2011/05/13 09:10:35 scarabeus Exp $
+
+  13 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.5.0-doc_automagicness.patch, -drumstick-0.4.1.ebuild,
+  drumstick-0.5.0.ebuild:
+  Fix automagicness per bug #367059.
 
   16 Feb 2011; Markos Chandras <hwoarang@gentoo.org> drumstick-0.5.0.ebuild:
   Stable on amd64 wrt bug #353476
diff --git a/media-sound/drumstick/drumstick-0.4.1.ebuild b/media-sound/drumstick/drumstick-0.4.1.ebuild
deleted file mode 100644
index 064d8564d35d..000000000000
--- a/media-sound/drumstick/drumstick-0.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/drumstick-0.4.1.ebuild,v 1.4 2010/10/27 12:45:02 fauli Exp $
-
-EAPI=2
-inherit cmake-utils fdo-mime gnome2-utils
-
-DESCRIPTION="Qt4/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	sed -i \
-		-e '/CMAKE_EXE_LINKER_FLAGS/d' \
-		CMakeLists.txt || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/drumstick/drumstick-0.5.0.ebuild b/media-sound/drumstick/drumstick-0.5.0.ebuild
index cf72e875ac31..6dfbf0a77843 100644
--- a/media-sound/drumstick/drumstick-0.5.0.ebuild
+++ b/media-sound/drumstick/drumstick-0.5.0.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/drumstick-0.5.0.ebuild,v 1.4 2011/02/16 22:26:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/drumstick-0.5.0.ebuild,v 1.5 2011/05/13 09:10:35 scarabeus Exp $
 
-EAPI=2
-inherit cmake-utils fdo-mime gnome2-utils
+EAPI=4
+
+inherit base cmake-utils fdo-mime gnome2-utils
 
 DESCRIPTION="Qt4/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -12,27 +13,40 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="dbus"
+IUSE="dbus doc"
 
 RDEPEND="media-libs/alsa-lib
 	x11-libs/qt-gui:4
 	x11-libs/qt-svg:4
+	x11-misc/shared-mime-info
 	dbus? ( x11-libs/qt-dbus:4 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
+PATCHES=(
+	"${FILESDIR}"/${PV}-doc_automagicness.patch
+)
 
 src_prepare() {
 	sed -i \
 		-e '/CMAKE_EXE_LINKER_FLAGS/d' \
 		CMakeLists.txt || die
+	base_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_use dbus)
-		)
+		$(cmake-utils_use_with doc)
+	)
 
 	cmake-utils_src_configure
 }
diff --git a/media-sound/drumstick/files/0.5.0-doc_automagicness.patch b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
new file mode 100644
index 000000000000..c2474ae4f1e1
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
@@ -0,0 +1,20 @@
+diff -urN drumstick-0.5.0.old/CMakeLists.txt drumstick-0.5.0/CMakeLists.txt
+--- drumstick-0.5.0.old/CMakeLists.txt	2010-09-09 12:38:56.000000000 +0200
++++ drumstick-0.5.0/CMakeLists.txt	2011-05-13 11:03:30.156962982 +0200
+@@ -143,6 +143,8 @@
+ ADD_SUBDIRECTORY(library)
+ ADD_SUBDIRECTORY(utils)
+ ADD_SUBDIRECTORY(icons)
++OPTION(WITH_DOC "Build documentation" ON)
++IF( WITH_DOC )
+ IF(${CMAKE_SYSTEM} MATCHES "Linux")
+     FIND_PACKAGE(Doxygen)
+     IF(DOXYGEN_FOUND)
+@@ -157,6 +159,7 @@
+     ENDIF(DOXYGEN_FOUND)
+     ADD_SUBDIRECTORY(doc)
+ ENDIF(${CMAKE_SYSTEM} MATCHES "Linux")
++ENDIF( WITH_DOC )
+ 
+ CONFIGURE_FILE(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
+ CONFIGURE_FILE(drumstick-file.pc.in drumstick-file.pc IMMEDIATE @ONLY)