gentoo resync : 21.12.2017

3 files changed, 71 insertions, 0 deletions

diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index a43037f0147f..f5fc0ef19de2 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,7 +1,9 @@
+AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.20.0.tar.bz2 207948 BLAKE2B 59de02ff82f6a9796fee4680b32acf00ee9eb20b8d2051c04a272fe7ad3d68bdb0de7626b9951217225e2a2c2cfeace7592ad75185c7b0a170fef21a3f4b7eef SHA512 bbc8b9154339cd145a61c5e4613fd31a2e457df8242c55371f3245564d3b23d028a0bc0ffafac393119bb47171b7c735f0c3a55cf5bffc6920ae89aa877240e5
 DIST lilv-0.24.0.tar.bz2 244079 BLAKE2B d94b830b7439d55c2a44d9c20b1ea7938f3fe75bf273adfd4c11a38f29cbb266d5ff5c35c656adb8d7d80f47e1e733650b37467437b487720742b27d93a2d69d SHA512 2a5523385e4cb3876abb49d8cd4eb7b8f95b886d8e9dd3155588a0bef7b5ffd7486501a70cb852d4965592ffe7ef8335d8e46666f519b5214753dd9ae96a1756
 DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
 EBUILD lilv-0.20.0.ebuild 1202 BLAKE2B 73f7f0d02206706482f197c4ae9e55f0b6ad6019d5f9e6926c1f66b18d308cfa324d25683b7eea179a9ef8dc6da279884b817033d1574dbe3765442e51e5cb46 SHA512 b9c60ff6903eb6cbadb2eccff179790294102eb1744cc964c985c1dcd6edb5a9eb9b1015997052d114fc6f5a84324aa4bcf43d2fb8c5fd2aec104d70240b78ab
 EBUILD lilv-0.24.0.ebuild 1213 BLAKE2B 26052c38835583e6d91e25cc1a08d90ad579d6310fa31e63dd5feb870ec2e5f0a58db9a2c68536915ad639ac75106c019fc1de484745c2fc5eb6fcb9832db517 SHA512 38d0463ed4841f97a6ec291507a84b97e698c404d985c275ddbe5bd41446d5cb76f8821b753fdead34063121a945a452b705b86262e8501735b65f7b2bcf189b
+EBUILD lilv-0.24.2-r2.ebuild 1482 BLAKE2B 50e67d1025d19b88cf767549d4dd2e792d01f7964ab6c86bdbb7d674fe6ae429521249ce2d4ae1fffeb354d7ef3808ea617781f7148c1ad61805ac294db6959a SHA512 3f90ec0cdcb34dc55e267307ba6bd080093f7e0a87a7963eb372d7ca988f866ad4e8401561405344e1544bf066b302e9d8ce4c0f0a2fea857b4f1f5aac106259
 EBUILD lilv-0.24.2.ebuild 1219 BLAKE2B fc2801c4b2a283c016db5f2f9fe1e3174b7fac13f8fe7a109db2fef5a5c40a4e5bf18a9476ddd6bbac4e36a291bf49ec75ecefd1d08a2d2b4d84e33a297c8909 SHA512 fcdd8470935eccdb8c09025f33ddc94b7c16ec3369debeef51a78b654f82264fc73259aafda25f74ccebcda1b36a0d19ec65d700e83628396c658545e3eda36a
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/files/includedir.patch b/media-libs/lilv/files/includedir.patch
new file mode 100644
index 000000000000..f20357302b23
--- /dev/null
+++ b/media-libs/lilv/files/includedir.patch
@@ -0,0 +1,11 @@
+--- a/wscript	2017-12-19 20:47:08.288722501 -0600
++++ b/wscript	2017-12-19 20:46:46.932616417 -0600
+@@ -196,7 +196,7 @@
+ 
+ def build(bld):
+     # C/C++ Headers
++    includedir = '${INCLUDEDIR}/lilv'
+-    includedir = '${INCLUDEDIR}/lilv-%s/lilv' % LILV_MAJOR_VERSION
+     bld.install_files(includedir, bld.path.ant_glob('lilv/*.h'))
+     bld.install_files(includedir, bld.path.ant_glob('lilv/*.hpp'))
+ 
diff --git a/media-libs/lilv/lilv-0.24.2-r2.ebuild b/media-libs/lilv/lilv-0.24.2-r2.ebuild
new file mode 100644
index 000000000000..5a595038dcf0
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.2-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+
+RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	epatch "${FILESDIR}/includedir.patch"
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	newbashcomp utils/lilv.bash_completion ${PN}
+}