[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/, profiles/, media-libs/slv2/files/

2020-09-21 Thread Michał Górny
commit: 4d737f71059f621d89cfc63f94ca1355f17c3afb
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 21 14:28:18 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 21 14:28:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d737f71

media-libs/slv2: Remove last-rited pkg

Closes: https://bugs.gentoo.org/735380
Signed-off-by: Michał Górny  gentoo.org>

 media-libs/slv2/Manifest   |  1 -
 media-libs/slv2/files/ldconfig.patch   | 14 --
 media-libs/slv2/files/slv2-0.6.6-python3.patch | 22 -
 .../slv2/files/slv2-0.6.6-raptor2-link.patch   | 23 --
 media-libs/slv2/metadata.xml   |  8 
 media-libs/slv2/slv2-0.6.6-r3.ebuild   | 52 --
 profiles/package.mask  |  6 ---
 7 files changed, 126 deletions(-)

diff --git a/media-libs/slv2/Manifest b/media-libs/slv2/Manifest
deleted file mode 100644
index f24760e9797..000
--- a/media-libs/slv2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST slv2-0.6.6.tar.bz2 170859 BLAKE2B 
167ca7a1b1c27f54e8896874689a8a65c46ad9797d8090651c27f918fd42bc8a0ce83796ef521da1d69e52ca4ea8db5bf194381c888eade60969aeec0d787f83
 SHA512 
b9751b944e4a4d9639fcbfe73cdb31bc4d7f1256c0b1b75f9ab58f5f951767d12a4dd6bb8fc95743de9f6787c663e6815c3e41c025299a4228325d0568b08359

diff --git a/media-libs/slv2/files/ldconfig.patch 
b/media-libs/slv2/files/ldconfig.patch
deleted file mode 100644
index ea0492bd1d3..000
--- a/media-libs/slv2/files/ldconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/autowaf.py b/autowaf.py
-index 4797ea3..f32f994 100644
 a/autowaf.py
-+++ b/autowaf.py
-@@ -375,8 +375,5 @@ def build_version_files(header_path, source_path, domain, 
major, minor, micro):
-   return None
- 
- def shutdown():
--  # This isn't really correct (for packaging), but people asking is 
annoying
--  if Options.commands['install']:
--  try: os.popen("/sbin/ldconfig")
--  except: pass
-+  return
- 

diff --git a/media-libs/slv2/files/slv2-0.6.6-python3.patch 
b/media-libs/slv2/files/slv2-0.6.6-python3.patch
deleted file mode 100644
index 651c761d988..000
--- a/media-libs/slv2/files/slv2-0.6.6-python3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/autowaf.py b/autowaf.py
-index 4797ea3..90db9be 100644
 a/autowaf.py
-+++ b/autowaf.py
-@@ -354,7 +354,7 @@ def build_version_files(header_path, source_path, domain, 
major, minor, micro):
-   o.write(text)
-   o.close()
-   except IOError:
--  print "Could not open", source_path, " for writing\n"
-+  print("Could not open", source_path, " for writing\n")
-   sys.exit(-1)
- 
-   text  = "#ifndef __" + domain + "_version_h__\n"
-@@ -369,7 +369,7 @@ def build_version_files(header_path, source_path, domain, 
major, minor, micro):
-   o.write(text)
-   o.close()
-   except IOError:
--  print "Could not open", header_path, " for writing\n"
-+  print("Could not open", header_path, " for writing\n")
-   sys.exit(-1)
-   
-   return None

diff --git a/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch 
b/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch
deleted file mode 100644
index a6a113a7627..000
--- a/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-To reproduce it run:
-$ LDFLAGS="-Wl,--no-undefined" emerge -1 slv2
-Fixes https://bugs.gentoo.org/371747 by ftrvxmtrx
 slv2-0.6.6.orig/wscript2009-05-26 05:44:51.0 +0200
-+++ slv2-0.6.6/wscript 2014-01-21 00:46:19.890443103 +0100
-@@ -51,6 +51,7 @@
-   autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE', 
atleast_version='1.0', mandatory=True)
-   autowaf.check_pkg(conf, 'redland', uselib_store='REDLAND', 
atleast_version='1.0.6', mandatory=True)
-   autowaf.check_pkg(conf, 'jack', uselib_store='JACK', 
atleast_version='0.107.0', mandatory=False)
-+  autowaf.check_pkg(conf, 'raptor2', uselib_store='RAPTOR2', 
atleast_version='2.0.8', mandatory=True)
-   conf.env.append_value('CCFLAGS', '-std=c99')
-   conf.define('SLV2_VERSION', SLV2_VERSION)
-   conf.write_config_header('slv2-config.h')
-@@ -96,7 +97,8 @@
-   obj.target   = 'slv2'
-   obj.vnum = SLV2_LIB_VERSION
-   obj.install_path = '${LIBDIR}'
--  autowaf.use_lib(bld, obj, 'REDLAND LV2CORE')
-+  obj.lib  = ['dl']
-+  autowaf.use_lib(bld, obj, 'REDLAND LV2CORE RAPTOR2')
- 
-   # Static library (for unit test code coverage)
-   if bld.env['BUILD_TESTS']:

diff --git a/media-libs/slv2/metadata.xml b/media-libs/slv2/metadata.xml
deleted file mode 100644
index f79bb67acbd..000
--- a/media-libs/slv2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-
-   proau.

[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/

2020-01-17 Thread Miroslav Šulc
commit: 8628c183f04fce864fefe671142f135516ec1001
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jan 17 11:01:31 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jan 17 11:01:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8628c183

media-libs/slv2: removed old (0.6.6-r2)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/slv2/slv2-0.6.6-r2.ebuild | 41 
 1 file changed, 41 deletions(-)

diff --git a/media-libs/slv2/slv2-0.6.6-r2.ebuild 
b/media-libs/slv2/slv2-0.6.6-r2.ebuild
deleted file mode 100644
index 39c9070abce..000
--- a/media-libs/slv2/slv2-0.6.6-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-inherit eutils multilib python-any-r1 toolchain-funcs waf-utils
-
-DESCRIPTION="A library to make the use of LV2 plugins as simple as possible 
for applications"
-HOMEPAGE="http://wiki.drobilla.net/SLV2";
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc jack"
-
-RDEPEND=">=dev-libs/redland-1.0.6
-   jack? ( virtual/jack )
-   media-libs/lv2"
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )"
-
-src_prepare() {
-   epatch "${FILESDIR}"/ldconfig.patch
-   epatch "${FILESDIR}"/${P}-raptor2-link.patch
-
-has_version ">=media-libs/lv2-1.16.0" && (sed -i "s/lv2core/lv2/" 
wscript || die "Failed to fix lv2")
-}
-
-src_configure() {
-   waf-utils_src_configure \
-   --prefix=/usr \
-   --libdir=/usr/$(get_libdir) \
-   --htmldir=/usr/share/doc/${PF}/html \
-   $(use doc && echo --build-docs) \
-   $(use jack || echo --no-jack)
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/

2020-01-17 Thread Agostino Sarubbo
commit: 62e7fc25e2b36c58f59ab2ea002cdaa515040655
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 17 10:45:11 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 17 10:45:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e7fc25

media-libs/slv2: x86 stable wrt bug #705622

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/slv2/slv2-0.6.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/slv2/slv2-0.6.6-r3.ebuild 
b/media-libs/slv2/slv2-0.6.6-r3.ebuild
index 46a32e8fcf7..42bc4a47c73 100644
--- a/media-libs/slv2/slv2-0.6.6-r3.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc jack"
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/

2020-01-17 Thread Agostino Sarubbo
commit: e32fcc1c6e0f3d4c6ef8cbd68f3a252e5c81082f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 17 09:29:43 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 17 09:29:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32fcc1c

media-libs/slv2: amd64 stable wrt bug #705622

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/slv2/slv2-0.6.6-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/slv2/slv2-0.6.6-r3.ebuild 
b/media-libs/slv2/slv2-0.6.6-r3.ebuild
index 24cd431efeb..46a32e8fcf7 100644
--- a/media-libs/slv2/slv2-0.6.6-r3.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc jack"
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/files/, media-libs/slv2/

2019-12-14 Thread Miroslav Šulc
commit: c615988140e0113f4b67b63de779db93c22d43f0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Dec 14 17:21:18 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Dec 14 17:21:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6159881

media-libs/slv2-0.6.6-r3: some fixes

1) updated to eapi6
2) organized deps
3) added patch for partial migration to python3
4) rebased ldconfig.patch

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/slv2/files/ldconfig.patch   | 12 +++---
 media-libs/slv2/files/slv2-0.6.6-python3.patch | 22 +++
 media-libs/slv2/slv2-0.6.6-r3.ebuild   | 52 ++
 3 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/media-libs/slv2/files/ldconfig.patch 
b/media-libs/slv2/files/ldconfig.patch
index f53ff9e7df5..ea0492bd1d3 100644
--- a/media-libs/slv2/files/ldconfig.patch
+++ b/media-libs/slv2/files/ldconfig.patch
@@ -1,9 +1,9 @@
-Index: slv2-0.6.2/autowaf.py
-===
 slv2-0.6.2.orig/autowaf.py
-+++ slv2-0.6.2/autowaf.py
-@@ -324,8 +324,5 @@ def build_dox(bld, name, version, srcdir
-   out1.command_is_external = True
+diff --git a/autowaf.py b/autowaf.py
+index 4797ea3..f32f994 100644
+--- a/autowaf.py
 b/autowaf.py
+@@ -375,8 +375,5 @@ def build_version_files(header_path, source_path, domain, 
major, minor, micro):
+   return None
  
  def shutdown():
 -  # This isn't really correct (for packaging), but people asking is 
annoying

diff --git a/media-libs/slv2/files/slv2-0.6.6-python3.patch 
b/media-libs/slv2/files/slv2-0.6.6-python3.patch
new file mode 100644
index 000..651c761d988
--- /dev/null
+++ b/media-libs/slv2/files/slv2-0.6.6-python3.patch
@@ -0,0 +1,22 @@
+diff --git a/autowaf.py b/autowaf.py
+index 4797ea3..90db9be 100644
+--- a/autowaf.py
 b/autowaf.py
+@@ -354,7 +354,7 @@ def build_version_files(header_path, source_path, domain, 
major, minor, micro):
+   o.write(text)
+   o.close()
+   except IOError:
+-  print "Could not open", source_path, " for writing\n"
++  print("Could not open", source_path, " for writing\n")
+   sys.exit(-1)
+ 
+   text  = "#ifndef __" + domain + "_version_h__\n"
+@@ -369,7 +369,7 @@ def build_version_files(header_path, source_path, domain, 
major, minor, micro):
+   o.write(text)
+   o.close()
+   except IOError:
+-  print "Could not open", header_path, " for writing\n"
++  print("Could not open", header_path, " for writing\n")
+   sys.exit(-1)
+   
+   return None

diff --git a/media-libs/slv2/slv2-0.6.6-r3.ebuild 
b/media-libs/slv2/slv2-0.6.6-r3.ebuild
new file mode 100644
index 000..24cd431efeb
--- /dev/null
+++ b/media-libs/slv2/slv2-0.6.6-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+inherit eutils multilib python-any-r1 toolchain-funcs waf-utils
+
+DESCRIPTION="A library to make the use of LV2 plugins as simple as possible 
for applications"
+HOMEPAGE="http://wiki.drobilla.net/SLV2";
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc jack"
+
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )
+"
+CDEPEND="
+   >=dev-libs/redland-1.0.6
+   jack? ( virtual/jack )
+   media-libs/lv2
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+
+PATCHES=(
+   "${FILESDIR}"/ldconfig.patch
+   "${FILESDIR}"/${P}-raptor2-link.patch
+   "${FILESDIR}"/${P}-python3.patch
+)
+
+src_prepare() {
+   default
+has_version ">=media-libs/lv2-1.16.0" && (sed -i "s/lv2core/lv2/" 
wscript || die "Failed to fix lv2")
+}
+
+src_configure() {
+   waf-utils_src_configure \
+   --prefix=/usr \
+   --libdir=/usr/$(get_libdir) \
+   --htmldir=/usr/share/doc/${PF}/html \
+   $(use doc && echo --build-docs) \
+   $(use jack || echo --no-jack)
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/

2019-12-14 Thread Miroslav Šulc
commit: 5bf87b2e25696d2ca45783c028a14a207c1b0112
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Dec 14 16:53:34 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Dec 14 16:53:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf87b2e

media-libs/slv2-0.6.6-r2: fixed configuration against new lv2

>=media-libs/lv2-1.16.0 changed name from lv2core.pc to lv2.pc which
breaks the compilation. did not find a way how to check one pkg or
another one in the wscript so doing the check and patching in the ebuild

Closes: https://bugs.gentoo.org/702912
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/slv2/slv2-0.6.6-r2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/slv2/slv2-0.6.6-r2.ebuild 
b/media-libs/slv2/slv2-0.6.6-r2.ebuild
index a2d0bf16a6d..39c9070abce 100644
--- a/media-libs/slv2/slv2-0.6.6-r2.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
epatch "${FILESDIR}"/ldconfig.patch
epatch "${FILESDIR}"/${P}-raptor2-link.patch
+
+has_version ">=media-libs/lv2-1.16.0" && (sed -i "s/lv2core/lv2/" 
wscript || die "Failed to fix lv2")
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/

2018-08-26 Thread Michał Górny
commit: 81ee54c845fe013e3423dbd06650a03e189fc70b
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug 26 10:47:02 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug 26 11:01:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ee54c8

media-libs/slv2: Remove support for non-existent deps

 media-libs/slv2/slv2-0.6.6-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/slv2/slv2-0.6.6-r2.ebuild 
b/media-libs/slv2/slv2-0.6.6-r2.ebuild
index 73451011681..a2d0bf16a6d 100644
--- a/media-libs/slv2/slv2-0.6.6-r2.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ IUSE="doc jack"
 
 RDEPEND=">=dev-libs/redland-1.0.6
jack? ( virtual/jack )
-   || ( media-libs/lv2 media-libs/lv2core )"
+   media-libs/lv2"
 DEPEND="${RDEPEND}
${PYTHON_DEPS}
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/

2017-05-09 Thread Alexis Ballier
commit: 004f48c18947d3d1c0756f85f88f0e5333695473
Author: Karl Linden  gmail  com>
AuthorDate: Tue May  9 07:43:59 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue May  9 08:17:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=004f48c1

media-libs/slv2: depend on virtual/jack

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-libs/slv2/{slv2-0.6.6-r1.ebuild => slv2-0.6.6-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/slv2/slv2-0.6.6-r1.ebuild 
b/media-libs/slv2/slv2-0.6.6-r2.ebuild
similarity index 94%
rename from media-libs/slv2/slv2-0.6.6-r1.ebuild
rename to media-libs/slv2/slv2-0.6.6-r2.ebuild
index 51df933e730..73451011681 100644
--- a/media-libs/slv2/slv2-0.6.6-r1.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="doc jack"
 
 RDEPEND=">=dev-libs/redland-1.0.6
-   jack? ( >=media-sound/jack-audio-connection-kit-0.107.0 )
+   jack? ( virtual/jack )
|| ( media-libs/lv2 media-libs/lv2core )"
 DEPEND="${RDEPEND}
${PYTHON_DEPS}



[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/

2016-12-20 Thread Tobias Klausmann
commit: a85ec99598101f19e4c692a7acdf1b883671b309
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Dec 20 15:51:19 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Dec 20 15:51:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85ec995

media-libs/slv2-0.6.6-r1: stable on amd64

Gentoo-Bug: 593558

 media-libs/slv2/slv2-0.6.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/slv2/slv2-0.6.6-r1.ebuild 
b/media-libs/slv2/slv2-0.6.6-r1.ebuild
index 183cc66..7a17f3f 100644
--- a/media-libs/slv2/slv2-0.6.6-r1.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc jack"
 
 RDEPEND=">=dev-libs/redland-1.0.6



[gentoo-commits] repo/gentoo:master commit in: media-libs/slv2/, media-libs/slv2/files/

2016-08-27 Thread Sergei Trofimovich
commit: f870df2ea4d29117f5ad843fd0e67305127e95ca
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 27 17:00:40 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 27 17:00:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f870df2e

media-libs/slv2: fix libdl and libraptor2 underlinking, bug #371747

Thanks ftrvxmtrx for the fix!

Reported-by: Diego Elio Pettenò
Bug: https://bugs.gentoo.org/371747

Package-Manager: portage-2.3.0

 .../slv2/files/slv2-0.6.6-raptor2-link.patch   | 23 ++
 media-libs/slv2/slv2-0.6.6-r1.ebuild   |  3 ++-
 media-libs/slv2/slv2-0.6.6.ebuild  |  3 ++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch 
b/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch
new file mode 100644
index ..a6a113a
--- /dev/null
+++ b/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch
@@ -0,0 +1,23 @@
+To reproduce it run:
+$ LDFLAGS="-Wl,--no-undefined" emerge -1 slv2
+Fixes https://bugs.gentoo.org/371747 by ftrvxmtrx
+--- slv2-0.6.6.orig/wscript2009-05-26 05:44:51.0 +0200
 slv2-0.6.6/wscript 2014-01-21 00:46:19.890443103 +0100
+@@ -51,6 +51,7 @@
+   autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE', 
atleast_version='1.0', mandatory=True)
+   autowaf.check_pkg(conf, 'redland', uselib_store='REDLAND', 
atleast_version='1.0.6', mandatory=True)
+   autowaf.check_pkg(conf, 'jack', uselib_store='JACK', 
atleast_version='0.107.0', mandatory=False)
++  autowaf.check_pkg(conf, 'raptor2', uselib_store='RAPTOR2', 
atleast_version='2.0.8', mandatory=True)
+   conf.env.append_value('CCFLAGS', '-std=c99')
+   conf.define('SLV2_VERSION', SLV2_VERSION)
+   conf.write_config_header('slv2-config.h')
+@@ -96,7 +97,8 @@
+   obj.target   = 'slv2'
+   obj.vnum = SLV2_LIB_VERSION
+   obj.install_path = '${LIBDIR}'
+-  autowaf.use_lib(bld, obj, 'REDLAND LV2CORE')
++  obj.lib  = ['dl']
++  autowaf.use_lib(bld, obj, 'REDLAND LV2CORE RAPTOR2')
+ 
+   # Static library (for unit test code coverage)
+   if bld.env['BUILD_TESTS']:

diff --git a/media-libs/slv2/slv2-0.6.6-r1.ebuild 
b/media-libs/slv2/slv2-0.6.6-r1.ebuild
index 97cf5d4..183cc66 100644
--- a/media-libs/slv2/slv2-0.6.6-r1.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
epatch "${FILESDIR}"/ldconfig.patch
+   epatch "${FILESDIR}"/${P}-raptor2-link.patch
 }
 
 src_configure() {

diff --git a/media-libs/slv2/slv2-0.6.6.ebuild 
b/media-libs/slv2/slv2-0.6.6.ebuild
index afd57fe..349e1e5 100644
--- a/media-libs/slv2/slv2-0.6.6.ebuild
+++ b/media-libs/slv2/slv2-0.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,6 +29,7 @@ pkg_setup() {
 
 src_prepare() {
epatch "${FILESDIR}"/ldconfig.patch
+   epatch "${FILESDIR}"/${P}-raptor2-link.patch
 }
 
 src_configure() {