[proaudio] [2580] media-sound/dino: version bump, fix dependencies, use autotools-utils and git-2, fix live ebuild, drop jackmidi

[subversion@xxxxxxxxxxxxx]

Revision: 2580
Author:   lilrc
Date:     2013-03-24 19:49:35 +0100 (Sun, 24 Mar 2013)
Log Message:
-----------
media-sound/dino: version bump, fix dependencies, use autotools-utils and git-2, fix live ebuild, drop jackmidi

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/dino/ChangeLog
    trunk/overlays/proaudio/media-sound/dino/Manifest
    trunk/overlays/proaudio/media-sound/dino/dino-9999.ebuild
    trunk/overlays/proaudio/media-sound/dino/metadata.xml

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/dino/dino-0.2.8.ebuild
    trunk/overlays/proaudio/media-sound/dino/files/dino-9999-no-override.patch

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/dino/dino-0.2.2.ebuild
    trunk/overlays/proaudio/media-sound/dino/dino-0.2.4.ebuild
    trunk/overlays/proaudio/media-sound/dino/files/jack_midi_api_fix.diff

Modified: trunk/overlays/proaudio/media-sound/dino/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/ChangeLog	2013-03-24 16:24:15 UTC (rev 2579)
+++ trunk/overlays/proaudio/media-sound/dino/ChangeLog	2013-03-24 18:49:35 UTC (rev 2580)
@@ -1,7 +1,23 @@
 # ChangeLog for media-sound/dino
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*dino-0.2.8 (24 Mar 2013)
+
+  24 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  -dino-0.2.2.ebuild, -dino-0.2.4.ebuild, +dino-0.2.8.ebuild, dino-9999.ebuild,
+  +files/dino-9999-no-override.patch, -files/jack_midi_api_fix.diff,
+  metadata.xml:
+  Version bump.
+  Move to EAPI 5.
+  Move to git-2 and autotools-utils eclasses.
+  Do not use jackmidi eclass.
+  Do not specify jack version in dependencies.
+  Depend on virtual/liblash.
+  Show warning in live ebuild.
+  Remove old patch.
+  Add patch to not override environment variables in live ebuild.
+
   17 Avr 2010; Stephane Angot <sa@xxxxxxxxx>; +dino-0.2.4.ebuild, dino-0.2.2.ebuid:
   Fix license, version bump
 

Modified: trunk/overlays/proaudio/media-sound/dino/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/Manifest	2013-03-24 16:24:15 UTC (rev 2579)
+++ trunk/overlays/proaudio/media-sound/dino/Manifest	2013-03-24 18:49:35 UTC (rev 2580)
@@ -1,8 +1,6 @@
-AUX jack_midi_api_fix.diff 1789 RMD160 9937530ac93982eb4eda0c6b1de14473b7f3a642 SHA1 45434ee39eb065abd39b3b6ae2b69ba0c9cbcfa9 SHA256 651e2b24791431017eb296a149cef96db23b23059a4f81d1603150b94a031e9a
-DIST dino-0.2.2.tar.gz 405842 RMD160 63cb376c393f9b69b262df10eaca87ebf1f499d4 SHA1 01b312d44b4a6ad7ac9c15cc968ba4c3803690ec SHA256 b451bd542c3c3df6ddb7ff8dd57d83ef6cab272351b217938119ed1cccd6e000
-DIST dino-0.2.4.tar.gz 423124 RMD160 1272c390f53ec528d752e9b7576ba50ceb1e47ac SHA1 fdab0d57c733cd6a689a0c231a3f3c2412b3c673 SHA256 69a587b49a85609310cbc7c832fd70e9ea89da86aadb7d9813e253c0400b86e8
-EBUILD dino-0.2.2.ebuild 753 RMD160 df2502d13551fc5c70c11cd30b975f329e6cbf20 SHA1 fb39535af54c41f3c4bec448df62e6112bd7f81f SHA256 cba2c002f7d0f9b34db2d7c331fc8094523d8798944beef41d06d87405242a40
-EBUILD dino-0.2.4.ebuild 698 RMD160 7579bdf09307416e7d2b50d145275febc6a2679d SHA1 c1e9ec143e92d00bff5423e59ad2a3608d2bf379 SHA256 da090b1fcc207319eab284b5951b942cfd2262a706cfad0d98072c4726b0a61b
-EBUILD dino-9999.ebuild 846 RMD160 a11c9fb3f875d3c85a73c77f649427267d885083 SHA1 0eaad61e4c816b316508164eade51db46903284d SHA256 53a9f55c6f5bd196974824a811d0dae7323b1af72edd9932d227deb5713ac961
-MISC ChangeLog 459 RMD160 ac70ebbce9fd844a332460c2d9cb4e433b16a6eb SHA1 80b46332e9156a69f4df13d4356b04db0865af98 SHA256 dd4f0e7f99ea8887ef3dcc2c489b1d5694804694a0518d3b95f31cac1fffb882
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX dino-9999-no-override.patch 1346 SHA256 52ca0dd3b9078df28547432c623ec6bcf09d85fb3cec23899757e752958f9701 SHA512 9ec22c1808828f8f0a1720b815addbbd10c798129a55b1077d2bf98f7b8957349a75741aee503d4b7a37be53658b239f2389735e43400c3cb5291c9b2d87c54e WHIRLPOOL 3857906982f93f6922c73d74808547fe35930327f35f92978a73f04b09e925d695b3a1b3955704a01c914ad5e1da96dbca0a7bc7af78c629ed47873661bbe90b
+DIST dino-0.2.8.tar.gz 425379 SHA256 b6fbd2ac92933de8b95bbb7591f6386468a3f0cb86ae175dc4fc4e83aa15d530 SHA512 d26dd36add49acca8174ca4295344b8d128a99a6bbfeaee95b7a4ca0172f37efb729113756e3d4923a04efee88dcb72e30ce24d7332582550f1fb32e426c7c5c WHIRLPOOL f6aa5caba463995e8bf34c1c3add9ba1c0f75d33f53d2d96450f431f3ecd3eb6179469d82657cff9b3b7a4376c10e50e6e4f9a6f710b2e8ebfad65367d97de7d
+EBUILD dino-0.2.8.ebuild 633 SHA256 91898f1de83915b9b43b7db8ef0915459e24efa852850cb3412e84f3ba9a915c SHA512 6080bb896777c28873bfb02641faa977281faebf4cee5c15199b09bcb818473d3e89b2c78a63bffa5ae43c0c656ccce8a260620f7bcd9ad48be6cb4adaf6122e WHIRLPOOL fab85c0166ae9424d56742996c3d1bfeac870fa421cea9da8e9d7c524af549cda5e5881c5afb9970474ed5a9e237164703174ec219a78845a40ddbbda46569a0
+EBUILD dino-9999.ebuild 1052 SHA256 1627d65dc3788653958c9fa789eea4f20c388e0adb745d0478a8ab8bd1c31148 SHA512 33a3f43b5ae390a57033661c5abcb1c40ec06dd80829dbd0fa19d4f9cee5fad7ad35e3d1d13fc7f0734a50798c284cef1fc75862adfa529e283031cb09d8c38b WHIRLPOOL 5cfaa899fcf8a03a752e5cc5ce9464624fac0d6880046a14a2b10ce9e008d389fae16ceaa91827b617e0230ade4c70f7efa02142e631d69cd0a7ba049ef0e7d1
+MISC ChangeLog 1020 SHA256 3ed5ac2706d1d9bcce8dee9972f03a37b7115deb1bf6cf3a8e6cb53e4333ff96 SHA512 065ac9535a7c7b33908b86b2580eb4e767f12ed5918ef179be212dfae882301dd7bb72044d708b1de2b83cd13bf6801451483eb9a853ef3977a827fd5d3bc48c WHIRLPOOL 406ddf3f64822a70bb7803da2a4080cfdc90073e3a99cdccaec1f6ee144c02102e8fa8da226c0dd2ce58dbf3e114b3620c7bc381495de72e05d79f8e6916d107
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Deleted: trunk/overlays/proaudio/media-sound/dino/dino-0.2.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/dino-0.2.2.ebuild	2013-03-24 16:24:15 UTC (rev 2579)
+++ trunk/overlays/proaudio/media-sound/dino/dino-0.2.2.ebuild	2013-03-24 18:49:35 UTC (rev 2580)
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils jackmidi
-RESTRICT="mirror"
-IUSE="debug"
-DESCRIPTION="Dino is a pattern-based MIDI sequencer."
-HOMEPAGE="http://dino.nongnu.org";
-
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-DEPEND=">=dev-cpp/libglademm-2.4.1
-	>=dev-cpp/libxmlpp-2.6.1
-	>=media-sound/jack-audio-connection-kit-0.102.6
-	>=media-sound/lash-0.5.0"
-
-src_unpack() {
-	need_jackmidi
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/jack_midi_api_fix.diff"
-}
-
-src_compile() {
-	econf $(use_enable debug) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}

Deleted: trunk/overlays/proaudio/media-sound/dino/dino-0.2.4.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/dino-0.2.4.ebuild	2013-03-24 16:24:15 UTC (rev 2579)
+++ trunk/overlays/proaudio/media-sound/dino/dino-0.2.4.ebuild	2013-03-24 18:49:35 UTC (rev 2580)
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils jackmidi
-RESTRICT="mirror"
-IUSE="debug"
-DESCRIPTION="Dino is a pattern-based MIDI sequencer."
-HOMEPAGE="http://dino.nongnu.org";
-
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-cpp/libglademm-2.4.1
-	>=dev-cpp/libxmlpp-2.6.1
-	>=media-sound/jack-audio-connection-kit-0.102.6
-	>=media-sound/lash-0.5.0"
-
-src_unpack() {
-	need_jackmidi
-	unpack ${A}
-}
-
-src_compile() {
-	econf $(use_enable debug) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}

Copied: trunk/overlays/proaudio/media-sound/dino/dino-0.2.8.ebuild (from rev 2574, trunk/overlays/proaudio/media-sound/dino/dino-0.2.4.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/dino-0.2.8.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/dino/dino-0.2.8.ebuild	2013-03-24 18:49:35 UTC (rev 2580)
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit autotools-utils
+
+RESTRICT="mirror"
+
+DESCRIPTION="a pattern-based MIDI sequencer."
+HOMEPAGE="http://${PN}.nongnu.org";
+
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug"
+
+RDEPEND=">=dev-cpp/libglademm-2.4.1
+	>=dev-cpp/libxmlpp-2.6.1
+	media-sound/jack-audio-connection-kit
+	virtual/liblash"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local myeconfargs=( $(use_enable debug) )
+	autotools-utils_src_configure
+}

Modified: trunk/overlays/proaudio/media-sound/dino/dino-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/dino-9999.ebuild	2013-03-24 16:24:15 UTC (rev 2579)
+++ trunk/overlays/proaudio/media-sound/dino/dino-9999.ebuild	2013-03-24 18:49:35 UTC (rev 2580)
@@ -1,39 +1,50 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils jackmidi cvs
+EAPI="5"
+
+inherit eutils base git-2 toolchain-funcs
+
 RESTRICT="mirror"
-IUSE="debug"
-DESCRIPTION="Dino is a pattern-based MIDI sequencer."
-HOMEPAGE="http://dino.nongnu.org";
 
-#SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz";
-ECVS_SERVER="cvs.savannah.nongnu.org:/sources/dino"
-ECVS_MODULE="${PN}"
-S="${WORKDIR}/${ECVS_MODULE}"
+DESCRIPTION="a pattern-based MIDI sequencer."
+HOMEPAGE="http://${PN}.nongnu.org";
 
+EGIT_REPO_URI="git://git.sv.gnu.org/${PN}.git"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND=">=dev-cpp/libglademm-2.4.1
+IUSE=""
+
+RDEPEND=">=dev-cpp/libglademm-2.4.1
 	>=dev-cpp/libxmlpp-2.6.1
-	>=media-sound/jack-audio-connection-kit-9999
-	>=media-sound/lash-0.5.0"
+	media-sound/jack-audio-connection-kit
+	virtual/liblash"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	need_jackmidi
-	cvs_src_unpack
-	cd "${S}"
-	#epatch "${FILESDIR}/jack_midi_api_fix.diff"
+PATCHES=(
+	"${FILESDIR}/${P}-no-override.patch"
+)
+
+display_warning() {
+	ewarn "Emergeing ${P} will not build ${PN} itself. It will just"
+	ewarn "install a library and some documentation."
+	ewarn "This message was written on the 24th of March 2013, if it"
+	ewarn "has been fixed upstream or you know a way to fix it please"
+	ewarn "let us know at the proaudio@xxxxxxxxxxxxxxxxxxx mailing list."
 }
 
+pkg_pretend() {
+	display_warning
+}
+
 src_compile() {
-	econf $(use_enable debug) || die
-	emake || die
+	base_src_compile CXX=$(tc-getCXX) CFLAGS="${CFLAGS}"
 }
 
-src_install() {
-	make DESTDIR="${D}" install || die
+pkg_postinst() {
+	display_warning
 }

Added: trunk/overlays/proaudio/media-sound/dino/files/dino-9999-no-override.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/files/dino-9999-no-override.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/dino/files/dino-9999-no-override.patch	2013-03-24 18:49:35 UTC (rev 2580)
@@ -0,0 +1,48 @@
+diff --git a/Makefile b/Makefile
+index 58bfeab..8fc7d92 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ CXXFLAGS = -std=c++0x
+-CXX = g++-4.5
++CXX := g++
+ 
+ PACKAGE_NAME = dino
+ PACKAGE_VERSION = $(shell ./VERSION)
+diff --git a/Makefile.template b/Makefile.template
+index a55b267..80be7ad 100644
+--- a/Makefile.template
++++ b/Makefile.template
+@@ -1,18 +1,18 @@
+ # Override these variables from the commandline, eg 'make DESTDIR=/usr install'
+-CFLAGS = -g -O2
+-prefix = /usr/local
+-bindir = $(prefix)/bin
+-libdir = $(prefix)/lib
+-datadir = $(prefix)/share
+-pkgdatadir = $(datadir)/$(PACKAGE_NAME)
+-pkglibdir = $(libdir)/$(PACKAGE_NAME)
+-docdir = $(datadir)/doc
+-pkgdocdir = $(docdir)/$(PACKAGE_NAME)
+-includedir = $(prefix)/include
+-pkgincludedir = $(includedir)/$(PACKAGE_NAME)
+-lv2plugindir = $(libdir)/lv2
+-mandir = $(datadir)/man
+-LV2PEG = lv2peg
++CFLAGS := -g -O2
++prefix := /usr/local
++bindir := $(prefix)/bin
++libdir := $(prefix)/lib
++datadir := $(prefix)/share
++pkgdatadir := $(datadir)/$(PACKAGE_NAME)
++pkglibdir := $(libdir)/$(PACKAGE_NAME)
++docdir := $(datadir)/doc
++pkgdocdir := $(docdir)/$(PACKAGE_NAME)
++includedir := $(prefix)/include
++pkgincludedir := $(includedir)/$(PACKAGE_NAME)
++lv2plugindir := $(libdir)/lv2
++mandir := $(datadir)/man
++LV2PEG := lv2peg
+ 
+ # Don't modify any variables below this line
+ SHELL := /bin/bash

Deleted: trunk/overlays/proaudio/media-sound/dino/files/jack_midi_api_fix.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/files/jack_midi_api_fix.diff	2013-03-24 16:24:15 UTC (rev 2579)
+++ trunk/overlays/proaudio/media-sound/dino/files/jack_midi_api_fix.diff	2013-03-24 18:49:35 UTC (rev 2580)
@@ -1,44 +0,0 @@
---- dino-0.2.2/src/libdinoseq/midibuffer.cpp	16 May 2006 23:08:10 -0000	1.4.2.1
-+++ dino-0.2.2/src/libdinoseq/midibuffer.cpp	4 Jul 2007 12:20:14 -0000
-@@ -55,7 +55,7 @@
-     // XXX optimise this
-     jack_nframes_t timestamp = jack_nframes_t((beat - m_start_beat) * 
- 					      60 / (m_bpm * m_samplerate));
--    return jack_midi_event_reserve(m_buffer, timestamp, data_size, m_nframes);
-+    return jack_midi_event_reserve(m_buffer, timestamp, data_size);
-   }
-     
-   
-@@ -65,7 +65,7 @@
-     jack_nframes_t timestamp = jack_nframes_t((beat - m_start_beat) * 
- 					      60 / (m_bpm * m_samplerate));
-     return jack_midi_event_write(m_buffer, timestamp, (jack_midi_data_t*)data, 
--				 data_size, m_nframes);
-+				 data_size);
-   }
- 
- 
---- dino-0.2.2/src/libdinoseq/sequencer.cpp	16 May 2006 23:08:10 -0000	1.58.2.1
-+++ dino-0.2.2/src/libdinoseq/sequencer.cpp	4 Jul 2007 12:20:14 -0000
-@@ -334,10 +334,10 @@
- 	jack_port_t* port = m_output_ports[iter->get_id()];
- 	if (port) {
- 	  void* port_buf = jack_port_get_buffer(port, nframes);
--	  jack_midi_clear_buffer(port_buf, nframes);
-+	  jack_midi_clear_buffer(port_buf);
- 	  unsigned char all_notes_off[] = { 0xB0, 123, 0 };
- 	  if (!m_sent_all_off)
--	    jack_midi_event_write(port_buf, 0, all_notes_off, 3, nframes);
-+	    jack_midi_event_write(port_buf, 0, all_notes_off, 3);
- 	}
- 	m_sent_all_off = true;
-       }
-@@ -361,7 +361,7 @@
-       jack_port_t* port = m_output_ports[iter->get_id()];
-       if (port) {
- 	void* port_buf = jack_port_get_buffer(port, nframes);
--	jack_midi_clear_buffer(port_buf, nframes);
-+	jack_midi_clear_buffer(port_buf);
- 	MIDIBuffer buffer(port_buf, start, pos.beats_per_minute,pos.frame_rate);
- 	buffer.set_period_size(nframes);
- 	buffer.set_cc_resolution(m_cc_resolution * pos.beats_per_minute / 60);

Modified: trunk/overlays/proaudio/media-sound/dino/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/dino/metadata.xml	2013-03-24 16:24:15 UTC (rev 2579)
+++ trunk/overlays/proaudio/media-sound/dino/metadata.xml	2013-03-24 18:49:35 UTC (rev 2580)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>