summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Marlowe <mattm@gentoo.org>2012-10-02 19:27:44 +0000
committerMatthew Marlowe <mattm@gentoo.org>2012-10-02 19:27:44 +0000
commited31fe569a502c5a6efaa264c0af1d6462356be0 (patch)
tree7a98b12bfefed3f030f90758483de3198570f6d7 /net-libs
parentkeyword ~mips, bug #434036 (diff)
downloadgentoo-2-ed31fe569a502c5a6efaa264c0af1d6462356be0.tar.gz
gentoo-2-ed31fe569a502c5a6efaa264c0af1d6462356be0.tar.bz2
gentoo-2-ed31fe569a502c5a6efaa264c0af1d6462356be0.zip
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.
(Portage version: 2.1.11.23/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/wt/ChangeLog11
-rw-r--r--net-libs/wt/files/cmakelist.patch5
-rw-r--r--net-libs/wt/wt-3.2.2_p1-r1.ebuild (renamed from net-libs/wt/wt-3.2.2_p1.ebuild)20
3 files changed, 23 insertions, 13 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/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
}