Verbump cppserv to 0.2.14

(Portage version: 2.1.9.46/cvs/Linux x86_64)

3 files changed, 116 insertions, 2 deletions

diff --git a/dev-cpp/cppserv/ChangeLog b/dev-cpp/cppserv/ChangeLog
index 88d7a172cb82..be2dbb4fe8c0 100644
--- a/dev-cpp/cppserv/ChangeLog
+++ b/dev-cpp/cppserv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/cppserv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/ChangeLog,v 1.54 2010/12/21 02:22:41 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/ChangeLog,v 1.55 2011/05/23 14:31:27 iluxa Exp $
+
+*cppserv-0.2.14 (23 May 2011)
+
+  23 May 2011; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+  +cppserv-0.2.14.ebuild, +files/cppserv-0.2.14-asneeded.patch:
+  Verbump to 0.2.14
 
   21 Dec 2010; Markos Chandras <hwoarang@gentoo.org> cppserv-0.2.13.ebuild:
   Stable on amd64 wrt bug #346887
diff --git a/dev-cpp/cppserv/cppserv-0.2.14.ebuild b/dev-cpp/cppserv/cppserv-0.2.14.ebuild
new file mode 100644
index 000000000000..9806dd36488b
--- /dev/null
+++ b/dev-cpp/cppserv/cppserv-0.2.14.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/cppserv-0.2.14.ebuild,v 1.1 2011/05/23 14:31:27 iluxa Exp $
+
+inherit eutils apache-module multilib
+
+DESCRIPTION="CPPSERV is an application server providing Servlet-like API in C++ and a C++ Server Pages parser."
+HOMEPAGE="http://www.total-knowledge.com/progs/cppserv"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~x86"
+IUSE="debug"
+
+APACHE2_MOD_CONF="75_mod_cserv"
+APACHE2_MOD_DEFINE="CPPSERV"
+
+DEPEND="net-libs/socket++
+	>=dev-cpp/sptk-4.11
+	>=dev-libs/apr-1.2
+	dev-libs/boost
+"
+RDEPEND="${DEPEND}"
+
+need_apache2
+
+cppserv_build_flags() {
+	local CPPSERV_DBG_FLAG
+	use debug && CPPSERV_DBG_FLAG="CPPFLAGS=-DMODCSERV_DEBUG"
+	echo PREFIX=/usr LIB=/$(get_libdir) ADON_VERBOSE=1 ADON_BUILD=release APRCFG_PATH=/usr/bin/apr-1-config  ${CPPSERV_DBG_FLAG}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
+src_compile() {
+	emake $(cppserv_build_flags) || die "emake failed. Bug iluxa on #cppserv on irc.freenode.net immediately"
+}
+
+src_install() {
+	emake $(cppserv_build_flags) DESTDIR="${D}" ${CPPSERV_DBG_FLAG} install || die "emake install failed. Bug iluxa on #cppserv on irc.freenode.net immediately"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" || die "internal ebuild error: \"${FILESDIR}/${APACHE2_MOD_CONF}.conf\" not found. Bug iluxa on #cppserv on irc.freenode.net immediately"
+}
+
+src_test() {
+	emake $(cppserv_build_flags) check
+}
diff --git a/dev-cpp/cppserv/files/cppserv-0.2.14-asneeded.patch b/dev-cpp/cppserv/files/cppserv-0.2.14-asneeded.patch
new file mode 100644
index 000000000000..e559ee7f53f8
--- /dev/null
+++ b/dev-cpp/cppserv/files/cppserv-0.2.14-asneeded.patch
@@ -0,0 +1,57 @@
+--- adon-banai/rules.mk
++++ adon-banai/rules.mk
+@@ -253,7 +253,7 @@
+ 	$(Q)touch $$@
+ $(ADON_BUILD)/$(1)/$(2).so: $(ADON_BUILD)/$(2)-dep $(3)
+ 	$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(SHLIB_FLAGS) $$(ADON_LIBFLAGS) \
+-	    $($(2)_SHLIB_FLAGS) $($(2)_LDFLAGS) $(LOCAL_LDADD) -Wl,-soname,$(2).so -shared -o $$@
++	    $($(2)_SHLIB_FLAGS) $($(2)_LDFLAGS) $(LOCAL_LDADD) -Wl,-soname,$(2).so -shared -o $$@ $($(2)_LIBADD)
+ endef
+ 
+ #FIXME: -fPIC is bit non-portable
+@@ -300,7 +300,8 @@
+ $(ADON_BUILD)/$(1)/$(2): $(ADON_BUILD)/$(2)-dep $(3)
+ 	$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(TARGET_LDFLAGS) \
+ 	    $$(TOP_LDFLAGS) $$(ADON_LIBFLAGS) \
+-	    $(LOCAL_LDFLAGS) $($(2)_LDFLAGS) $$(LDFLAGS) -o $$@
++	    $(LOCAL_LDFLAGS) $($(2)_LDFLAGS) $$(LDFLAGS) -o $$@ \
++	    $($(2)_LDADD) 
+ endef
+ 
+ # curdir, progname, instvar
+--- src/cxxsp/parser/Makefile.adon
++++ src/cxxsp/parser/Makefile.adon
+@@ -28,7 +28,7 @@
+ 	csplex.lpp
+ 
+ cxxsp_compile_SOURCES:= cxxsp_compile.cpp
+-cxxsp_compile_LDFLAGS:= -lutil -lcxxsp_parser -ldl -lservlet -lcxxtaglib
++cxxsp_compile_LDADD:= -lutil -lcxxsp_parser -lservlet -lcxxtaglib -ldl
+ cxxsp_compile_DEPS:=libcxxtaglib cxxsp_runtime_taglib
+ 
+ noinst_HEADERS:= \
+--- src/cxxsp/taglib/Makefile.adon
++++ src/cxxsp/taglib/Makefile.adon
+@@ -21,6 +21,6 @@
+ lib_LTLIBRARIES:=libcxxtaglib cxxsp_runtime_taglib
+ libcxxtaglib_SOURCES:=Taglib.cpp CompileTimeTaglib.cpp
+ cxxsp_runtime_taglib_SOURCES:=RunTimeTaglib.cpp
+-cxxsp_runtime_taglib_LDFLAGS:=-lcxxtaglib
++cxxsp_runtime_taglib_LDADD:=-lcxxtaglib
+ cxxsp_runtime_taglib_DEPS:=libcxxtaglib
+ noinst_HEADERS:=RunTimeTaglib.h
+--- src/container/Makefile.adon
++++ src/container/Makefile.adon
+@@ -37,10 +37,10 @@
+	connection.cpp \
+ 	requesthandler.cpp \
+ 	requestlistener.cpp
+-cppserv_LDFLAGS := -lservlet -lsputil4 -lsocket++ -lpthread -ldl -lserverconfig -rdynamic
++cppserv_LDADD := -lservlet -lsputil4 -lsocket++ -lpthread -lserverconfig -ldl -rdynamic
+ cppserv_CPPFLAGS := -I$(ADON_SRC)/include/container
+ cppserv_DEPS:= libservlet libserverconfig
+ 
+ ifeq ($(HAVE_LIBMAGIC),1)
+-cppserv_LDFLAGS+=-lmagic
++cppserv_LDADD+=-lmagic
+ endif