version bump

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

diff --git a/media-libs/stk/ChangeLog b/media-libs/stk/ChangeLog
index 0686d0b958ded15c6de67bd2d1da8aeab5f0ca73..1623e82120208531284b92f4bb6a72ee2fb781bf 100644 (file)
--- a/media-libs/stk/ChangeLog
+++ b/media-libs/stk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/stk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.16 2013/03/17 15:52:47 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.17 2015/03/17 10:47:23 aballier Exp $
+
+*stk-4.5.0 (17 Mar 2015)
+
+  17 Mar 2015; Alexis Ballier <aballier@gentoo.org> +stk-4.5.0.ebuild,
+  +files/stk-4.5.0/010_all_removeForcedFlags.patch,
+  +files/stk-4.5.0/020_all_noExamplesOrDemo.patch,
+  +files/stk-4.5.0/040_all_sharedliblink.patch,
+  +files/stk-4.5.0/050_all_cxxflags.patch:
+  version bump
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml

diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index 490e09a9920318d641c19aec197b6094dfe0f63b..356520815886689623082c2ac5fe68b15e05e71a 100644 (file)
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -6,26 +6,20 @@ AUX stk-4.4.4/020_all_noExamplesOrDemo.patch 1010 SHA256 16c9fed0600dd40e9cc877c
 AUX stk-4.4.4/030_all_sharedlib.patch 416 SHA256 71357937d099f46f8490eacc31376aa22798fa4a7124461f925af178b5eda9ab SHA512 9cf10f17f7d2df0c50b2f61aa6bdc8a15f7410225ec73bbe22a1ddab6c8af82a830cdcb2a80ca765a545f18d097afc7511e54116cbe3ebccee1cbeb77de44a88 WHIRLPOOL 050892ec53dffed47e70c42557920a446a8d0079fbaf8f6c1982205aec4eef833e4427a4a7451efb42e8c2bb5732af98910f370ac5c68923245ab2d5c9852c9d
 AUX stk-4.4.4/040_all_sharedliblink.patch 478 SHA256 01868b98903d3bf4660687dade64d5ccad7f233629be0ff820bac3dc0ae03e3b SHA512 e8bd153b5ce20fc5742b2c3aec2afe022a782afb4c7d34fda1cfa0747fa1cd41eb7f6f66d1c73a901d856057c1813ebb103310df052c3b6a0f36bd2d5bfe4c38 WHIRLPOOL 5edeaf69722d96929d1c37f007d061a1b08e8cca6e3a29cdc3ece5326fa9bed0e72e1d7e09eff009bf0f83efd537e325514b9288a2d5fdda402b431e27dc89ca
 AUX stk-4.4.4/050_all_cxxflags.patch 451 SHA256 3014a5a8f66b1c57f64224eb4abe3d6c5d9852e94c0cd8dd53e5bdee559652c9 SHA512 27567ba29bdc0a4caf781c6ad5ece392f5227353dc55cdccd3505bb0a1d85b96feb6263364ae341bc202fecca1d3d786f95e6d4e13b0f521a7b22a7f56c168a0 WHIRLPOOL 7268aac7e656e58acd9717bcdd11d0bad909542de470438f36ba0f3d7c56d4aedbc24e349ea251d9a1ee958b10428698aa1fa52519cdd2e0e9079910971869bb
+AUX stk-4.5.0/010_all_removeForcedFlags.patch 388 SHA256 a0fafafc33ebbfa34877e797ea5fff118e6fe2a4ea0770199bd0e2d1ebd25864 SHA512 85c5b5ce8e883257bf78840ac7c7cebf1c4860473b64a16d3363f7bca0749026e1e3dbbcdfe42d78c303ce81901628d627d5464acafac141448bda2c53cb34c8 WHIRLPOOL d6dd2cf82222c59797b5417177e7199b860953b1a3b56f8522347ef95a43ce8a559ca5e8682e6f07afa28457a2da5946ea3035f103d4b97cbc99ca7c6861f8a0
+AUX stk-4.5.0/020_all_noExamplesOrDemo.patch 1147 SHA256 d7a91ece63be126ec4e71da8b31761e77522500afe290748121a37c66b1fed74 SHA512 ffdbd8a5b7eb7d87b7f2828937b7f4ef027da6ce26f050798c24249953d8dccf75a296e99c1fdc01110035c289cf6cc0cd105bbb5d676fb32ff470843cf7aa45 WHIRLPOOL 3a150f1f3714b4ccffa9eb87769ce7d3d6ffb59614dd1d6c983f359e55a30c1a3a5f59893847990017382fc8dfba9b322af1e0df07e3c8236fe349e9e7bfcb4d
+AUX stk-4.5.0/040_all_sharedliblink.patch 478 SHA256 01868b98903d3bf4660687dade64d5ccad7f233629be0ff820bac3dc0ae03e3b SHA512 e8bd153b5ce20fc5742b2c3aec2afe022a782afb4c7d34fda1cfa0747fa1cd41eb7f6f66d1c73a901d856057c1813ebb103310df052c3b6a0f36bd2d5bfe4c38 WHIRLPOOL 5edeaf69722d96929d1c37f007d061a1b08e8cca6e3a29cdc3ece5326fa9bed0e72e1d7e09eff009bf0f83efd537e325514b9288a2d5fdda402b431e27dc89ca
+AUX stk-4.5.0/050_all_cxxflags.patch 425 SHA256 7b863e9e55170094ccc9d9786f620a417a23302493a23755b12424cb1cadb209 SHA512 67370a46ebd793a767e7d4ade623b98b9586409c59f7cf45d7b03a55cfc8d23e22755edac9cad8b606b5ad076eb50e96849c66de231fb16bcf0dfe3067070093 WHIRLPOOL 4a66cd114cc5d77344334b3c391e33c8d5a78ede61f28394716213a535c9323c6cf4d1e4e06c08603e8ec5af8f5748673a194a623f3f55d3f693cdcfa4de93e5
 DIST stk-4.4.4.tar.gz 6181713 SHA256 1276986481704f148933d4a2f8eaebb84827124acbd0243e5c8a004fa7c70710 SHA512 e36c43a20e95eb86ed0335ae17df23c1a672562656738496f9e2e5654a825292c4235e04774fcb0356d47a775b7d7af6b4fd63c9d151ab7f2f9195bb5f728e37 WHIRLPOOL 2bfbcfe16dd37e31a0db16603c39e107d0c6a78c667e4597e6dc05243d2edb451acd3f3f7ac1b6698807213f06d11d0982298e13011fed3f5bc814eb4d0cd74d
+DIST stk-4.5.0.tar.gz 2466803 SHA256 619f1a0dee852bb2b2f37730e2632d83b7e0e3ea13b4e8a3166bf11191956ee3 SHA512 a8a19e171093735052d797ef29a6a287dc6753fa726e451865250364dfd22f43b190aa03498ec94b99f3dc137ef951aa85e2f2f3509c74cedada6eedb5a31785 WHIRLPOOL a8bb1b45f3c88d22e6e5b593a0116b5fd1bdfdf7e39cfc479616e34677a98c7c17199ab4d6c15b9aa95841e631f9a49a6a4d1d65afdb9344407f9eaf922bb699
 EBUILD stk-4.4.4-r1.ebuild 1675 SHA256 f6861f5837c957096d6fb4bdec7639816ca503afbcea1b24fcb417216f3ecf0e SHA512 4e3410a81a0820f7b34e05fb349a6bbd21e3a3ad584c28b8c34ea7f044b21122a9b992ed754b5d5c8c0fc87af7e8fbf0a4ff55388821856ce1580fbf2b10a83b WHIRLPOOL 9c084f69d7119b4d977e1ec4f66718f18dbf3b5815d8d6ac21096524295e9e9a22a009f5dc91e9332d33cbdd6f1cf98761c955025cd88669191e087d48767c4d
-MISC ChangeLog 3780 SHA256 0ee7e1780ed2d4841bf891c660fe6820c0da9ff101b5e4169ce9907fe8af19f7 SHA512 cc65781d8dcc69a6c55680cfd4e6b637bd67441625cad87aa3295fd081dffcdcfea783c5e79dae6da37626a13f0080393d5a5dd214ebb6271141318aa5cae420 WHIRLPOOL 5338d1b3ce03ee1206b6f903c3812088eda7117994cf7336b91286a278a85231c0541978ccfbf4eb2d29b51d03b104c40ad090e678e38e1d7a8478030606f5a8
+EBUILD stk-4.5.0.ebuild 1460 SHA256 7d5ab20b8c7d296b61bc42098106fecbe3497fd171d8598bab37860a64b0a04a SHA512 c79040fbe150d5a873e824af9048c9a065360f68e676d005ad4869f56e35549381b79bf7d4de0dc6b5a0cec3a29c398e51eaf0670341c5bbabfac247db390c18 WHIRLPOOL cf263858134730bbb430f371122d83100c2f58b00ead2cc7dbe060251df6d529d0ebd1d9043d06cd65c98a6d0412c91d70131185a68810c801dd33fae437ca2d
+MISC ChangeLog 4087 SHA256 45168076d4169e765c97f55c5f8e2864c2dc50f5748e2094582ea1ed91ef13dc SHA512 28ba9aa367b9f6dd397e66a43d9b1fe64732dc944014b242d7809ef4ebfcac7e3abb3cf17fe6d4d06673fb9eb9d5cd06e9653a021e516e0441bb3862a2b8a9cf WHIRLPOOL 8c59aeae1b4adda1ab57ba9b1f12b196eea8d54b1a53e79626d96eccf00866941078eb8bcd01dd14fda2c78ada187f83dbe7a0aed7d55849ac142f8db2a922c8
 MISC metadata.xml 383 SHA256 b5f48b088a56449857f6272ca22a139e5aceda11f1a3cc1d56d0c616a2bb3e25 SHA512 329f75b43e922506518bc737e2ef86d74d93192e22b51e554223e00f8eef770fb2fd3cad521e83c470c950008b1bc6dd2b08f532a2a0d0d2ce4204fd1bd13359 WHIRLPOOL 46f2684108567c3e2eff91aa0a470256ea344b65f0483bf20a23375fb95de1aebf373357d259e5a74f80b4a8a672ff6cbef67a279553bbc6d7303fedff4ad1a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJRRebQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88gNYP/jnPus2ZrO5n2Ocv8GCOQzFL
-UYb7cxg/+o95mCSenSplNjyw8Et4GvxG4YuO0pKRZJrmXIvw6sQ+pQS9kCg/QLZP
-bWZgXHGh2thswl3JbCMwsN/3dtQb6oW5iei1kG09L+eIyK62BArm4MMqrYjvnXW7
-mLm8zai3KJWx4UCP41tKJKxaOvj75VbFr4SQya7mzNm5GqHRqCYPw422jQDIca46
-PEHexrHyxT1JQ1oniz2PfQquS5j/o3RJdEyZpRHMAQdHVORiFUIiCWDY9jv0eFny
-uy0GJFYYwIhdx59fuRxKYZY5dDora0WEKOhaOrSIyXD5PDuddv7aALhwxbVz/izP
-SGXZ7k991N2OGxf+/qrGxqz/3BaBjsophCMwTeBIDtNf7tVDtoelUvUbhqy1CK6w
-aC5C7DBsrdON9UyKJycqcgmAz8FSKXv8McwPYXpNsm1bU2XgiWilmWwXeBPijWob
-ayNk1vK1vV8hntHSHUD4udRavaP+OaIz5QWu0KnyWnzJfGKoF9axGRWR3PCxRrq3
-OumpwB3YDHdODxeu4/6RyNeETgzXLI4jBslNb0sCgOlFQMURBWKq4o3yea2R1txU
-PCAk1qRpbuMppN4j/Xbxzdq1UxYcR5PGC7L2uusnSpxniPb0faOU6ZcXwfQNaHdR
-+augk34U151Oq71T/d60
-=2SIm
+iEYEAREIAAYFAlUIBjwACgkQvFcC4BYPU0pNggCguhqW1szvClT59hLEOYhOMZCN
+rpgAoMUBqu+BVNKd2DnKdQgO926zKA/n
+=TcUu
 -----END PGP SIGNATURE-----

diff --git a/media-libs/stk/files/stk-4.5.0/010_all_removeForcedFlags.patch b/media-libs/stk/files/stk-4.5.0/010_all_removeForcedFlags.patch
new file mode 100644 (file)
index 0000000..3fcc28f
--- /dev/null
+++ b/media-libs/stk/files/stk-4.5.0/010_all_removeForcedFlags.patch
@@ -0,0 +1,13 @@
+Index: stk-4.4.3/configure.ac
+===================================================================
+--- stk-4.4.3.orig/configure.ac
++++ stk-4.4.3/configure.ac
+@@ -65,7 +65,7 @@ if test "$debug" = "yes"; then
+ else
+   AC_SUBST( debug, [no] )
+   AC_SUBST( cppflag, [] )
+-  AC_SUBST( cxxflag, [-O3] )
++  AC_SUBST( cxxflag, [] )
+   AC_SUBST( object_path, [Release] )
+ fi
+ AC_MSG_RESULT($debug)

diff --git a/media-libs/stk/files/stk-4.5.0/020_all_noExamplesOrDemo.patch b/media-libs/stk/files/stk-4.5.0/020_all_noExamplesOrDemo.patch
new file mode 100644 (file)
index 0000000..77d6435
--- /dev/null
+++ b/media-libs/stk/files/stk-4.5.0/020_all_noExamplesOrDemo.patch
@@ -0,0 +1,40 @@
+Index: stk-4.5.0/Makefile.in
+===================================================================
+--- stk-4.5.0.orig/Makefile.in
++++ stk-4.5.0/Makefile.in
+@@ -6,35 +6,14 @@ REALTIME = @realtime@
+ 
+ all :
+       cd src && $(MAKE)
+-      cd projects/demo && $(MAKE) libdemo
+-ifeq ($(REALTIME),yes)
+-      cd projects/effects && $(MAKE) libeffects
+-      cd projects/ragamatic && $(MAKE) libragamat
+-      cd projects/eguitar && $(MAKE) libeguitar
+-endif
+-      cd projects/examples && $(MAKE) -f libMakefile
+ 
+ clean : 
+       $(RM) -f *~
+       cd src && $(MAKE) clean
+-      cd projects/demo && $(MAKE) clean
+-ifeq ($(REALTIME),yes)
+-      cd projects/effects && $(MAKE) clean
+-      cd projects/ragamatic && $(MAKE) clean
+-      cd projects/eguitar && $(MAKE) clean
+-endif
+-      cd projects/examples && $(MAKE) clean
+ 
+ distclean: clean
+       $(RM) -rf config.log config.status autom4te.cache Makefile
+       cd src && $(MAKE) distclean
+-      cd projects/demo && $(MAKE) distclean
+-ifeq ($(REALTIME),yes)
+-      cd projects/effects && $(MAKE) distclean
+-      cd projects/ragamatic && $(MAKE) distclean
+-      cd projects/eguitar && $(MAKE) distclean
+-endif
+-      cd projects/examples && $(MAKE) distclean
+ 
+ install:
+       $(MAKE) -C src install

diff --git a/media-libs/stk/files/stk-4.5.0/040_all_sharedliblink.patch b/media-libs/stk/files/stk-4.5.0/040_all_sharedliblink.patch
new file mode 100644 (file)
index 0000000..6f267b7
--- /dev/null
+++ b/media-libs/stk/files/stk-4.5.0/040_all_sharedliblink.patch
@@ -0,0 +1,13 @@
+Index: stk-4.4.3/src/Makefile.in
+===================================================================
+--- stk-4.4.3.orig/src/Makefile.in
++++ stk-4.4.3/src/Makefile.in
+@@ -74,7 +74,7 @@ $(SHAREDLIB) : $(OBJECTS)
+       $(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+       $(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
+       $(LN) -s @sharedname@ $(SHAREDLIB)
+-#     $(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
++      $(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
+ 
+ $(OBJECTS) : Stk.h
+ 

diff --git a/media-libs/stk/files/stk-4.5.0/050_all_cxxflags.patch b/media-libs/stk/files/stk-4.5.0/050_all_cxxflags.patch
new file mode 100644 (file)
index 0000000..d2cc4e5
--- /dev/null
+++ b/media-libs/stk/files/stk-4.5.0/050_all_cxxflags.patch
@@ -0,0 +1,13 @@
+Index: stk-4.5.0/configure.ac
+===================================================================
+--- stk-4.5.0.orig/configure.ac
++++ stk-4.5.0/configure.ac
+@@ -100,7 +100,7 @@ fi
+ CPPFLAGS="$CPPFLAGS $cppflag"
+ 
+ # For debugging and optimization ... overwrite default because it has both -g and -O2
+-CXXFLAGS="$cxxflag"
++CXXFLAGS="$CXXFLAGS $cxxflag"
+ 
+ # Check compiler and use -Wall if gnu.
+ if [test $GXX = "yes" ;] then

diff --git a/media-libs/stk/stk-4.5.0.ebuild b/media-libs/stk/stk-4.5.0.ebuild
new file mode 100644 (file)
index 0000000..2f25fb4
--- /dev/null
+++ b/media-libs/stk/stk-4.5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/stk-4.5.0.ebuild,v 1.1 2015/03/17 10:47:23 aballier Exp $
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Synthesis ToolKit in C++"
+HOMEPAGE="http://ccrma.stanford.edu/software/stk/"
+SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc jack oss static-libs"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+       jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       dev-lang/perl"
+
+src_prepare() {
+       EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${P}"
+       eautoreconf
+}
+
+src_configure() {
+       #breaks with --disable-foo...uses as --enable-foo
+       local myconf
+       if use debug; then
+               myconf="${myconf} --enable-debug"
+       fi
+       if use oss; then
+               myconf="${myconf} --with-oss"
+       fi
+       if use alsa; then
+               myconf="${myconf} --with-alsa"
+       fi
+       if use jack; then
+               myconf="${myconf} --with-jack"
+       fi
+
+       econf ${myconf} \
+               --enable-shared \
+               $(use_enable static-libs static) \
+               RAWWAVE_PATH=/usr/share/stk/rawwaves/
+}
+
+src_install() {
+       dodoc README.md
+
+       # install the lib
+       dolib src/libstk.*
+
+       # install headers
+       insinto /usr/include/stk
+       doins include/*.h include/*.msg include/*.tbl
+
+       # install rawwaves
+       insinto /usr/share/stk/rawwaves
+       doins rawwaves/*.raw
+
+       # install docs
+       if use doc; then
+               dohtml -r doc/html/*
+       fi
+}