gentoo resync : 02.05.2018

11 files changed, 16 insertions, 242 deletions

diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index ed317ad10e65..9e8c0c4cb815 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -1,13 +1,6 @@
-AUX stk-4.5.0/010_all_removeForcedFlags.patch 388 BLAKE2B e3e7d911fdc8e09ae936bbbe9896affc53057c0e6affdb7bbb538c47d1899d0c8ae3dea84a52c8f2b46983d48bf17c23627acf18ca812fd2d4c736025d4debd8 SHA512 85c5b5ce8e883257bf78840ac7c7cebf1c4860473b64a16d3363f7bca0749026e1e3dbbcdfe42d78c303ce81901628d627d5464acafac141448bda2c53cb34c8
-AUX stk-4.5.0/020_all_noExamplesOrDemo.patch 1147 BLAKE2B c1a03b94746ee6ae9b69114bf6c0448c511f84ce2a9ceaa3a9384a999e8c730def9e418bfe528097173ec2a1fd00816dad1722529e864481497acf18d3d297f2 SHA512 ffdbd8a5b7eb7d87b7f2828937b7f4ef027da6ce26f050798c24249953d8dccf75a296e99c1fdc01110035c289cf6cc0cd105bbb5d676fb32ff470843cf7aa45
-AUX stk-4.5.0/040_all_sharedliblink.patch 478 BLAKE2B 2e94ca743217a23ae80e86ab521fed8bd7e68dd9f721622f33ba8a476fe9470d5989aeb9c143ea2a1beb57567b7a148135035ebbbb66eadc5a44077b871a543c SHA512 e8bd153b5ce20fc5742b2c3aec2afe022a782afb4c7d34fda1cfa0747fa1cd41eb7f6f66d1c73a901d856057c1813ebb103310df052c3b6a0f36bd2d5bfe4c38
-AUX stk-4.5.0/050_all_cxxflags.patch 425 BLAKE2B 2663594c1d0601dbb06fcdf0dc03a176ae04290893c46c79bd13c990a10cf8b36220bf639559e3b20eb9bea48c9cd56188f59b96fc8d527acb257a5f39d4db50 SHA512 67370a46ebd793a767e7d4ade623b98b9586409c59f7cf45d7b03a55cfc8d23e22755edac9cad8b606b5ad076eb50e96849c66de231fb16bcf0dfe3067070093
-AUX stk-4.5.1/010_all_removeForcedFlags.patch 388 BLAKE2B e3e7d911fdc8e09ae936bbbe9896affc53057c0e6affdb7bbb538c47d1899d0c8ae3dea84a52c8f2b46983d48bf17c23627acf18ca812fd2d4c736025d4debd8 SHA512 85c5b5ce8e883257bf78840ac7c7cebf1c4860473b64a16d3363f7bca0749026e1e3dbbcdfe42d78c303ce81901628d627d5464acafac141448bda2c53cb34c8
-AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1147 BLAKE2B c1a03b94746ee6ae9b69114bf6c0448c511f84ce2a9ceaa3a9384a999e8c730def9e418bfe528097173ec2a1fd00816dad1722529e864481497acf18d3d297f2 SHA512 ffdbd8a5b7eb7d87b7f2828937b7f4ef027da6ce26f050798c24249953d8dccf75a296e99c1fdc01110035c289cf6cc0cd105bbb5d676fb32ff470843cf7aa45
-AUX stk-4.5.1/050_all_cxxflags.patch 425 BLAKE2B 2663594c1d0601dbb06fcdf0dc03a176ae04290893c46c79bd13c990a10cf8b36220bf639559e3b20eb9bea48c9cd56188f59b96fc8d527acb257a5f39d4db50 SHA512 67370a46ebd793a767e7d4ade623b98b9586409c59f7cf45d7b03a55cfc8d23e22755edac9cad8b606b5ad076eb50e96849c66de231fb16bcf0dfe3067070093
-DIST stk-4.5.0.tar.gz 2466803 BLAKE2B 30e73179000a581c66a4e80fa00aaea481675b6779b18ec70619e7767884a23f0aa969c172c737cf2b24927d14c3bb91107750ae07b20e868177eb82c2ce3f9b SHA512 a8a19e171093735052d797ef29a6a287dc6753fa726e451865250364dfd22f43b190aa03498ec94b99f3dc137ef951aa85e2f2f3509c74cedada6eedb5a31785
+AUX stk-4.5.1/010_all_removeForcedFlags.patch 269 BLAKE2B a02fe10d9d3573e063174a096a6a4068b03139ec8b1d1c13097a1309265d53545109ae3a74f81e9b9bb32fefd73b69157037f76f470839b657bfdce10fea3c22 SHA512 7584c52c5e61c1bc8770bd776abe78a43d6a8f6ffcba1f4411c7674766d36220a38051eebd12515fe8d7db2b958d05c38f6940f676ca3aa0041321e81afdd5f4
+AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1029 BLAKE2B 8ea62554a8a609a1365cbaf42cbfedb8fa257fcd531a01bd014cb41da80c98dbec9f74b9f45b400f2aa6a02dcfb3d58662fea4bf8584e760f5d66827f9760db6 SHA512 546851ad25e842b67a2a441e4e4d27295993a1cfeb659a620a6ebfaeb66c9cfe779c8f1ee506bb93a31bfea9687fbd378a881f11e5ffbe182d1d2b0eb478bbc0
+AUX stk-4.5.1/050_all_cxxflags.patch 306 BLAKE2B 58708b9f0aded3069be8150407d877c97406fe941da895c3e7d7ededeccbbdeeb5dc2c10ef5e1a4b262943cdc147b66605764d58876aeb931e73e86fa8474b72 SHA512 36ecc6f6a03b9df258affd92079d3da06a5506a5e53ddc98934c47401c5b6745de7d0cb82b241c0dffda3d3baea9a32a7462292f1079fffba88425158562fa7f
 DIST stk-4.5.1.tar.gz 2413113 BLAKE2B 5eedf936f26acd3e2f377a198b252ee36bcdbb642f0649c0db6c453beb670a1fc725c94af78ff3e075f50068ae6927b628de0174dba598191ed9f9d2f074c17c SHA512 c4c05edfb49b269d5d2518c06abad8e636c4f67a8598f5a03d406bbef04b8b3315d2592d35c8742ce9163b52215ac87b6349c0012e271a43707d109175b6d336
-EBUILD stk-4.5.0.ebuild 1354 BLAKE2B 6d1631c21c35bcbf769daef9bce24cff9330cb0b6c93ce781e6184eb3d10665d9fd58cae8dd12420ddc675d5ef6cc5b9024a15fbf298dcbc6eda5f389c5b0e93 SHA512 48661d2f86451a0883158969f2281ca203d50608e26cc89791e58dde9d94e980430e161671a06179f1b3ed54e5928fd330567cb5e73a0a390e858c6dbb3bcee0
-EBUILD stk-4.5.1-r1.ebuild 1314 BLAKE2B 9ed1380d48460d32eed64bc06a55c985d13a10064e6fe4fa72f5512398903e0cd947a3943690bd0116533dcf5a90967d3a0bcf107a7188d45f45af6fb9e3b4bd SHA512 973015dd06991e2c7afde4e1e4401db27814ab1f26254b0a2b2d1569fdabd80d79437cb685c66ef4b9cc33377cb089db4ae58097a30b8a6bffea51bee65947de
-EBUILD stk-4.5.1.ebuild 1325 BLAKE2B a1a859ca14d2145115020562817be8ad097cd7c32166ace05a363acaca35db1b67bb9a0f4392bb7aac85761cbd0f073727dcbe39beff412fb48dfac573d590cb SHA512 0374e7eee8533cd104f8da4f90c031b5c0362c55543c15c18cd840f26fdf74427849466f0bcc5dc74ad42056b79be0af71f5a5b8706ac5c5a7072f5b1beea51b
+EBUILD stk-4.5.1-r1.ebuild 1286 BLAKE2B 68b49ce06ced817767f6565c3c1f2be47ae32967576280943787f75ffd5778feb8160d79c408a550bf691cae88f8ec4c0998254ef053be4cbb65681d3844cf26 SHA512 357e91ef7db68ba8b9a27eb28581aa15c3341633bad1ed3a4769daa8a5a8cb23b401a7b8edabfeebca225ba58ce52beadfdb3305694de846aaf8d8032032ab90
 MISC metadata.xml 365 BLAKE2B a10b2261fdb56826dfdeb96a89f678dbebd332f99fafe31a5be95ca0db2593b3a14f69b856cda7ca5b3b6edd93f45661118a0c1fa6d6fe2ad7e4c449c579bd9b SHA512 48da9b52d54138bf4d271d39390a78b38641a4accf4f9cff2a0ce4a3954b45805d3a834f5aab0cdd13710e12ec36b5421be6c8a54db8698ae7bcf665c6866012
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
deleted file mode 100644
index 3fcc28fb763c..000000000000
--- a/media-libs/stk/files/stk-4.5.0/010_all_removeForcedFlags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 77d643593b47..000000000000
--- a/media-libs/stk/files/stk-4.5.0/020_all_noExamplesOrDemo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
deleted file mode 100644
index 6f267b79bd67..000000000000
--- a/media-libs/stk/files/stk-4.5.0/040_all_sharedliblink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index d2cc4e5be330..000000000000
--- a/media-libs/stk/files/stk-4.5.0/050_all_cxxflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/stk-4.5.1/010_all_removeForcedFlags.patch b/media-libs/stk/files/stk-4.5.1/010_all_removeForcedFlags.patch
index 3fcc28fb763c..b816f3acae6d 100644
--- a/media-libs/stk/files/stk-4.5.1/010_all_removeForcedFlags.patch
+++ b/media-libs/stk/files/stk-4.5.1/010_all_removeForcedFlags.patch
@@ -1,7 +1,5 @@
-Index: stk-4.4.3/configure.ac
-===================================================================
---- stk-4.4.3.orig/configure.ac
-+++ stk-4.4.3/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -65,7 +65,7 @@ if test "$debug" = "yes"; then
  else
    AC_SUBST( debug, [no] )
diff --git a/media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch b/media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch
index 77d643593b47..59990650b615 100644
--- a/media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch
+++ b/media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch
@@ -1,7 +1,5 @@
-Index: stk-4.5.0/Makefile.in
-===================================================================
---- stk-4.5.0.orig/Makefile.in
-+++ stk-4.5.0/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -6,35 +6,14 @@ REALTIME = @realtime@
  
  all :
diff --git a/media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch b/media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch
index d2cc4e5be330..23defa39d374 100644
--- a/media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch
+++ b/media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch
@@ -1,7 +1,5 @@
-Index: stk-4.5.0/configure.ac
-===================================================================
---- stk-4.5.0.orig/configure.ac
-+++ stk-4.5.0/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -100,7 +100,7 @@ fi
  CPPFLAGS="$CPPFLAGS $cppflag"
  
diff --git a/media-libs/stk/stk-4.5.0.ebuild b/media-libs/stk/stk-4.5.0.ebuild
deleted file mode 100644
index 3a5a9c740d16..000000000000
--- a/media-libs/stk/stk-4.5.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Synthesis ToolKit in C++"
-HOMEPAGE="https://ccrma.stanford.edu/software/stk/"
-SRC_URI="https://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
-}
diff --git a/media-libs/stk/stk-4.5.1-r1.ebuild b/media-libs/stk/stk-4.5.1-r1.ebuild
index 8d6a4005c324..d1f5900803f5 100644
--- a/media-libs/stk/stk-4.5.1-r1.ebuild
+++ b/media-libs/stk/stk-4.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Synthesis ToolKit in C++"
 HOMEPAGE="https://ccrma.stanford.edu/software/stk/"
@@ -20,10 +20,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-lang/perl"
 
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${P}"
-	eapply_user
+PATCHES=(
+	"${FILESDIR}/${P}"
+)
 
+src_prepare() {
+	default
 	eautoreconf
 }
 
diff --git a/media-libs/stk/stk-4.5.1.ebuild b/media-libs/stk/stk-4.5.1.ebuild
deleted file mode 100644
index 72482af91aa0..000000000000
--- a/media-libs/stk/stk-4.5.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Synthesis ToolKit in C++"
-HOMEPAGE="https://ccrma.stanford.edu/software/stk/"
-SRC_URI="https://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
-
-	# install rawwaves
-	insinto /usr/share/stk/rawwaves
-	doins rawwaves/*.raw
-
-	# install docs
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}