Make libarchive optional but enabled by default (upstream scons preferes libtar,...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index 102259d239c3a1b71ac9cc757650170a0c8890b5..25139dee416ca9c652069cd09cab532eebe0684d 100644 (file)
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.91 2010/01/22 18:54:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.92 2010/05/03 18:02:30 ssuominen Exp $
+
+*hydrogen-0.9.4-r1 (03 May 2010)
+
+  03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +hydrogen-0.9.4-r1.ebuild:
+  Make libarchive optional but enabled by default (upstream scons preferes
+  libtar, we prefer libarchive).
 
   22 Jan 2010; Raúl Porcel <armin76@gentoo.org> hydrogen-0.9.4.ebuild:
   sparc stable

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 5181132da77d470a9cca2cefaa33018745deb8f6..e9b97b0b53c2702decf91b3f6d24316352958263 100644 (file)
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,4 +1,5 @@
 DIST hydrogen-0.9.4.tar.gz 3808532 RMD160 9f1514462eaa756fe0a3e8fed3ff647a32ad033d SHA1 e988710f82af858c0c688cb1d1e19d789fca49ef SHA256 982b768b48e8402104949c64fac4d74d804f41b6ab1b90457711840da99685d7
+EBUILD hydrogen-0.9.4-r1.ebuild 1697 RMD160 dcae12922b785f54e79e6c371386699c3bb62ab1 SHA1 bd5244660a457b212daa2b8452ebd1b8fd3ba580 SHA256 d66e189fc556a94fdb3f7ef2c34ada1e0106c89e1d6e4d36e351b8655572d2e9
 EBUILD hydrogen-0.9.4.ebuild 1529 RMD160 a2c5e96f28031e6507a00156e4ab85b17d68ab31 SHA1 a41c12d3365be1b2050435e30aaf9c8e43566f85 SHA256 884db0b1194ae5e078d74c719636566767027a56a2d8682843708e71ad9fa9bf
-MISC ChangeLog 14000 RMD160 80bb788e1dc7608179b18f3a34b2b8611e58b69f SHA1 ac890b199dfd7f3f234bbc4988cf1dc28f833432 SHA256 5cc429e236889408f88d8247f18fecef6a9f6d6dbbba27401f7ed82b47826b86
-MISC metadata.xml 163 RMD160 c2b208c0913f8c5bd1148627b5c3c9e37b53060a SHA1 4195ac5ca8352b0f52be6ed92640e4365be5bf0d SHA256 39a67c65d2e7583b6ee9e20fcab1fd821e28c51134eb2f76a7fe0598a2c2b4cb
+MISC ChangeLog 14228 RMD160 3b88a41d60a119c7b3c9ffa5448fe8a4cde8b15a SHA1 d56e5ef61f3a7f43b005aa1f723c66e8af3aa3c3 SHA256 328f9201df9aaf862e64bedcc5b611c1724c468ad2a12574a868cbf1bba7b063
+MISC metadata.xml 245 RMD160 ed73355f5397581f4771b2ea25f16fd3853e5637 SHA1 a0e7b5c2885c4e764ef7ed793b30865f6aed8384 SHA256 05597fe58e4b04b564fe6ab688cf21d440bdace9db321e23647fa363199a401d

diff --git a/media-sound/hydrogen/hydrogen-0.9.4-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.4-r1.ebuild
new file mode 100644 (file)
index 0000000..70ae96a
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.4-r1.ebuild,v 1.1 2010/05/03 18:02:30 ssuominen Exp $
+
+EAPI=2
+inherit eutils multilib
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa +archive flac jack ladspa lash oss"
+
+RDEPEND="x11-libs/qt-gui:4
+       archive? ( app-arch/libarchive )
+       !archive? ( >=dev-libs/libtar-1.2.11-r3 )
+       media-libs/libsndfile
+       alsa? ( media-libs/alsa-lib )
+       flac? ( media-libs/flac[cxx] )
+       jack? ( media-sound/jack-audio-connection-kit )
+       ladspa? ( media-libs/liblrdf )
+       lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+       dev-util/scons"
+
+src_prepare() {
+       sed -i \
+               -e '/cppflags +=/d' \
+                       Sconstruct || die
+}
+
+src_compile() {
+       export QTDIR="/usr/$(get_libdir)"
+
+       # obsolete portaudio v18 and portmidi not yet in portage
+       local myconf="portaudio=0 portmidi=0"
+
+       use alsa || myconf="${myconf} alsa=0"
+       use archive && myconf="${myconf} libarchive=1"
+       use flac || myconf="${myconf} flac=0"
+       use jack || myconf="${myconf} jack=0"
+       use ladspa || myconf="${myconf} lrdf=0"
+       use lash && myconf="${myconf} lash=1"
+       use oss || myconf="${myconf} oss=0"
+
+       scons \
+               prefix=/usr \
+               DESTDIR="${D}" \
+               optflags="${CXXFLAGS}" \
+               ${myconf} || die
+}
+
+src_install() {
+       dobin hydrogen || die
+       insinto /usr/share/hydrogen
+       doins -r data || die
+       doicon data/img/gray/h2-icon.svg
+       domenu hydrogen.desktop
+       dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html
+       dodoc AUTHORS ChangeLog README.txt
+}

diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index af0275e2998ac83d8243acaff2975febb6534dc3..b83a08d6d7cfc7e455894399339acb7b1bf70b4c 100644 (file)
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proaudio</herd>
+  <use>
+    <flag name="archive">Use libarchive instead of libtar</flag>
+  </use>
 </pkgmetadata>