Verbump cppserv to 0.2.14

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

4 files changed, 120 insertions, 13 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/Manifest b/dev-cpp/cppserv/Manifest
index 31aaccf8702c..19daa500bcec 100644
--- a/dev-cpp/cppserv/Manifest
+++ b/dev-cpp/cppserv/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 75_mod_cserv.conf 231 RMD160 8e0e799a476d4d2cba3ccc992eb3687b17e9f127 SHA1 a35f3196ff880de9f196e01a407db52c61ced631 SHA256 86b338abda5d6966bfc885030c18132e78e3fc2b69d09b1901cf54e309552474
 AUX cppserv-0.2.13-asneeded.patch 2079 RMD160 a1ab2a5b68f8dbaaf21d058caca9c8108a49c1f2 SHA1 95e8ccac30815cbdfed6ecd75ef21b5476a30155 SHA256 f3245c13452c1ab92011bbbfea8b5ddc5c3060ecbd8f085650c2e77b0956b407
 AUX cppserv-0.2.13-glibc-212.patch 256 RMD160 2201766345850b7a6fa407a4ba649c3a8a4a72c2 SHA1 71e432b24a3a54e6527a991dd389a7126b5d64d3 SHA256 3ae3e8673e0f3b908cd67872fcaa0d507e49fa9c4a9d39fbebfe485f81283dee
+AUX cppserv-0.2.14-asneeded.patch 2119 RMD160 8fa09e5dd286683c3e7aeaf28f3ef76ffb06a9fc SHA1 093df4a52398f07e2fc5f54404f16b0cab1c1390 SHA256 eb911bf8c39fe5f4a09af9ee1e153a6cfb1d1d0ab23aa9a2f886819ee8138a6d
 DIST cppserv-0.1.119.tar.bz2 130753 RMD160 3e8fab59a0a1db47346ff974b8f0b920fa12f75d SHA1 47e6ce9675a18b411bf65e57cebba857187ef0c6 SHA256 3892b0d2320b1b002d128ffd9abd88cbce53b0e576b9c0f025dc066f6845c2a5
 DIST cppserv-0.2.13.tar.bz2 140435 RMD160 9adc00a1e9661d0908fa7f5b129a7f1eb6ba00b6 SHA1 6fa3600d398520fd8d104b94620ba5ddf6489eb6 SHA256 1ab0920ec74e709736209f0c595867964552ddc37538fc1b90f1b5e1499ad000
+DIST cppserv-0.2.14.tar.bz2 143006 RMD160 38cf8ba26a81c5fa2ac19cfa48a4abbd05ad3e6b SHA1 3b983a93c50aeb9c188e780d214c224129572117 SHA256 263875d0718282678567f24eae7e2f641f3303998dcb06de3d5f73ff2bd0ff98
 EBUILD cppserv-0.1.119.ebuild 1576 RMD160 f77b41fd31ba0a17f523f786912734522fdbb6dd SHA1 5543289201a90ee9e918436daeeb9d0b360213f8 SHA256 a27298d76a16f60745cc402d31b9434ba8dd01902661b2f3ecec6f14c84bfecc
 EBUILD cppserv-0.2.13.ebuild 1668 RMD160 7b1e600c81ad2fb372d903931e7c155abd3d4450 SHA1 0106cfc1736688db99dc7a1b02415e9ba10a0365 SHA256 05f1deea96d66ae628e314cfa4c79a36293cfc35aff84b6d98dd7ae91ece84d8
-MISC ChangeLog 9113 RMD160 51819755e8b1cffc382ee3458b779fec6de3444d SHA1 adf23af01a0abe3d930a6cc29176c7b77a11aaf5 SHA256 1d49773d14398e126a133b281f8ff807ffee8b0e521ff812ea127a0c293f5a8d
+EBUILD cppserv-0.2.14.ebuild 1629 RMD160 248c704ff6118e8f1f62dbf96c7dfb6aab694e9c SHA1 f34a08fe9cef7e4ddd9d76392d89bc89c39e5531 SHA256 06b7a74ed70c0ba620ccb04ae66a273076fbae7e198ce590085d96689b390ba5
+MISC ChangeLog 9286 RMD160 3d019f697745742ab60fca651ea8a14d92cc0083 SHA1 8887b3c876847ca2cea8f4991e6edd9c0d30381c SHA256 ce77b5e884ce945375836ee7099a158154bec0bf2edc7d32620ac8a1b3b2b4dd
 MISC metadata.xml 600 RMD160 c9f6bc48b1a249bc45694ead1bce81ae4884e20b SHA1 82c78fe487e15395dac82d6b120ba4a8dd02c32a SHA256 c782d5a3513f3575a8b5795171f5e9507858b36ec6321d9e698432d96c219837
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0QHQIACgkQ9/cejkQaxBDpoQCcCjynMF3JYfZArBfQWbSbTYla
-e1oAnRj+cBRln/LLHQw2fDQfOiKrYNoS
-=YedF
------END PGP SIGNATURE-----
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