Revision: 1675
Author: gentoid
Date: 2010-05-16 10:52:44 +0200 (Sun, 16 May 2010)
Log Message:
-----------
bristol: version bump, cleanup
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/bristol/ChangeLog
trunk/overlays/proaudio/media-sound/bristol/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/bristol/bristol-0.60.3.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/bristol/bristol-0.10.11.ebuild
trunk/overlays/proaudio/media-sound/bristol/bristol-0.30.9.ebuild
trunk/overlays/proaudio/media-sound/bristol/files/
Modified: trunk/overlays/proaudio/media-sound/bristol/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/bristol/ChangeLog 2010-05-15
17:22:20 UTC (rev 1674)
+++ trunk/overlays/proaudio/media-sound/bristol/ChangeLog 2010-05-16
08:52:44 UTC (rev 1675)
@@ -1,7 +1,16 @@
# ChangeLog for media-sound/bristol
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*bristol-0.60.3 (16 May 2010)
+
+ 16 May 2010; Viktor Lazarev <[email protected]>
+ -files/bristol-0.10.1-fix_startBristol.patch, -bristol-0.10.11.ebuild,
+ -bristol-0.30.9.ebuild, +bristol-0.60.3.ebuild, -files/Makefile,
+ -files/build:
+ version bump (from the Portage tree), remove old ebuilds, add X use flag,
+ fix mandir
+
30 Apr 2009; Gavin Pryke <[email protected]> ChangeLog:
~bristol-0.10.11.ebuild, +bristol-0.30.9.ebuild, -bristol-0.10.1.ebuild,
-bristol-0.10.1-r2.ebuild, -bristol-0.20.6.ebuild:
Modified: trunk/overlays/proaudio/media-sound/bristol/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/bristol/Manifest 2010-05-15
17:22:20 UTC (rev 1674)
+++ trunk/overlays/proaudio/media-sound/bristol/Manifest 2010-05-16
08:52:44 UTC (rev 1675)
@@ -1,9 +1,4 @@
-AUX Makefile 3147 RMD160 6cd489ce34f664c6085f3510f666a06019df2a4f SHA1
c284ca3fa9412f9c5f3ee73bf1075e78b78d8691 SHA256
ad492b0068a0ebec81a7ce2f18dc21dd0512e2e8a3ef2eda9d98126d73b79d3d
-AUX bristol-0.10.1-fix_startBristol.patch 246 RMD160
f325aa02a1f973889e96781220ad842f6b63ec76 SHA1
fd09d5ac264f56e35f85d7e55050ede5dd4c512a SHA256
f08e1b122c91e44a58ed9c858ffc66aec6c4acaeda73c7ac08bfaff5ced0437d
-AUX build 4594 RMD160 5364504a7474b55ba0dfddab48a6b1390b00c62f SHA1
15a76b74f2ad7676bcd80a460212b7b8af18344f SHA256
aa1069eb17064386bbfb29bf8b3b57a231b984a7619688a76c154083486759db
-DIST bristol-0.10.11.tar.gz 2651359 RMD160
075b12e4c7f2771682acff665a9ad8ce350aa398 SHA1
340584048df34bfc4b99495b1e73f40e8cad084e SHA256
ba9d8397c9e85c98fdcbadce74f73ba4736c847af4ced00ea53613eae1092620
-DIST bristol-0.30.9.tar.gz 3905925 RMD160
15474485b3579c8fd97169654f456fc9ccbf3577 SHA1
e25996a1961618f8ce18d8c9760059fa1dc7aac8 SHA256
a47b37af6969df790d2945056e12861cbe99ce88ea7081c298e85ed522d790d3
-EBUILD bristol-0.10.11.ebuild 1164 RMD160
68dc59c94f0e448ead4571fee78376b6c0a29331 SHA1
ff849ed7625b618b1e5ea2a6644463a8db69b174 SHA256
6a87ea74ae2346e5be966f9fe703b53d735e06297db6c26edd5c680d607c8e10
-EBUILD bristol-0.30.9.ebuild 1128 RMD160
9427df34b28ce96b54ec9e0d122b15343f6a67b7 SHA1
8f21d2598ef617bb11750d8458151e4f16425549 SHA256
7b929186f884cb99250cbd731e39ab13588a8a1017021933c147310f5b5e543e
-MISC ChangeLog 848 RMD160 e3004cb06c16979bee802ad3dfe85871f9b1dfad SHA1
0a84aafed88213155db79d873deeff85da78ee7f SHA256
af8794f7f44c9e60615fcdfab2cd338d7bdd7a96e8185444b58a5332204de4a7
+DIST bristol-0.60.3.tar.gz 4242741 RMD160
065742869637cca953075e87cddb75c85633cddc SHA1
7d070d3fd7eb7ca523bb8be0969c2fcfa80e8570 SHA256
68d2e64186d8e578c80f83b9914db00cb804b2b288ee3c174be75ac3026637f5
+EBUILD bristol-0.60.3.ebuild 1312 RMD160
2373e33fa6a76b1f818cc406d88d1a3aa539007f SHA1
5bf2fff8d82625b2ec596d3593c2c66ee80cff12 SHA256
cd91395d1672ed6080d6a9c776919b9a0bcb019c7572b2661521fbeb95af8f37
+MISC ChangeLog 1178 RMD160 2944a82ef7a7208d191cdb8084d0e4622a5f7031 SHA1
d0ea5872164f7fadf2385ba71d3e608cb3e8d5db SHA256
634a04316bc627b4354f3b6c1393ce78d97c9cf28f0bda5bf4079f88590d8e04
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Deleted: trunk/overlays/proaudio/media-sound/bristol/bristol-0.10.11.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/bristol/bristol-0.10.11.ebuild
2010-05-15 17:22:20 UTC (rev 1674)
+++ trunk/overlays/proaudio/media-sound/bristol/bristol-0.10.11.ebuild
2010-05-16 08:52:44 UTC (rev 1675)
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-RESTRICT="mirror"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="synthesiser emulation package for Moog, Sequential Circuits,
Hammond and several other keyboards."
-HOMEPAGE="http://sourceforge.net/projects/bristol";
-SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="alsa jack static"
-
-DEPEND="|| ( ( x11-proto/xineramaproto
- x11-proto/xextproto
- x11-proto/xproto )
- virtual/x11 )
- media-libs/alsa-lib
- jack? ( >=media-sound/jack-audio-connection-kit-0.100 )"
-
-src_compile() {
- # Work around the XCreateImage bug on amd64
- local myconf=""
- use amd64 && myconf="--disable-ximage"
-
- econf \
- `use_enable alsa` \
- `use_enable jack` \
- `use_enable static` \
- ${myconf} \
- || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "install failed"
- dodoc ChangeLog AUTHORS README NEWS
-}
-
-pkg_postinst() {
- echo
- elog "To use Bristol with jack, use something like:"
- echo
- elog "startBristol -audio jack"
- echo
-}
Deleted: trunk/overlays/proaudio/media-sound/bristol/bristol-0.30.9.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/bristol/bristol-0.30.9.ebuild
2010-05-15 17:22:20 UTC (rev 1674)
+++ trunk/overlays/proaudio/media-sound/bristol/bristol-0.30.9.ebuild
2010-05-16 08:52:44 UTC (rev 1675)
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-RESTRICT="mirror"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="synthesiser emulation package for Moog, Sequential Circuits,
Hammond and several other keyboards."
-HOMEPAGE="http://sourceforge.net/projects/bristol";
-SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="alsa jack static"
-
-RDEPEND="|| ( ( x11-proto/xineramaproto
- x11-proto/xextproto
- x11-proto/xproto )
- virtual/x11 )
- >=media-libs/alsa-lib-1.0.0
- jack? ( >=media-sound/jack-audio-connection-kit-0.100 )"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- dev-util/pkgconfig"
-
-src_compile() {
- econf \
- `use_enable alsa` \
- `use_enable jack` \
- `use_enable static` \
- ${myconf} \
- || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "install failed"
- dodoc ChangeLog AUTHORS README NEWS
-}
-
-pkg_postinst() {
- echo
- elog "To use Bristol with jack, use something like:"
- echo
- elog "startBristol -audio jack"
- echo
-}
Added: trunk/overlays/proaudio/media-sound/bristol/bristol-0.60.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/bristol/bristol-0.60.3.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/bristol/bristol-0.60.3.ebuild
2010-05-16 08:52:44 UTC (rev 1675)
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:$
+
+inherit eutils
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="http://sourceforge.net/projects/bristol";
+SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa oss X"
+# osc : configure option but no code it seems...
+# jack: fails to build if disabled
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ X? ( x11-libs/libX11 )"
+# osc? ( >=media-libs/liblo-0.22 )
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+ dev-util/pkgconfig"
+
+src_compile() {
+ # fix mandir
+ sed -e "s/ \$(mandir)/ \$(DESTDIR)\$(mandir)/" -i Makefile.am
+ sed -e "s/ \$(mandir)/ \$(DESTDIR)\$(mandir)/" -i Makefile.in
+ #without this option configuration failed if bristol has been already
installed
+ local myconf="${myconf} --disable-version-check"
+ if ! use X; then
+ myconf="${myconf} --disable-x11 --disable-ximage"
+ fi
+ econf \
+ $(use_enable alsa) \
+ $(use_enable oss) \
+ ${myconf} || die "econf failed"
+# $(use_enable osc liblo)
+ emake || die "make failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+ dodoc AUTHORS ChangeLog NEWS README
+}
