Fix automagicness per bug #367059.

Package-Manager: portage-2.2.0_alpha32/cvs/Linux x86_64

5 files changed, 55 insertions, 72 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/Manifest b/media-sound/drumstick/Manifest
index 521acfadef81..4067bf2fdb6d 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,26 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST drumstick-0.4.1.tar.bz2 150215 RMD160 1b04b015b2b5a661f89716b1059383154bd92cb2 SHA1 e8c6fb1fef9a0cd19e48632b279df33bbe1b46af SHA256 9d78c1737bb77f9f936476e9d7721f6a50cf18796ecc274c2a7eac8ec3505272
+AUX 0.5.0-doc_automagicness.patch 743 RMD160 d893a9267fc71fb417e10196bd26fda4d054cf51 SHA1 47f9df59d09b692240af5b797857cd1a7f76fd30 SHA256 b6f66f77573c367dac672f50d9e4f14e576d47c4f10c7b24a28898b985914bfc
 DIST drumstick-0.5.0.tar.bz2 200914 RMD160 17bbb34132c239a1ec67efb0f417368b5c795914 SHA1 1a2e265dcea8c8066add8f87ad4902e79519aa09 SHA256 5a12bcf2a26dac7f2a5c9507c662c4c85556881c64bb55365dceb437cf3652cd
-EBUILD drumstick-0.4.1.ebuild 976 RMD160 cb67769819c1efffbf7682d471dcbfc5132efcf3 SHA1 a4ae696cf9d37ba92f0f4d346e936bdcec6691ed SHA256 af0ac09119adc2ae0eedea8e552670b137d626ba300b288985e68d4281b52f5c
-EBUILD drumstick-0.5.0.ebuild 1111 RMD160 9cd8c4c98b8f2efe2fc5bb782903e80c030e8da3 SHA1 93a438aa83e77cc47dde0195fd8d984d31699cf8 SHA256 9eea57630c1e5829be039879d6e3c74776ce7bcd9ad98ad05afe054dcd4940a1
-MISC ChangeLog 1441 RMD160 d62afb5b8a15fbb1c4007de9a1dec02250a44974 SHA1 a657892cc5ddd643ae11e3e2754b51f4e53b566a SHA256 810c63e10708cbaed580a604cd484679e6056894559d86bd0f1c886ba955a5f7
+EBUILD drumstick-0.5.0.ebuild 1346 RMD160 f5d58fc98d2f3abdfd7f19229322e1155d9c65ea SHA1 3a40fa966fabfc14b5193928a761063768baba8c SHA256 a7ef2aadaa3fa7a938057f72dbd842b273089dd5e688318c0f97803b9776a18e
+MISC ChangeLog 1626 RMD160 0d4a62f19b525c8a10a3cd16ee93ceecb90048ad SHA1 60f0d34a3e635bc1f394bb43aebfbb93ed0cbaaf SHA256 39a375e2be9bd2734e13368aff862e3733e47733b97f77082433306fe4d1c50f
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNXE5xAAoJEPqDWhW0r/LC9v8P/0bYlR8Uop1DsuPwyxCwBPT3
-B1wne3JQskqLV+LT94vlhQIoDYr5Nabgi5dfGQ+r03NpnfxFKRHSdumQujhTP8gu
-BH8RLgaXj5EgHd5SfwMsyt/emjZlXtjOXpSlZeAPo02IwdMOs24KABL4Fs85dDxH
-okjG3Jx+dFp9AqXgJNY6+FuooM8U6wDh+HQ2xMxy3CpF31/JGaBydi2YkIyu8wWA
-04uDIKkZQK/D1zIBXQxoi2EgxKBnitHiFlg0XoisTaXUfHiMaK43q7ATb0zI9wKb
-D8dYtYdZNEXH5gxUnyGLBIl/rOYMMn5LPAmTycolAiHnOVeTIQY75btMl5nUhPzM
-8fLz08Ylx287kSt/vNoJrV75coce03fK3gFkDUFj3mZRDgRT2X7NI3X5jVo8lB4x
-e1nXKaLkLzZY+WT/7u18KtjiLs5WPMCO62gruvSMGo5qws3T453F1w91e9ZFY/UB
-o9sGXgQcmrnB5lHS2KM70GKuSgdjrZdoAITh6T9erl9xiXS3MDyp4CeQhZA2Z7H5
-TsjukMg5VyQ8akh6v/2WM3RpaBh7ZP8+P5lW5ZhbQutxLd+XxBAFuMxduHuxkQu1
-xvJJs8n2GiY5QD/IgLtsvyq58SDOOVbBvGjMAmNKF2ADJ1+13f75lOLcgGdTpgY0
-l3EKljWn4/PipEDbxm4P
-=Jfg0
+iEYEARECAAYFAk3M9ZAACgkQHB6c3gNBRYdj4gCcDy2vPb5y6p6m9nwvO0RKtcRc
+p5MAmwfuZxUWnWvtX52naxRsSyXvRBKX
+=YxGS
 -----END PGP SIGNATURE-----
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)