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/libnjb/, media-libs/libnjb/files/
Date: Fri, 01 Jul 2022 11:02:31
Message-Id: 1656673341.dfe769d276aa9f6092ff70c146e2b848d9de9e9b.fordfrog@gentoo
1 commit: dfe769d276aa9f6092ff70c146e2b848d9de9e9b
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 1 11:02:21 2022 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 1 11:02:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe769d2
7
8 media-libs/libnjb: fixed doc installation path
9
10 Closes: https://bugs.gentoo.org/854813
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch | 13 +++++++++++++
14 .../{libnjb-2.2.7-r1.ebuild => libnjb-2.2.7-r2.ebuild} | 5 ++++-
15 2 files changed, 17 insertions(+), 1 deletion(-)
16
17 diff --git a/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch b/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch
18 new file mode 100644
19 index 000000000000..efa6825e7473
20 --- /dev/null
21 +++ b/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch
22 @@ -0,0 +1,13 @@
23 +diff --git a/doc/Makefile.in b/doc/Makefile.in
24 +index 5a9b1bb..3e25fb5 100644
25 +--- a/doc/Makefile.in
26 ++++ b/doc/Makefile.in
27 +@@ -169,7 +169,7 @@ top_build_prefix = @top_build_prefix@
28 + top_builddir = @top_builddir@
29 + top_srcdir = @top_srcdir@
30 + EXTRA_DIST = Doxyfile.in examples.h mainpage.h
31 +-@HAVE_DOXYGEN_TRUE@pkgdocdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
32 ++@HAVE_DOXYGEN_TRUE@pkgdocdir = $(docdir)
33 + @HAVE_DOXYGEN_TRUE@htmldocdir = $(pkgdocdir)/html
34 + all: all-am
35 +
36
37 diff --git a/media-libs/libnjb/libnjb-2.2.7-r1.ebuild b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
38 similarity index 90%
39 rename from media-libs/libnjb/libnjb-2.2.7-r1.ebuild
40 rename to media-libs/libnjb/libnjb-2.2.7-r2.ebuild
41 index 2f593d538544..5673ca924821 100644
42 --- a/media-libs/libnjb/libnjb-2.2.7-r1.ebuild
43 +++ b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
44 @@ -18,7 +18,10 @@ RDEPEND="virtual/libusb:0"
45 DEPEND="${RDEPEND}
46 doc? ( app-doc/doxygen )"
47
48 -PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch )
49 +PATCHES=(
50 + "${FILESDIR}"/${P}-exclude-samples.patch
51 + "${FILESDIR}"/${P}-fix-docdir.patch
52 +)
53
54 src_prepare() {
55 default