commit:     8ca2c50726a58396070e85a12c3aea93095e1032
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 16:34:31 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 16:36:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca2c507

dev-libs/xerces-c: Install samples programs

Package-Manager: portage-2.3.2

 dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch    | 9 ---------
 .../xerces-c/{xerces-c-3.1.4.ebuild => xerces-c-3.1.4-r1.ebuild} | 5 ++++-
 2 files changed, 4 insertions(+), 10 deletions(-)

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
index 8bd8ba1..6b991d2 100644
--- 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
@@ -1,6 +1,5 @@
 * Fix build system when USE="-threads"
 * Add DESTDIR in order to prevent sandbox failure
-* Don't build samples
 
 --- a/configure.ac
 +++ b/configure.ac
@@ -12,14 +11,6 @@
  
  # Checks for library functions.
  #AC_FUNC_ERROR_AT_LINE
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = src tests samples
-+SUBDIRS = src tests
- 
- EXTRA_DIST = version.incl \
-              xerces-c.spec \
 --- a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
 +++ b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
 @@ -5,7 +5,7 @@

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
similarity index 91%
rename from dev-libs/xerces-c/xerces-c-3.1.4.ebuild
rename to dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
index c8782fb..5c5b6b4 100644
--- a/dev-libs/xerces-c/xerces-c-3.1.4.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
@@ -100,7 +100,10 @@ src_install () {
        find "${D}" -name '*.la' -delete || die
 
        if use examples; then
-               rm -f samples/Makefile* || die
+               # clean out object files, executables, Makefiles
+               # and the like before installing examples
+               find samples/ \( -type f -executable -o -iname 'runConfigure' 
-o -iname '*.o' \
+                       -o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf 
'{}' + || die
                docinto examples
                dodoc -r samples/.
                docompress -x /usr/share/doc/${PF}/examples

Reply via email to