Glory, glory, hallelujah! All praise the r1 revision of 3.2.2 and attached patch in ${FILESDIR} as they truly seemed to resolved a bug in the upstream cmakefile that was causing major qa issues. Committing now and may we all live happily ever after.

Package-Manager: portage-2.1.11.23/cvs/Linux x86_64

4 files changed, 33 insertions, 22 deletions

diff --git a/net-libs/wt/ChangeLog b/net-libs/wt/ChangeLog
index 1826f7d6bbed..c3142467c601 100644
--- a/net-libs/wt/ChangeLog
+++ b/net-libs/wt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/wt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/ChangeLog,v 1.17 2012/10/02 14:20:35 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/ChangeLog,v 1.18 2012/10/02 19:27:44 mattm Exp $
+
+*wt-3.2.2_p1-r1 (02 Oct 2012)
+
+  02 Oct 2012; Matthew Marlowe <mattm@gentoo.org> +files/cmakelist.patch,
+  +wt-3.2.2_p1-r1.ebuild, -wt-3.2.2_p1.ebuild:
+  Glory, glory, hallelujah!  All praise the r1 revision of 3.2.2 and attached
+  patch in ${FILESDIR} as they truly seemed to resolved a bug in the upstream
+  cmakefile that was causing major qa issues.  Committing now and may we all
+  live happily ever after.
 
   02 Oct 2012; Matthew Marlowe <mattm@gentoo.org> wt-3.2.2_p1.ebuild:
   Added another reference to DESTDIR in cmake args.
diff --git a/net-libs/wt/Manifest b/net-libs/wt/Manifest
index e72b5200676d..c7b6d1477b89 100644
--- a/net-libs/wt/Manifest
+++ b/net-libs/wt/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cmakelist.patch 325 SHA256 a6edf1aa6bc44f73a1dc8c8dff41312f5ea90f061b511e8e65d0b4e3134a8a7a SHA512 dcab00789ff537c76ba40a4610bbe2957b6cb1c6404299d5f14dfac366d87afbbc05fdd6b3f73525b1749c0893204213560dbcfb688414264ea4a47829432481 WHIRLPOOL c1627ea7ba639bff58f021e4177717fc03e4ea18ac73b760f4996ea495698366db16a6f8432b5ba9681b46a196a9827acd67927dd7c73be3fe1d2cd744b2d26a
 AUX wt-fix-automagic.patch 8672 SHA256 991db3f4c7ff8715828f7f24c0d6ac6b5629da5380e6036e75d81244823aba70 SHA512 6591e3af9032c948b047c0ac1ca16b3b6731e866ec5037d2a969fa18a5431643b3f6917666435dbec599559101b6b71c562d2cf9f5974888c47ccb8392217164 WHIRLPOOL b6d8fc251935970c135b23869577eecbf27e4d4b65114909ddee6847da8a96d52d658f5de5f6a39a4f99b8bb5bd112004b22a5cabc093a7e5fa3d41c365a7bd3
 DIST wt-3.2.0.tar.gz 17781351 SHA256 b461073096e1284bde6900392fee776fd50da048294073cb2e1e6ab5c024ec56 SHA512 d6df3cd3f0bdacf5d460b03573b3a54485a8dc23d9bc401afc15902c08c17c9b8a10d45e40bbe14e8b023497476ee8d2765776b96f08fa0aa12e5f6a8a102d14 WHIRLPOOL 33554f53a6e6493bc43f6bb69ef4f9445865cdb142dec22d428bb5ae2f06dbfa4c563788e095bdccbead681b0e4aef431c7537a2592178d0799a4d803b651534
 DIST wt-3.2.2-p1.tar.gz 17312758 SHA256 1610b1950eda3614a12e915f5968d7b8659eb17231622681c9a1eafc586c8f05 SHA512 4ffce2ab65fc8286a9d54194cdd4efaa521245f78fa6cce9b24694611cbf392b7d8072e02c8d75115f40594893086c5646ec3926f2e8c8e404369bdd30df0164 WHIRLPOOL 48d2cd14866a510350cec6afce18466abaa9cc12af8b55bc6986ca89fbd5f8998b1ce328cac0b706b06fc497e4580d444cfd64e0553d72e90573cc3aa9558d93
 EBUILD wt-3.2.0-r1.ebuild 2551 SHA256 45733b2d07023fbb985085ceb3c3aea3551adf82c6b26a4746afcb91fc5b7a62 SHA512 017833ebef3c8710394c7afb30803a4879e0845faa90fe33b7d13488930ad60936241e78bdaf32c03a22de5ee9dded90b27853afc4926b0698c195bb6c29106e WHIRLPOOL 4d3a3d95fbdbe3a60bb51c79aefa0e8acebc841ef42e078d3ebdd253cb9e68763a3a27676a97218746441df7b5fb20bd0d8ac8b41b09818c9e284a9e312f8fbe
-EBUILD wt-3.2.2_p1.ebuild 3228 SHA256 f9f6b8af2ad2b22adc9a65e90b970e94ce3ba0043ccafb80bf32b396bb33e4be SHA512 1129efd339fccf8d9a85c6b9ac6bc28c6e6c5fb024669501b669cbe2623c95bfe14eff67b13c26f63c96d240a380c464eea4f370f74cabab0cdd369da85c5b80 WHIRLPOOL 5b8385e29c368a3feb0bf5af99bf99fb0a1a458eb22ab5ddd9d7a307bf6874bcfdeed1525cfca82d783e626f0d0c453acfe744e9d577e5b9d681b510fa57117d
-MISC ChangeLog 3546 SHA256 30f5a58a9718c846385f9b42fec36a743ac744bdd5fb722123d32a826024c970 SHA512 e8ebd7f198331bbe3913f07e1a462137518965d82488b717acae0d69586539a8b13c0252118e5b2286c38240b596c70dad92194d3b3d6034cd516f6eb694e698 WHIRLPOOL 564802d14633f974aba464390e83f3d6fe84aa213f18ed48f1ccfb6f235ffad164c92d337f84ca308374e204054ee58263486be26c83eba4710d73c06ad3673b
+EBUILD wt-3.2.2_p1-r1.ebuild 3140 SHA256 de177312cf0ea850b55beb3294e068f78c1fa78dfb93c1a8c44761502d453f32 SHA512 6a3424be23b2b0b09ddec53db953f853816d175b967d626a5b2e91a47391f332a3f33c82d072c3fb442ece51d212fbc7d118e03b7cff44753b111e1022d65c13 WHIRLPOOL ff1586dd3cda232399e87d83d911bf89d585ea5621f14f598a85e4b2bec342d6763bb99438b77264a226b4ae95aa1e0a0574e7755815d4485f3d0bb89b848da8
+MISC ChangeLog 3959 SHA256 f6364ff7452a76a86bd1efcc0e752e8a8dc1b2a2b71f031cc1d77a10a796a804 SHA512 39c3b7e5fd6d246c2f3a3d841bc8633e5aa125e706364bbea1648b2180de118c6a9a42071e23336e15dc794d1158654664eb3cf23b4bdd95a8714fc7832d10a4 WHIRLPOOL ab0cd970f8016d21c04b4388c02b6866986ba206213ac81f6fa326525a940c1d79143d1122270dfca96be884a2ebc68ee5ec50d44739a8d05058b5e80e1fa84b
 MISC metadata.xml 659 SHA256 d9b27ad5d75e6e1f82062eb4c261e1d4a1f447339487c0cd5523d8bff267d224 SHA512 d6edeba32e15e4d8b92570e655f5205266f62d2922b49c4beac055ce4a095f611a2cf487759d58cd7985704a21a5274061336dc56890e2f9344205f0866cd87d WHIRLPOOL bd64a339f9609ba280c92c0a0349601ead9e75de0cfb03edb95d6103ce33d9871aff57a58f161bd3dd5c5aadcecbe06fe8c10f3d6fc807e8b800c834d788f9ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQavg5AAoJEC1LWXx4YDen/AcH/jqI6aJZWYdMse44kiBwp6mi
-62mt1cVcjuoqtmgKNNUKDfwPPRbvgyNeDUJwTzX4Wp8WYPnFvq0GgjLhz7MxgaVC
-yz+ud9BHbWbZKDYibGqZigQsVgaxvwQVJOGQD4Lvbxt/Znsyh8PjkMwHaqUcT39B
-nSy1WEA8ntUi5v027YQ64kHv9PIeHiVluFaVTiJ4mTZhdsL+nrrhS+fr1j1E4Op5
-DUtqsg1YM7J+kTi2lxCO9V5/14RScqmGac6KCTPOCLz+gCDNfsBGatbVLBR2hS2A
-fjGtqhVY5KUWic2gKenu+v5rICrOrQ8Jprq9VPEtmlYbaHgItyvFKPyagVqq2Mk=
-=ZIgO
+iQEcBAEBCAAGBQJQa0A2AAoJEC1LWXx4YDenO+QIAKmKfE8kuGEckQ432d4cs521
+FUp7GO1B0+t7xxFDoOmHhdQqL0F+rTKsDW53uX7NYm5TSyGWA9zGp0eKKyh82HcK
+HkGvhJ48IFucmAxZDig1ajwxE0MMxi0mORi2IEfXWEcFNpWRZKNzWNKBbCYtO0BN
+b9d6xC6JfbQLzIpuv304mtL4JBAMNYapNGnCN9otyRcius64kYhcXib3TnE30ccH
+91yK/sm1x1O2ql22JBq1DM2yivd16D8njop8ZHlttI1ZQ4NZgotibSVgotz7+SlL
+LMhG9l6MhhDCKVmVP1pLRlXHAlz0sFj8Qk3L4R0MDoUM9vLpmrXaVtnxkK+N0o8=
+=I/2y
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wt/files/cmakelist.patch b/net-libs/wt/files/cmakelist.patch
new file mode 100644
index 000000000000..a121d00ff9cc
--- /dev/null
+++ b/net-libs/wt/files/cmakelist.patch
@@ -0,0 +1,5 @@
+--- CMakeLists.txt	2012-07-04 00:50:36.000000000 -0700
++++ CMakeLists-new	2012-10-02 11:25:05.860077447 -0700
+@@ -451 +451 @@ IF(NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_
+-  INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${DESTDIR}${CONFIGDIR})
++  INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
diff --git a/net-libs/wt/wt-3.2.2_p1.ebuild b/net-libs/wt/wt-3.2.2_p1-r1.ebuild
index 9a3b25dbda02..1a508f286e9b 100644
--- a/net-libs/wt/wt-3.2.2_p1.ebuild
+++ b/net-libs/wt/wt-3.2.2_p1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/wt-3.2.2_p1.ebuild,v 1.6 2012/10/02 14:20:35 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/wt-3.2.2_p1-r1.ebuild,v 1.1 2012/10/02 19:27:44 mattm Exp $
 
 EAPI="2"
 
-inherit cmake-utils versionator
+inherit cmake-utils versionator eutils
 
 DESCRIPTION="C++ library for developing interactive web applications."
 MY_P=${P/_/-}
@@ -51,6 +51,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "$FILESDIR/cmakelist.patch"
+
 	# just to be sure
 	rm -rf Wt/Dbo/backend/amalgamation
 
@@ -107,11 +109,9 @@ src_install() {
 
 	dodir \
 		/var/lib/wt \
-		/var/lib/wt/home \
-		/etc/wt \
-		/var/run/wt
+		/var/lib/wt/home
 
-	cmake-utils_src_install DESTDIR="${D}"
+	cmake-utils_src_install
 
 	use doc && dohtml -A pdf,xhtml -r doc/*
 
@@ -126,14 +126,10 @@ pkg_postinst() {
 	fi
 
 	chown -R wt:wt \
-		"${ROOT}"/var/lib/wt \
-		"${ROOT}"/var/run/wt \
-		"${ROOT}"/etc/wt
+		"${ROOT}"/var/lib/wt
 
 	chmod 0750 \
 		"${ROOT}"/var/lib/wt \
-		"${ROOT}"/var/lib/wt/home \
-		"${ROOT}"/var/run/wt \
-		"${ROOT}"/etc/wt
+		"${ROOT}"/var/lib/wt/home
 
 }