-Add "debug" use flag

-Depend on apache-2 and up
Install apache config fragment into correct place
(Portage version: 2.1.4.4)

3 files changed, 18 insertions, 41 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/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"
 }