Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/, dev-libs/xerces-c/files/
Date: Sat, 15 Oct 2016 16:36:23
Message-Id: 1476549364.8ca2c50726a58396070e85a12c3aea93095e1032.soap@gentoo
1 commit: 8ca2c50726a58396070e85a12c3aea93095e1032
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 15 16:34:31 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 15 16:36:04 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca2c507
7
8 dev-libs/xerces-c: Install samples programs
9
10 Package-Manager: portage-2.3.2
11
12 dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch | 9 ---------
13 .../xerces-c/{xerces-c-3.1.4.ebuild => xerces-c-3.1.4-r1.ebuild} | 5 ++++-
14 2 files changed, 4 insertions(+), 10 deletions(-)
15
16 diff --git a/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch b/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch
17 index 8bd8ba1..6b991d2 100644
18 --- a/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch
19 +++ b/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch
20 @@ -1,6 +1,5 @@
21 * Fix build system when USE="-threads"
22 * Add DESTDIR in order to prevent sandbox failure
23 -* Don't build samples
24
25 --- a/configure.ac
26 +++ b/configure.ac
27 @@ -12,14 +11,6 @@
28
29 # Checks for library functions.
30 #AC_FUNC_ERROR_AT_LINE
31 ---- a/Makefile.am
32 -+++ b/Makefile.am
33 -@@ -1,4 +1,4 @@
34 --SUBDIRS = src tests samples
35 -+SUBDIRS = src tests
36 -
37 - EXTRA_DIST = version.incl \
38 - xerces-c.spec \
39 --- a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
40 +++ b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
41 @@ -5,7 +5,7 @@
42
43 diff --git a/dev-libs/xerces-c/xerces-c-3.1.4.ebuild b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
44 similarity index 91%
45 rename from dev-libs/xerces-c/xerces-c-3.1.4.ebuild
46 rename to dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
47 index c8782fb..5c5b6b4 100644
48 --- a/dev-libs/xerces-c/xerces-c-3.1.4.ebuild
49 +++ b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
50 @@ -100,7 +100,10 @@ src_install () {
51 find "${D}" -name '*.la' -delete || die
52
53 if use examples; then
54 - rm -f samples/Makefile* || die
55 + # clean out object files, executables, Makefiles
56 + # and the like before installing examples
57 + find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
58 + -o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
59 docinto examples
60 dodoc -r samples/.
61 docompress -x /usr/share/doc/${PF}/examples