Bump wt-3.3.1 (latest bug fixes from upstream), Bump All Ebuilds EAPI 2->3, Remove legacy unstabilized ebuilds

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 786037A7)

5 files changed, 13 insertions, 247 deletions

diff --git a/net-libs/wt/ChangeLog b/net-libs/wt/ChangeLog
index 4bc879b83c90..c7f33c9ca5f1 100644
--- a/net-libs/wt/ChangeLog
+++ b/net-libs/wt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/wt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/ChangeLog,v 1.24 2013/09/27 05:12:50 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/ChangeLog,v 1.25 2013/11/15 20:28:02 mattm Exp $
+
+*wt-3.3.1 (15 Nov 2013)
+
+  15 Nov 2013; Matthew Marlowe <mattm@gentoo.org> +wt-3.3.1.ebuild,
+  -wt-3.2.0-r1.ebuild, -wt-3.2.3.ebuild, -wt-3.3.0.ebuild,
+  wt-3.2.2_p1-r1.ebuild:
+  Bump wt-3.3.1 (latest bug fixes from upstream), Bump All Ebuilds EAPI 2->3,
+  Remove legacy unstabilized ebuilds
 
 *wt-3.3.0 (27 Sep 2013)
 
diff --git a/net-libs/wt/wt-3.2.0-r1.ebuild b/net-libs/wt/wt-3.2.0-r1.ebuild
deleted file mode 100644
index 9f58a31386ab..000000000000
--- a/net-libs/wt/wt-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/wt-3.2.0-r1.ebuild,v 1.5 2013/07/18 22:14:09 creffett Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="C++ library for developing interactive web applications."
-HOMEPAGE="http://webtoolkit.eu/"
-SRC_URI="mirror://sourceforge/witty/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +extjs fcgi graphicsmagick pdf postgres resources +server ssl +sqlite test zlib"
-
-RDEPEND="
-	>=dev-libs/boost-1.36
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	pdf? ( media-libs/libharu )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	fcgi? (
-		dev-libs/fcgi
-		virtual/httpd-fastcgi
-	)
-	server? (
-		ssl? ( dev-libs/openssl )
-		zlib? ( sys-libs/zlib )
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS="Changelog INSTALL"
-
-pkg_setup() {
-	if use !server && use !fcgi; then
-		ewarn "You have to select at least built-in server support or fcgi support."
-		ewarn "Invalid use flag combination, enable at least one of: server, fcgi"
-	fi
-
-	if use test && use !sqlite; then
-		ewarn "Tests need sqlite, disabling."
-	fi
-}
-
-src_prepare() {
-	# just to be sure
-	rm -rf Wt/Dbo/backend/amalgamation
-
-	# fix png linking
-	if use pdf; then
-		sed -e 's/-lpng12/-lpng/' \
-			-i cmake/WtFindHaru.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDESTDIR="${D}"
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		$(cmake-utils_use test BUILD_TESTS)
-		-DSHARED_LIBS=ON
-		-DMULTI_THREADED=ON
-		-DUSE_SYSTEM_SQLITE3=ON
-		$(cmake-utils_use extjs ENABLE_EXT)
-		$(cmake-utils_use graphicsmagick ENABLE_GM)
-		$(cmake-utils_use pdf ENABLE_HARU)
-		$(cmake-utils_use postgres ENABLE_POSTGRES)
-		$(cmake-utils_use sqlite ENABLE_SQLITE)
-		$(cmake-utils_use fcgi CONNECTOR_FCGI)
-		$(cmake-utils_use server CONNECTOR_HTTP)
-		$(cmake-utils_use ssl WT_WITH_SSL)
-		$(cmake-utils_use zlib HTTP_WITH_ZLIB)
-		-DBUILD_EXAMPLES=OFF
-		$(cmake-utils_use resources INSTALL_RESOURCES)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# Tests need sqlite
-	if use sqlite; then
-		pushd "${CMAKE_BUILD_DIR}" > /dev/null
-		./test/test || die
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dohtml -A pdf,xhtml -r doc/*
-}
-
-pkg_postinst() {
-	if use fcgi; then
-		elog "You selected fcgi support. Please make sure that the web-server"
-		elog "has fcgi support and access to the fcgi socket."
-		elog "You can use spawn-fcgi to spawn the witty-processes and run them"
-		elog "in a chroot environment."
-	fi
-}
diff --git a/net-libs/wt/wt-3.2.2_p1-r1.ebuild b/net-libs/wt/wt-3.2.2_p1-r1.ebuild
index cf0d404dda3c..f02028e332df 100644
--- a/net-libs/wt/wt-3.2.2_p1-r1.ebuild
+++ b/net-libs/wt/wt-3.2.2_p1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.4 2013/09/22 06:44:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/wt-3.2.2_p1-r1.ebuild,v 1.5 2013/11/15 20:28:02 mattm Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit cmake-utils versionator eutils user
 
diff --git a/net-libs/wt/wt-3.2.3.ebuild b/net-libs/wt/wt-3.2.3.ebuild
deleted file mode 100644
index 9d34f77d1e24..000000000000
--- a/net-libs/wt/wt-3.2.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/wt-3.2.3.ebuild,v 1.2 2013/07/18 22:14:09 creffett Exp $
-
-EAPI="2"
-
-inherit cmake-utils versionator eutils user
-
-DESCRIPTION="C++ library for developing interactive web applications."
-MY_P=${P/_/-}
-HOMEPAGE="http://webtoolkit.eu/"
-SRC_URI="mirror://sourceforge/witty/wt/3.2.2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc +extjs fcgi graphicsmagick pdf postgres resources +server ssl +sqlite test zlib"
-
-RDEPEND="
-	>=dev-libs/boost-1.36
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	pdf? ( media-libs/libharu )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	fcgi? (
-		dev-libs/fcgi
-		virtual/httpd-fastcgi
-	)
-	server? (
-		ssl? ( dev-libs/openssl )
-		zlib? ( sys-libs/zlib )
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS="Changelog INSTALL"
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use !server && use !fcgi; then
-		ewarn "You have to select at least built-in server support or fcgi support."
-		ewarn "Invalid use flag combination, enable at least one of: server, fcgi"
-	fi
-
-	if use test && use !sqlite; then
-		ewarn "Tests need sqlite, disabling."
-	fi
-
-	enewgroup wt
-	enewuser wt -1 -1 /var/lib/wt/home wt
-}
-
-src_prepare() {
-	epatch "$FILESDIR/cmakelist.patch"
-
-	# just to be sure
-	rm -rf Wt/Dbo/backend/amalgamation
-
-	# fix png linking
-	if use pdf; then
-		sed -e 's/-lpng12/-lpng/' \
-			-i cmake/WtFindHaru.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	BOOST_PKG="$(best_version ">=dev-libs/boost-1.36.0")"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	BOOST_INC="/usr/include/boost-${BOOST_VER}"
-
-	local mycmakeargs=(
-		-DDESTDIR="${D}"
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		$(cmake-utils_use test BUILD_TESTS)
-		-DSHARED_LIBS=ON
-		-DMULTI_THREADED=ON
-		-DUSE_SYSTEM_SQLITE3=ON
-		-DWEBUSER=wt
-		-DWEBGROUP=wt
-		$(cmake-utils_use extjs ENABLE_EXT)
-		$(cmake-utils_use graphicsmagick ENABLE_GM)
-		$(cmake-utils_use pdf ENABLE_HARU)
-		$(cmake-utils_use postgres ENABLE_POSTGRES)
-		$(cmake-utils_use sqlite ENABLE_SQLITE)
-		$(cmake-utils_use fcgi CONNECTOR_FCGI)
-		$(cmake-utils_use server CONNECTOR_HTTP)
-		$(cmake-utils_use ssl WT_WITH_SSL)
-		$(cmake-utils_use zlib HTTP_WITH_ZLIB)
-		-DBUILD_EXAMPLES=OFF
-		$(cmake-utils_use resources INSTALL_RESOURCES)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# Tests need sqlite
-	if use sqlite; then
-		pushd "${CMAKE_BUILD_DIR}" > /dev/null
-		./test/test || die
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-
-	dodir \
-		/var/lib/wt \
-		/var/lib/wt/home
-
-	cmake-utils_src_install
-
-	use doc && dohtml -A pdf,xhtml -r doc/*
-
-}
-
-pkg_postinst() {
-	if use fcgi; then
-		elog "You selected fcgi support. Please make sure that the web-server"
-		elog "has fcgi support and access to the fcgi socket."
-		elog "You can use spawn-fcgi to spawn the witty-processes and run them"
-		elog "in a chroot environment."
-	fi
-
-	chown -R wt:wt \
-		"${ROOT}"/var/lib/wt
-
-	chmod 0750 \
-		"${ROOT}"/var/lib/wt \
-		"${ROOT}"/var/lib/wt/home
-
-}
diff --git a/net-libs/wt/wt-3.3.0.ebuild b/net-libs/wt/wt-3.3.1.ebuild
index 10f13229178f..d0ba4821803c 100644
--- a/net-libs/wt/wt-3.3.0.ebuild
+++ b/net-libs/wt/wt-3.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/wt-3.3.0.ebuild,v 1.1 2013/09/27 05:12:50 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/wt-3.3.1.ebuild,v 1.1 2013/11/15 20:28:02 mattm Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit cmake-utils versionator eutils user