Reworked the patch to operate on the Makefile.in instead the Makefile.am to avoid we need cppunit unconditionally (bug #223175). Added cppunit to DEPEND depending on the 'test' USE-flag.

Package-Manager: portage-2.1.5.4

4 files changed, 37 insertions, 32 deletions

diff --git a/dev-libs/tvmet/ChangeLog b/dev-libs/tvmet/ChangeLog
index 9c6d53f06b74..abe0fe4aca1e 100644
--- a/dev-libs/tvmet/ChangeLog
+++ b/dev-libs/tvmet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/tvmet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvmet/ChangeLog,v 1.1 2008/03/23 12:09:45 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvmet/ChangeLog,v 1.2 2008/06/07 15:11:49 dev-zero Exp $
+
+  07 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  files/1.7.2-docs_missing_destdir.patch, tvmet-1.7.2.ebuild:
+  Reworked the patch to operate on the Makefile.in instead the Makefile.am
+  to avoid we need cppunit unconditionally (bug #223175). Added cppunit to
+  DEPEND depending on the 'test' USE-flag.
 
 *tvmet-1.7.2 (23 Mar 2008)
 
diff --git a/dev-libs/tvmet/Manifest b/dev-libs/tvmet/Manifest
index a07610e11959..da17770d7a6d 100644
--- a/dev-libs/tvmet/Manifest
+++ b/dev-libs/tvmet/Manifest
@@ -1,5 +1,5 @@
-AUX 1.7.2-docs_missing_destdir.patch 1057 RMD160 4a47d459f436bfbefb80a49dc9ee1740da3f60d8 SHA1 db12f0b0f18dc63a2bdc9e7f03ad89b596cc43d9 SHA256 218d7359cd440ff81d2252f921340b4dffca8eba29a36edaca481041f8967271
+AUX 1.7.2-docs_missing_destdir.patch 1437 RMD160 ffeb20b9bf2c88c444de4c2916f3c7a11dfc436e SHA1 33e649c70657b14a6198965d46006273629a6491 SHA256 e5001eb1c60c61a55edc6f122e62bd8033a09f9580579293e168255d08cddfe1
 DIST tvmet-1.7.2.tar.bz2 532599 RMD160 f777cfe42e221d3cb09172dfb4de67b360cb0acd SHA1 aea83958968cce70e9b9cd9ed34b83019be8f619 SHA256 ca4a1e72afb70ca34bbd7cb0500a159003f5c270903f1b303af48a883dbe13ae
-EBUILD tvmet-1.7.2.ebuild 1037 RMD160 ba4a577fea46cdfcc673112b7a600df9a7892f70 SHA1 0496331096b4dd55ec2c911d7f266102e4e1ffa0 SHA256 810326e8c410526ed287a682b857f2db7f7c55517736a51a6481fad9adee1543
-MISC ChangeLog 406 RMD160 ae4d5ca1f93beeb7e6f8306ffe857341e7e0c4b5 SHA1 bbb023202ab1e85827aa3b41b2bfae8d2a479350 SHA256 8485de0d3278a881595edcf52a9ad44eacd631a9900233934a549a127a650efe
+EBUILD tvmet-1.7.2.ebuild 1023 RMD160 8225d14df05469c6399e7474909d9b776ad6efdc SHA1 d3a931be9d21fc03207940767373504ca4549fe4 SHA256 4774072d261062dae4dea75493372c0f06b23c198067e94a2dc4471e92bf0a00
+MISC ChangeLog 715 RMD160 41bf69a3b080095ab2e441fd674dbf323c68130e SHA1 869fa895155b2946df6e010699039714c609ff82 SHA256 ed518c5ac3ece74f5e03801af04d396ac18893857a3302c579d4942160aba788
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
diff --git a/dev-libs/tvmet/files/1.7.2-docs_missing_destdir.patch b/dev-libs/tvmet/files/1.7.2-docs_missing_destdir.patch
index 34e057b2a900..d591677b99c4 100644
--- a/dev-libs/tvmet/files/1.7.2-docs_missing_destdir.patch
+++ b/dev-libs/tvmet/files/1.7.2-docs_missing_destdir.patch
@@ -1,29 +1,29 @@
---- doc/Makefile.am.orig	2008-03-17 14:42:52.000000000 +0100
-+++ doc/Makefile.am	2008-03-17 14:44:14.000000000 +0100
-@@ -186,20 +186,20 @@
+--- tvmet-1.7.2.orig/doc/Makefile.in	2007-06-23 18:00:27.000000000 +0200
++++ tvmet-1.7.2/doc/Makefile.in	2008-06-07 16:47:29.000000000 +0200
+@@ -667,20 +680,20 @@
  # Automake's "distcheck" is sensitive to having files left over
  # after "make uninstall", so we have to clean up the install hook.
- uninstall-local:
--	@if test -d $(TVMET_DOC_DIR); then \
--		rm -rf $(TVMET_DOC_DIR); \
-+	@if test -d $(DESTDIR)/$(TVMET_DOC_DIR)/html; then \
-+		rm -rf $(DESTDIR)/$(TVMET_DOC_DIR)/html; \
- 	fi
+ @CONFIG_DOC_TRUE@uninstall-local:
+-@CONFIG_DOC_TRUE@	@if test -d $(TVMET_DOC_DIR); then \
+-@CONFIG_DOC_TRUE@		rm -rf $(TVMET_DOC_DIR); \
++@CONFIG_DOC_TRUE@	@if test -d $(DESTDIR)/$(TVMET_DOC_DIR)/html; then \
++@CONFIG_DOC_TRUE@		rm -rf $(DESTDIR)/$(TVMET_DOC_DIR)/html; \
+ @CONFIG_DOC_TRUE@	fi
  
  # Install hooks
- make-install-dirs:
--	@if test '!' -d $(TVMET_DOC_DIR); then \
--		$(mkinstalldirs) $(TVMET_DOC_DIR); \
-+	@if test '!' -d $(DESTDIR)/$(TVMET_DOC_DIR)/html; then \
-+		$(mkinstalldirs) $(DESTDIR)/$(TVMET_DOC_DIR)/html; \
- 	fi
+ @CONFIG_DOC_TRUE@make-install-dirs:
+-@CONFIG_DOC_TRUE@	@if test '!' -d $(TVMET_DOC_DIR); then \
+-@CONFIG_DOC_TRUE@		$(mkinstalldirs) $(TVMET_DOC_DIR); \
++@CONFIG_DOC_TRUE@	@if test '!' -d $(DESTDIR)/$(TVMET_DOC_DIR)/html; then \
++@CONFIG_DOC_TRUE@		$(mkinstalldirs) $(DESTDIR)/$(TVMET_DOC_DIR)/html; \
+ @CONFIG_DOC_TRUE@	fi
  
- install-data-hook: make-install-dirs
--	@echo Installing documentations into $(TVMET_DOC_DIR)
-+	@echo Installing documentations into $(DESTDIR)/$(TVMET_DOC_DIR)/html
- 	@echo "install html"
--	@$(INSTALL_DATA) @top_builddir@/doc/html/* $(TVMET_DOC_DIR)
-+	@$(INSTALL_DATA) @top_builddir@/doc/html/* $(DESTDIR)/$(TVMET_DOC_DIR)/html
+ @CONFIG_DOC_TRUE@install-data-hook: make-install-dirs
+-@CONFIG_DOC_TRUE@	@echo Installing documentations into $(TVMET_DOC_DIR)
++@CONFIG_DOC_TRUE@	@echo Installing documentations into $(DESTDIR)/$(TVMET_DOC_DIR)/html
+ @CONFIG_DOC_TRUE@	@echo "install html"
+-@CONFIG_DOC_TRUE@	@$(INSTALL_DATA) @top_builddir@/doc/html/* $(TVMET_DOC_DIR)
++@CONFIG_DOC_TRUE@	@$(INSTALL_DATA) @top_builddir@/doc/html/* $(DESTDIR)/$(TVMET_DOC_DIR)/html
  
- else
- doc-dist:
+ @CONFIG_DOC_FALSE@doc-dist:
+ @CONFIG_DOC_FALSE@install-data-hook:
diff --git a/dev-libs/tvmet/tvmet-1.7.2.ebuild b/dev-libs/tvmet/tvmet-1.7.2.ebuild
index 0d0b957ab88f..21cbb7cf3604 100644
--- a/dev-libs/tvmet/tvmet-1.7.2.ebuild
+++ b/dev-libs/tvmet/tvmet-1.7.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvmet/tvmet-1.7.2.ebuild,v 1.1 2008/03/23 12:09:45 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvmet/tvmet-1.7.2.ebuild,v 1.2 2008/06/07 15:11:49 dev-zero Exp $
 
-inherit autotools eutils
+inherit eutils
 
 DESCRIPTION="Tiny Vector Matrix library using Expression Templates"
 HOMEPAGE="http://tvmet.sourceforge.net/"
@@ -12,7 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc test"
 
-DEPEND="doc? ( app-doc/doxygen )"
+DEPEND="doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )"
 RDEPEND=""
 
 src_unpack() {
@@ -24,8 +25,6 @@ src_unpack() {
 	sed -i \
 		-e 's|^GENERATE_LATEX.*|GENERATE_LATEX = NO|' \
 		doc/Doxyfile.in || die "sed failed"
-
-	AT_M4DIR="config" eautoreconf
 }
 
 src_compile() {