Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/lilv/, media-libs/lilv/files/
Date: Sun, 02 Aug 2020 10:54:53
Message-Id: 1596365681.2f5e9433321a219e0b85dba00f211d0ee17d59f1.fordfrog@gentoo
1 commit: 2f5e9433321a219e0b85dba00f211d0ee17d59f1
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 2 09:06:04 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 2 10:54:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5e9433
7
8 media-libs/lilv: removed patch that changes include dir
9
10 the patch was used in 2017 to make gst-plugins-lv2 compile
11 but the issue with it was that it modified the include path
12 but it did not update the .pc file which caused include files
13 not found. up to that, it seems the patch is not needed anymore.
14
15 Package-Manager: Portage-3.0.1, Repoman-2.3.23
16 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
17
18 media-libs/lilv/files/includedir.patch | 11 -----------
19 media-libs/lilv/{lilv-0.24.6.ebuild => lilv-0.24.6-r1.ebuild} | 0
20 media-libs/lilv/{lilv-0.24.8.ebuild => lilv-0.24.8-r1.ebuild} | 2 --
21 3 files changed, 13 deletions(-)
22
23 diff --git a/media-libs/lilv/files/includedir.patch b/media-libs/lilv/files/includedir.patch
24 deleted file mode 100644
25 index f20357302b2..00000000000
26 --- a/media-libs/lilv/files/includedir.patch
27 +++ /dev/null
28 @@ -1,11 +0,0 @@
29 ---- a/wscript 2017-12-19 20:47:08.288722501 -0600
30 -+++ b/wscript 2017-12-19 20:46:46.932616417 -0600
31 -@@ -196,7 +196,7 @@
32 -
33 - def build(bld):
34 - # C/C++ Headers
35 -+ includedir = '${INCLUDEDIR}/lilv'
36 -- includedir = '${INCLUDEDIR}/lilv-%s/lilv' % LILV_MAJOR_VERSION
37 - bld.install_files(includedir, bld.path.ant_glob('lilv/*.h'))
38 - bld.install_files(includedir, bld.path.ant_glob('lilv/*.hpp'))
39 -
40
41 diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6-r1.ebuild
42 similarity index 100%
43 rename from media-libs/lilv/lilv-0.24.6.ebuild
44 rename to media-libs/lilv/lilv-0.24.6-r1.ebuild
45
46 diff --git a/media-libs/lilv/lilv-0.24.8.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild
47 similarity index 97%
48 rename from media-libs/lilv/lilv-0.24.8.ebuild
49 rename to media-libs/lilv/lilv-0.24.8-r1.ebuild
50 index 698ee9385c5..9478c738d16 100644
51 --- a/media-libs/lilv/lilv-0.24.8.ebuild
52 +++ b/media-libs/lilv/lilv-0.24.8-r1.ebuild
53 @@ -33,8 +33,6 @@ DEPEND="
54 test? ( dev-python/unittest2 )
55 "
56
57 -PATCHES=( "${FILESDIR}/includedir.patch" )
58 -
59 src_prepare() {
60 default
61 sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die