-Add "debug" use flag

-Depend on apache-2 and up
Install apache config fragment into correct place
Package-Manager: portage-2.1.4.4

4 files changed, 20 insertions, 45 deletions

diff --git a/dev-cpp/cppserv/ChangeLog b/dev-cpp/cppserv/ChangeLog
index ad315e285d54..1ad9a06e9744 100644
--- a/dev-cpp/cppserv/ChangeLog
+++ b/dev-cpp/cppserv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/cppserv
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/ChangeLog,v 1.14 2008/01/13 09:50:55 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/ChangeLog,v 1.15 2008/03/01 20:33:21 iluxa Exp $
+
+  01 Mar 2008; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+  cppserv-0.1.103.ebuild:
+  Add "debug" use flag. Depend on apache-2 and up. Install apache config
+  fragment into correct place.
 
 *cppserv-0.1.103 (13 Jan 2008)
 
diff --git a/dev-cpp/cppserv/Manifest b/dev-cpp/cppserv/Manifest
index 0ad0357f63e9..f77607028d35 100644
--- a/dev-cpp/cppserv/Manifest
+++ b/dev-cpp/cppserv/Manifest
@@ -1,7 +1,5 @@
 AUX 75_mod_cserv.conf 231 RMD160 8e0e799a476d4d2cba3ccc992eb3687b17e9f127 SHA1 a35f3196ff880de9f196e01a407db52c61ced631 SHA256 86b338abda5d6966bfc885030c18132e78e3fc2b69d09b1901cf54e309552474
-DIST cppserv-0.1.102.tar.bz2 132099 RMD160 d81353eb2bced4598824fee88c4142b898a7f272 SHA1 bf7f9c6b7cbd2e29387c7d822efe3a38f1d5ca13 SHA256 77144533cb73341b9532e1c6cbf362ceca511d31d2c4a672bf6a4d27f51a1291
 DIST cppserv-0.1.103.tar.bz2 134503 RMD160 6583895eef6dedbdf00abc1e29c4a3864b6b3e66 SHA1 4e75366f9c29e1e0baa02e628e909768156b4555 SHA256 381dc5ebf528dd0a3a9e8dc22ecc9187cf9e94ede2cad19af763c0f3c01fd409
-EBUILD cppserv-0.1.102.ebuild 1061 RMD160 8e7f15b9a96005acb958753db5c82f1178243338 SHA1 f0c40cda53bacbc3c64a4fd558cd8b0de344dd38 SHA256 55436fb7b511f02d909ace8c274a223574e2b774d682cf8e72939e2b15cd3457
-EBUILD cppserv-0.1.103.ebuild 1061 RMD160 cd5b12b82b10a7abe3ebd8f03772424479df89b2 SHA1 a395c46d3d6e192620b8dca4fd79c8a30687f869 SHA256 d39ca92fed7ed8ef883d7ab3ef41f3bed7abcbc82290d031e4b300a303601b0b
-MISC ChangeLog 2506 RMD160 3c30add37db33cc445779d2da907080f866cb26c SHA1 4928e71811fb47b24ba2fff93ead18b7e1194bca SHA256 6fea402a3bf238e0223b91afd219e504842bc6f4e8e33480b2bc553dc67f3782
+EBUILD cppserv-0.1.103.ebuild 1286 RMD160 adc824336fd5862721ca4ec245b8b7b31a177770 SHA1 c0144df6b95e544090d4739b0056a28cc2dddbc5 SHA256 9bbdf981adac39631ecfd5a2f683429cc02d16b340439c7c45fb1ade14dda2c2
+MISC ChangeLog 2697 RMD160 107deec1747d9b16813dd702b7d57a288cecdae1 SHA1 72b685661dff9b173f8838bb079e6b5521712f35 SHA256 98a799914aa027892e91c17c4ad314ef2b8dcfbcc69772a619554803d8a70f5a
 MISC metadata.xml 600 RMD160 c9f6bc48b1a249bc45694ead1bce81ae4884e20b SHA1 82c78fe487e15395dac82d6b120ba4a8dd02c32a SHA256 c782d5a3513f3575a8b5795171f5e9507858b36ec6321d9e698432d96c219837
diff --git a/dev-cpp/cppserv/cppserv-0.1.102.ebuild b/dev-cpp/cppserv/cppserv-0.1.102.ebuild
deleted file mode 100644
index c1bfbad2c148..000000000000
--- a/dev-cpp/cppserv/cppserv-0.1.102.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/cppserv-0.1.102.ebuild,v 1.2 2008/01/13 09:50:55 iluxa Exp $
-
-inherit eutils apache-module
-
-DESCRIPTION="CPPSERV is an application server providing Servlet-like API in C++, as well as CSP (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 ~x86 ~mips ~amd64"
-IUSE=""
-
-APACHE2_MOD_CONF="75_mod_cserv"
-
-DEPEND="net-libs/socket++
-	>=dev-cpp/sptk-3.5.6
-	=www-servers/apache-2.0*
-	dev-libs/boost
-"
-
-need_apache2
-
-src_compile() {
-	emake PREFIX=/usr ADON_VERBOSE=1 ADON_BUILD=release || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX=/usr ADON_BUILD=release DESTDIR="${D}" install || die "emake install failed"
-	insinto "${APACHE2_MODULES_CONFDIR}"
-	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" || die "internal ebuild error: \"${FILESDIR}/${APACHE2_MOD_CONF}.conf\" not found"
-}
diff --git a/dev-cpp/cppserv/cppserv-0.1.103.ebuild b/dev-cpp/cppserv/cppserv-0.1.103.ebuild
index 2978ce491fcb..4e45292392bb 100644
--- a/dev-cpp/cppserv/cppserv-0.1.103.ebuild
+++ b/dev-cpp/cppserv/cppserv-0.1.103.ebuild
@@ -1,33 +1,38 @@
 # Copyright 2008-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/cppserv-0.1.103.ebuild,v 1.1 2008/01/13 09:50:55 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/cppserv-0.1.103.ebuild,v 1.2 2008/03/01 20:33:21 iluxa Exp $
 
 inherit eutils apache-module
 
-DESCRIPTION="CPPSERV is an application server providing Servlet-like API in C++, as well as CSP (C++ Server Pages) parser."
+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 ~x86 ~mips ~amd64"
-IUSE=""
+IUSE="debug"
 
 APACHE2_MOD_CONF="75_mod_cserv"
+APACHE2_MOD_DEFINE="CPPSERV"
 
 DEPEND="net-libs/socket++
 	>=dev-cpp/sptk-3.5.6
-	=www-servers/apache-2.0*
+	>=www-servers/apache-2
 	dev-libs/boost
 "
 
 need_apache2
 
 src_compile() {
-	emake PREFIX=/usr ADON_VERBOSE=1 ADON_BUILD=release || die "emake failed"
+	local CPPSERV_DBG_FLAG
+	use debug && CPPSERV_DBG_FLAG="CPPFLAGS=-DMODCSERV_DEBUG"
+	emake PREFIX=/usr ADON_VERBOSE=1 ADON_BUILD=release ${CPPSERV_DBG_FLAG} || die "emake failed"
 }
 
 src_install() {
-	emake PREFIX=/usr ADON_BUILD=release DESTDIR="${D}" install || die "emake install failed"
-	insinto "${APACHE2_MODULES_CONFDIR}"
+	local CPPSERV_DBG_FLAG
+	use debug && CPPSERV_DBG_FLAG="CPPFLAGS=-DMODCSERV_DEBUG"
+	emake PREFIX=/usr ADON_BUILD=release DESTDIR="${D}" ${CPPSERV_DBG_FLAG} install || die "emake install failed"
+	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" || die "internal ebuild error: \"${FILESDIR}/${APACHE2_MOD_CONF}.conf\" not found"
 }