dev-util/mockpp: Version bump.

svn path=/sunrise/; revision=1136

6 files changed, 167 insertions, 4 deletions

diff --git a/dev-util/mockpp/ChangeLog b/dev-util/mockpp/ChangeLog
index 606e883a9..cd4f3db14 100644
--- a/dev-util/mockpp/ChangeLog
+++ b/dev-util/mockpp/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2006; Tiziano Müller <gentoo@dev-zero.ch>
+  +files/1.13.0-boost_incdir_m4.patch, +mockpp-1.13.0.ebuild,
+  +files/1.13.0-destdir.patch:
+  Version bump
+
   24 Jun 2006; Tiziano Müller <gentoo@dev-zero.ch> ChangeLog:
   New ebuild for bug 85687
 
diff --git a/dev-util/mockpp/Manifest b/dev-util/mockpp/Manifest
index dfb30c859..f725f4753 100644
--- a/dev-util/mockpp/Manifest
+++ b/dev-util/mockpp/Manifest
@@ -6,15 +6,28 @@ AUX 1.11.5-destdir.patch 3289 RMD160 ea1d9ed7b82f466979d139efcb8daef1bc09250e SH
 MD5 23152fb169c5bfca2c7aa4088e5e5522 files/1.11.5-destdir.patch 3289
 RMD160 ea1d9ed7b82f466979d139efcb8daef1bc09250e files/1.11.5-destdir.patch 3289
 SHA256 584d49ddade3ca1d47456e1c6b06f7a99cc006a1f042e312a87896b2db8532fc files/1.11.5-destdir.patch 3289
+AUX 1.13.0-boost_incdir_m4.patch 540 RMD160 79d0157ec107f94f8fab3d6e1637498e92c09c58 SHA1 ee4cd3fb86b02ad453c2821934bffe314fb04564 SHA256 80ec1913e8216249cfb9796b2ac19b63b2e5829851bf4b11ef6d4a01562ddab4
+MD5 dc336da8a91fc3de4dfda2e1e7d89c17 files/1.13.0-boost_incdir_m4.patch 540
+RMD160 79d0157ec107f94f8fab3d6e1637498e92c09c58 files/1.13.0-boost_incdir_m4.patch 540
+SHA256 80ec1913e8216249cfb9796b2ac19b63b2e5829851bf4b11ef6d4a01562ddab4 files/1.13.0-boost_incdir_m4.patch 540
+AUX 1.13.0-destdir.patch 3289 RMD160 ea1d9ed7b82f466979d139efcb8daef1bc09250e SHA1 ed5a85322640d5e6e8469afc14eb639d0b9b174e SHA256 584d49ddade3ca1d47456e1c6b06f7a99cc006a1f042e312a87896b2db8532fc
+MD5 23152fb169c5bfca2c7aa4088e5e5522 files/1.13.0-destdir.patch 3289
+RMD160 ea1d9ed7b82f466979d139efcb8daef1bc09250e files/1.13.0-destdir.patch 3289
+SHA256 584d49ddade3ca1d47456e1c6b06f7a99cc006a1f042e312a87896b2db8532fc files/1.13.0-destdir.patch 3289
 DIST mockpp-1.11.5-src.tar.bz2 678774 RMD160 ebdc90308409a83944c2a4afd0c333dcf88b0d41 SHA1 87cdb0baf2bfbd26ddf5932795444688276d4c0c SHA256 9ad2a177a931418c8b8d3987debe782acbe8cae61c82274a3d3450f7ccf83476
+DIST mockpp-1.13.0-src.tar.bz2 683873 RMD160 8b95e2599781f74e735edebf1e33f133d31598fc SHA1 63418a41b179ff5a160f5e59a0db440775f82bee SHA256 83f6165bb95a3029ca1bb9cdd766eb0129f68c15e63a025d59cf557bb211a082
 EBUILD mockpp-1.11.5.ebuild 1235 RMD160 b983973c4cc9c2630c9e81b89080723a4c7cff17 SHA1 a5f8f0d917bb9d7a2d6d46c263b85b7f6a1395be SHA256 7699635bd438a5e1518298a955d8f3eb3b8eed7380c08e2cc67fa7e71158da99
 MD5 f1775a47c6a08e4e6232b0c9e7e0c2c7 mockpp-1.11.5.ebuild 1235
 RMD160 b983973c4cc9c2630c9e81b89080723a4c7cff17 mockpp-1.11.5.ebuild 1235
 SHA256 7699635bd438a5e1518298a955d8f3eb3b8eed7380c08e2cc67fa7e71158da99 mockpp-1.11.5.ebuild 1235
-MISC ChangeLog 207 RMD160 a2d59aaf3ad32ef3db1d358ee9798a7b2cb4e796 SHA1 f00eb01d1f637d597e03ddc91f11d3e8cc837670 SHA256 19226ca379f0755eb3ba78f8978ebf0e30ba370431ef8e71d7bff4b52311fea9
-MD5 cfb210ded944511d1b69ec70ef47de41 ChangeLog 207
-RMD160 a2d59aaf3ad32ef3db1d358ee9798a7b2cb4e796 ChangeLog 207
-SHA256 19226ca379f0755eb3ba78f8978ebf0e30ba370431ef8e71d7bff4b52311fea9 ChangeLog 207
+EBUILD mockpp-1.13.0.ebuild 1250 RMD160 d39473828ed1006c0a165d9b02947b0fa631e73a SHA1 8544349d377059f4e09aa90c6ff45ba7957baf0a SHA256 05f3de1ec01ab936b0a0c1435b3545cb8f51ba349fb5de7dc651bc9f2de22634
+MD5 2aac3e7b000a66b76a049d553d15ce5e mockpp-1.13.0.ebuild 1250
+RMD160 d39473828ed1006c0a165d9b02947b0fa631e73a mockpp-1.13.0.ebuild 1250
+SHA256 05f3de1ec01ab936b0a0c1435b3545cb8f51ba349fb5de7dc651bc9f2de22634 mockpp-1.13.0.ebuild 1250
+MISC ChangeLog 368 RMD160 4ecb76402c650d01e861e5a098479b5747e0b360 SHA1 c5c9e3cff5182f394101878bdc701d07137aaf5f SHA256 f2a1028b2bc0cd09db4233b9c182d76b70e671c14d3711158e3d91b1eb33355c
+MD5 c73f54a7a3add80f66126a8d23f4052e ChangeLog 368
+RMD160 4ecb76402c650d01e861e5a098479b5747e0b360 ChangeLog 368
+SHA256 f2a1028b2bc0cd09db4233b9c182d76b70e671c14d3711158e3d91b1eb33355c ChangeLog 368
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -22,3 +35,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 8d5471184c8c33d317dc2abab45c8899 files/digest-mockpp-1.11.5 256
 RMD160 853edeb037057ebef84f0133ac4f8b405c6c322e files/digest-mockpp-1.11.5 256
 SHA256 a1e9f1fd34318ae5c5ca5ed56e479dd7caf0875aa0ac4a7a01e8eb6c61005bfb files/digest-mockpp-1.11.5 256
+MD5 253eb1e71d9f3d563a0f91e5d76fe7b7 files/digest-mockpp-1.13.0 256
+RMD160 a81c840f357b8e1ecdcfccd935c216b884ec72a9 files/digest-mockpp-1.13.0 256
+SHA256 312e21552cd1ae0b355b99d5b0effdeaac1bfe8a5fc27653f444df0513af055c files/digest-mockpp-1.13.0 256
diff --git a/dev-util/mockpp/files/1.13.0-boost_incdir_m4.patch b/dev-util/mockpp/files/1.13.0-boost_incdir_m4.patch
new file mode 100644
index 000000000..c84b80b08
--- /dev/null
+++ b/dev-util/mockpp/files/1.13.0-boost_incdir_m4.patch
@@ -0,0 +1,11 @@
+--- mockpp-1.11.5/config/ac_cxx_boosttest.m4	2006-01-01 18:15:43.000000000 +0100
++++ mockpp-1.11.5.new/config/ac_cxx_boosttest.m4	2006-06-24 21:44:44.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ AC_ARG_ENABLE(boostdir, [  --boost-dir             directory where the root of the Boost headers is located], [boostdir=NO])
+ 
+-boost_inc_dirs="/usr/include/boost-* /usr/local/include/boost-*"
++boost_inc_dirs="/usr/include/boost-* /usr/local/include/boost-* /usr/include"
+ if test x$boostdir != xNO; then
+   boost_inc_dirs="$boost_inc_dirs $boostdir"
+ fi
diff --git a/dev-util/mockpp/files/1.13.0-destdir.patch b/dev-util/mockpp/files/1.13.0-destdir.patch
new file mode 100644
index 000000000..caca8ec30
--- /dev/null
+++ b/dev-util/mockpp/files/1.13.0-destdir.patch
@@ -0,0 +1,76 @@
+diff -Naur mockpp-1.11.5/Makefile.am mockpp-1.11.5.new/Makefile.am
+--- mockpp-1.11.5/Makefile.am	2006-04-26 22:01:19.000000000 +0200
++++ mockpp-1.11.5.new/Makefile.am	2006-06-24 21:51:29.000000000 +0200
+@@ -11,12 +11,6 @@
+   mockpp.doxygen.in \
+   mockpp.kdevses \
+   mockpp.kdevelop \
+-  AUTHORS \
+-  COPYING \
+-  ChangeLog \
+-  INSTALL \
+-  README \
+-  TODO \
+   Makefile.cvs \
+   mockpp.lsm \
+   gen_files_N.sh \
+@@ -95,7 +89,5 @@
+ htmldir = $(pkgdatadir)/html
+ 
+ install-data-hook:
+-	$(mkdir_p) $(htmldir)
+-	$(INSTALL) $(srcdir)/AUTHORS $(srcdir)/COPYING $(srcdir)/README $(srcdir)/ChangeLog   $(pkgdatadir)
+ 
+ #################################################################
+diff -Naur mockpp-1.11.5/mockpp/docs/api/Makefile.am mockpp-1.11.5.new/mockpp/docs/api/Makefile.am
+--- mockpp-1.11.5/mockpp/docs/api/Makefile.am	2005-11-19 21:21:24.000000000 +0100
++++ mockpp-1.11.5.new/mockpp/docs/api/Makefile.am	2006-06-24 22:35:12.000000000 +0200
+@@ -52,9 +52,9 @@
+ if DOXYGEN_DOC
+ 
+ install-data-hook: doc
+-	$(mkdir_p)                       $(DESTDIR)$(htmldir)/api-doc
+-	-find html | xargs -n 1 cp -v -t $(DESTDIR)$(htmldir)/api-doc
+-#	$(INSTALL) html/*                $(DESTDIR)$(htmldir)/api-doc
++	$(mkdir_p)                       $(DESTDIR)/$(DOCDIR)/api-doc
++	-find html | xargs -n 1 cp -v -t $(DESTDIR)/$(DOCDIR)/api-doc
++#	$(INSTALL) html/*                $(DESTDIR)/$(DOCDIR)/api-doc
+ 
+ else
+ 
+diff -Naur mockpp-1.11.5/mockpp/docs/en/Makefile.am mockpp-1.11.5.new/mockpp/docs/en/Makefile.am
+--- mockpp-1.11.5/mockpp/docs/en/Makefile.am	2006-04-08 18:49:52.000000000 +0200
++++ mockpp-1.11.5.new/mockpp/docs/en/Makefile.am	2006-06-24 22:36:10.000000000 +0200
+@@ -80,12 +80,12 @@
+ if DOCBOOK_DOC
+ 
+ install-data-hook: doc
+-	$(mkdir_p)                                 $(DESTDIR)$(htmldir)/handbook/common
+-	$(mkdir_p)                                 $(DESTDIR)$(htmldir)/handbook/images/callouts
+-	$(INSTALL) var/*.html                      $(DESTDIR)$(htmldir)/handbook
+-	$(INSTALL) $(srcdir)/common/*.css          $(DESTDIR)$(htmldir)/handbook/common
+-	$(INSTALL) $(srcdir)/images/*.png          $(DESTDIR)$(htmldir)/handbook/images
+-	$(INSTALL) $(srcdir)/images/callouts/*.png $(DESTDIR)$(htmldir)/handbook/images/callouts
++	$(mkdir_p)                                 $(DESTDIR)/$(DOCDIR)/handbook/common
++	$(mkdir_p)                                 $(DESTDIR)/$(DOCDIR)/handbook/images/callouts
++	$(INSTALL) var/*.html                      $(DESTDIR)/$(DOCDIR)/handbook
++	$(INSTALL) $(srcdir)/common/*.css          $(DESTDIR)/$(DOCDIR)/handbook/common
++	$(INSTALL) $(srcdir)/images/*.png          $(DESTDIR)/$(DOCDIR)/handbook/images
++	$(INSTALL) $(srcdir)/images/callouts/*.png $(DESTDIR)/$(DOCDIR)/handbook/images/callouts
+ 
+ else
+ 
+diff -Naur mockpp-1.11.5/mockpp/examples/tutorial/Makefile.am mockpp-1.11.5.new/mockpp/examples/tutorial/Makefile.am
+--- mockpp-1.11.5/mockpp/examples/tutorial/Makefile.am	2005-11-19 20:17:51.000000000 +0100
++++ mockpp-1.11.5.new/mockpp/examples/tutorial/Makefile.am	2006-06-24 22:41:04.000000000 +0200
+@@ -88,8 +88,8 @@
+ if DOXYGEN_DOC
+ 
+ install-data-hook: tutorial
+-	$(mkdir_p) $(htmldir)/tutorial
+-	$(INSTALL) html/* $(htmldir)/tutorial
++	$(mkdir_p) $(DESTDIR)/$(DOCDIR)/tutorial
++	$(INSTALL) html/* $(DESTDIR)/$(DOCDIR)/tutorial
+ 
+ else
+ 
diff --git a/dev-util/mockpp/files/digest-mockpp-1.13.0 b/dev-util/mockpp/files/digest-mockpp-1.13.0
new file mode 100644
index 000000000..229ae4804
--- /dev/null
+++ b/dev-util/mockpp/files/digest-mockpp-1.13.0
@@ -0,0 +1,3 @@
+MD5 c49350974dac92e7762ab18b77c6fe8c mockpp-1.13.0-src.tar.bz2 683873
+RMD160 8b95e2599781f74e735edebf1e33f133d31598fc mockpp-1.13.0-src.tar.bz2 683873
+SHA256 83f6165bb95a3029ca1bb9cdd766eb0129f68c15e63a025d59cf557bb211a082 mockpp-1.13.0-src.tar.bz2 683873
diff --git a/dev-util/mockpp/mockpp-1.13.0.ebuild b/dev-util/mockpp/mockpp-1.13.0.ebuild
new file mode 100644
index 000000000..4d65ab16c
--- /dev/null
+++ b/dev-util/mockpp/mockpp-1.13.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils autotools
+
+DESCRIPTION="mockpp is a platform independent generic unit testing framework for C++."
+HOMEPAGE="http://mockpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="boost cppunit doc"
+
+RDEPEND="cppunit? ( dev-util/cppunit )
+	 boost? ( dev-libs/boost )"
+DEPEND="${RDEPEND}
+	doc? ( 	app-doc/doxygen
+		app-text/docbook-xml-dtd
+		dev-java/fop )"
+
+pkg_setup() {
+	if use boost && use cppunit; then
+		ewarn
+		ewarn "Both boost and cppunit use-flags specified, will use boost"
+		ewarn
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-destdir.patch"
+	epatch "${FILESDIR}/${PV}-boost_incdir_m4.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable cppunit) \
+		$(use_enable boost boosttest) \
+		$(use_enable doc doxygen) \
+		$(use_enable doc docbook) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	# docs get build & installed only if doc use-flag is specified
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install || die "emake install failed"
+	dodoc ChangeLog AUTHORS README TODO
+}