replaced hardcoding of apache path

4 files changed, 104 insertions, 118 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index bff43e53e262..b81719458c3d 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,41 +1,44 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.13 2002/09/14 17:27:40 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.14 2002/11/15 01:07:22 vapier Exp $
 
 *kdevelop-2.1.3-r1 (11 Sep 2002)
 
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
   14 Sep 2002; Owen Stampflee <owen@gentoo.org> :
   Added PPC to KEYWORDS.
 
   11 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
-
   Fix bug #5839 - bad configure.in files in the templates of the various qt
   projects which didn't work with autoconf 2.5x.
 
   23 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
-
   Enforce make -j1 (single thread) to fix bug #6199.
 
 *kdevelop-2.1.3 (19 Aug 2002)
 
-  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
 
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
   New bugfix release that comes with KDE 3.0.3.
 
   13 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
-
   Fix for installing outside the kde prefix: should use $PREFIX not $KDEDIR.
 
 *kdevelop-2.1.2 (03 Jul 2002)
 
-  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
 
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
   New stability release (comes with kde 3.0.2).
 
 *kdevelop-2.1.1-r1 (06 Jun 2002)
 
   06 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog:
-  
   Add some long-requested items: the c/cpp reference package,
   a precompiled kdelibs documentation package (from the kde cvs
   of somewhere in late May) and a premade htdig configuration file
@@ -45,41 +48,34 @@
 *kdevelop-2.1.1 (24 May 2002)
 
   24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog:
-
   Bugfix release distributed with kde 3.0.1.
   
   24 Apr; Dan Armak <danarmak@gentoo.org> changelog:
-  
   replaced glimpse dependency with htdig again, since glimpse's license
   is limited to educational purposes.
 
 *kdevelop-2.1-r2 (23 Apr 2002)
 
   23 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog:
-  
   Changed K-menu item for kdevelop to include the WANT_AUTOMAKE_1_4=1
   and WANT_AUTOCONF_2_5=1 exports needed for kde3 Makefile.dist autoconf stage
 
 *kdevelop-2.1-r1 (17 Apr 2002)
 
   17 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog:
-  
   Replaced htdig dep with glimpse (for documentation indexing). Glimpse works
   ou-of-the-box, while htdig requires manual configuration.
 
   4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog:
-  
   Updated kdoc dependencies to point to the new dev-util/kdoc.
 
   7 Mar 2002; Dan Armak <danarmak@gentoo.org> Changelog:
-  
   Changed qt-docs dependency from >=... to =...*. This makes sure that the qt-docs
   installed is from qt-2.x. This fixes bug #947.
 
 *kdevelop-2.0.2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/dev-util/kdevelop/kdevelop-2.1.2.ebuild b/dev-util/kdevelop/kdevelop-2.1.2.ebuild
index 4012edb5eb5f..9356cafdcb74 100644
--- a/dev-util/kdevelop/kdevelop-2.1.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.2.ebuild,v 1.12 2002/10/04 20:58:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.2.ebuild,v 1.13 2002/11/15 01:06:15 vapier Exp $
 
 inherit kde-base
 need-kde 3
@@ -15,7 +15,6 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	mirror://gentoo/c_cpp_reference-1.0.tar.gz
 	mirror://gentoo/kdelibs-kdevelop-docs-3.0.1.tar.bz2"
 
-
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
@@ -36,44 +35,42 @@ newdepend ">=kde-base/kdebase-3
 # -j2 and greater fails - see bug #6199
 export MAKEOPTS="$MAKEOPTS -j1"
 
-src_unpack() {
-    base_src_unpack
-    cd ${S}/kdevelop
-    for x in *.desktop; do
-	mv $x $x.2
-	sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
-	rm $x.2
-    done
+APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
 
+src_unpack() {
+	base_src_unpack
+	cd ${S}/kdevelop
+	for x in *.desktop; do
+		mv $x $x.2
+		sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
+		rm $x.2
+	done
 }
 
 src_install() {
+	kde_src_install
+
+	# setup htdig for use with kdevelop out-of-the-box (sort of)
+	sed -e "s:_KDEDIR_:${PREFIX}:g" \
+	 -e "s:/home/httpd/htdocs:${APACHE_ROOT}:" \
+		${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
+	dodir ${PREFIX}/share/apps/kdevelop/htdig/db
 
-    kde_src_install
-    
-    # setup htdig for use with kdevelop out-of-the-box (sort of)
-    sed -e "s:_KDEDIR_:${PREFIX}:g" ${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
-    dodir ${PREFIX}/share/apps/kdevelop/htdig/db
-    
-    # kdelibs documentation - pregenerated so we don't need kdelibs sources etc
-    cp -r ${WORKDIR}/KDE-Documentation ${D}/${PREFIX}/share/apps/kdevelop/
-    
-    # c/cpp reference package
-    dodir ${PREFIX}/share/doc/HTML/en/kdevelop/reference
-    cp -r ${WORKDIR}/c_cpp_reference-1.0/reference/{C,CPLUSPLUS,GRAPHICS} ${D}/${PREFIX}/share/doc/HTML/en/kdevelop/reference/
+	# kdelibs documentation - pregenerated so we don't need kdelibs sources etc
+	cp -r ${WORKDIR}/KDE-Documentation ${D}/${PREFIX}/share/apps/kdevelop/
 
+	# c/cpp reference package
+	dodir ${PREFIX}/share/doc/HTML/en/kdevelop/reference
+	cp -r ${WORKDIR}/c_cpp_reference-1.0/reference/{C,CPLUSPLUS,GRAPHICS} ${D}/${PREFIX}/share/doc/HTML/en/kdevelop/reference/
 }
 
 pkg_postinst() {
-
-einfo "Don't run the kdevelop setup! It will try to generate the kdelibs documentation,"
-einfo "but a pregenerated package of it has been installed with this ebuild."
-einfo "Instead, run kdevelop, go to Options->Kdevelop Setup, Documentation tab, and change"
-einfo "the value of KDE-Libraries-Doc to $PREFIX/share/apps/kdevelop/KDE-Documentation/ ."
-einfo ""
-einfo "Oh, and if you think of a nice way to automate this from the ebuild, pray tell"
-einfo "(but test first!) :-)"
-
-
+	einfo "Don't run the kdevelop setup! It will try to generate the kdelibs documentation,"
+	einfo "but a pregenerated package of it has been installed with this ebuild."
+	einfo "Instead, run kdevelop, go to Options->Kdevelop Setup, Documentation tab, and change"
+	einfo "the value of KDE-Libraries-Doc to $PREFIX/share/apps/kdevelop/KDE-Documentation/ ."
+	einfo
+	einfo "Oh, and if you think of a nice way to automate this from the ebuild, pray tell"
+	einfo "(but test first!) :-)"
 }
-
diff --git a/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild b/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild
index b54438ce617a..0fadf2083cc6 100644
--- a/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild,v 1.4 2002/10/04 20:58:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild,v 1.5 2002/11/15 01:06:15 vapier Exp $
 
 inherit kde-base
 need-kde 3
@@ -16,11 +16,9 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	mirror://gentoo/kdelibs-kdevelop-docs-3.0.1.tar.bz2
 	mirror://gentoo/$P-qt-templates.tar.gz"
 
-
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
-
 DEPEND="$DEPEND
 	sys-devel/flex
 	sys-devel/perl"
@@ -38,48 +36,46 @@ newdepend ">=kde-base/kdebase-3
 # -j2 and greater fails - see bug #6199
 export MAKEOPTS="$MAKEOPTS -j1"
 
+APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
+
 src_unpack() {
-    base_src_unpack
-    cd ${S}/kdevelop
-    for x in *.desktop; do
-	mv $x $x.2
-	sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
-	rm $x.2
-    done
-    
-    # new qt project templates, fix #5839
-    cd $WORKDIR
-    mv q*.tar.gz $S/kdevelop/templates/
-    
+	base_src_unpack
+	cd ${S}/kdevelop
+	for x in *.desktop; do
+		mv $x $x.2
+		sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
+		rm $x.2
+	done
+
+	# new qt project templates, fix #5839
+	cd $WORKDIR
+	mv q*.tar.gz $S/kdevelop/templates/
 }
 
 src_install() {
+	kde_src_install
+
+	# setup htdig for use with kdevelop out-of-the-box (sort of)
+	sed -e "s:_KDEDIR_:${PREFIX}:g" \
+	 -e "s:/home/httpd/htdocs:${APACHE_ROOT}:" \
+		${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
+	dodir ${PREFIX}/share/apps/kdevelop/htdig/db
 
-    kde_src_install
-    
-    # setup htdig for use with kdevelop out-of-the-box (sort of)
-    sed -e "s:_KDEDIR_:${PREFIX}:g" ${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
-    dodir ${PREFIX}/share/apps/kdevelop/htdig/db
-    
-    # kdelibs documentation - pregenerated so we don't need kdelibs sources etc
-    cp -r ${WORKDIR}/KDE-Documentation ${D}/${PREFIX}/share/apps/kdevelop/
-    
-    # c/cpp reference package
-    dodir ${PREFIX}/share/doc/HTML/en/kdevelop/reference
-    cp -r ${WORKDIR}/c_cpp_reference-1.0/reference/{C,CPLUSPLUS,GRAPHICS} ${D}/${PREFIX}/share/doc/HTML/en/kdevelop/reference/
+	# kdelibs documentation - pregenerated so we don't need kdelibs sources etc
+	cp -r ${WORKDIR}/KDE-Documentation ${D}/${PREFIX}/share/apps/kdevelop/
 
+	# c/cpp reference package
+	dodir ${PREFIX}/share/doc/HTML/en/kdevelop/reference
+	cp -r ${WORKDIR}/c_cpp_reference-1.0/reference/{C,CPLUSPLUS,GRAPHICS} ${D}/${PREFIX}/share/doc/HTML/en/kdevelop/reference/
 }
 
 pkg_postinst() {
-
-einfo "Don't run the kdevelop setup! It will try to generate the kdelibs documentation,"
-einfo "but a pregenerated package of it has been installed with this ebuild."
-einfo "Instead, run kdevelop, go to Options->Kdevelop Setup, Documentation tab, and change"
-einfo "the value of KDE-Libraries-Doc to $PREFIX/share/apps/kdevelop/KDE-Documentation/ ."
-einfo ""
-einfo "Oh, and if you think of a nice way to automate this from the ebuild, pray tell"
-einfo "(but test first!) :-)"
-
-
+	einfo "Don't run the kdevelop setup! It will try to generate the kdelibs documentation,"
+	einfo "but a pregenerated package of it has been installed with this ebuild."
+	einfo "Instead, run kdevelop, go to Options->Kdevelop Setup, Documentation tab, and change"
+	einfo "the value of KDE-Libraries-Doc to $PREFIX/share/apps/kdevelop/KDE-Documentation/ ."
+	einfo
+	einfo "Oh, and if you think of a nice way to automate this from the ebuild, pray tell"
+	einfo "(but test first!) :-)"
 }
-
diff --git a/dev-util/kdevelop/kdevelop-2.1.3.ebuild b/dev-util/kdevelop/kdevelop-2.1.3.ebuild
index f54fabdf78b7..9eaac1bfc59c 100644
--- a/dev-util/kdevelop/kdevelop-2.1.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.3.ebuild,v 1.5 2002/10/04 20:58:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.3.ebuild,v 1.6 2002/11/15 01:06:15 vapier Exp $
 
 inherit kde-base
 need-kde 3
@@ -15,11 +15,9 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	mirror://gentoo/c_cpp_reference-1.0.tar.gz
 	mirror://gentoo/kdelibs-kdevelop-docs-3.0.1.tar.bz2"
 
-
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
-
 DEPEND="$DEPEND
 	sys-devel/flex
 	sys-devel/perl"
@@ -37,44 +35,43 @@ newdepend ">=kde-base/kdebase-3
 # -j2 and greater fails - see bug #6199
 export MAKEOPTS="$MAKEOPTS -j1"
 
-src_unpack() {
-    base_src_unpack
-    cd ${S}/kdevelop
-    for x in *.desktop; do
-	mv $x $x.2
-	sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
-	rm $x.2
-    done
+APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
 
+src_unpack() {
+	base_src_unpack
+	cd ${S}/kdevelop
+	for x in *.desktop; do
+		mv $x $x.2
+		sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
+		rm $x.2
+	done
 }
 
 src_install() {
+	kde_src_install
 
-    kde_src_install
-    
-    # setup htdig for use with kdevelop out-of-the-box (sort of)
-    sed -e "s:_KDEDIR_:${PREFIX}:g" ${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
-    dodir ${PREFIX}/share/apps/kdevelop/htdig/db
-    
-    # kdelibs documentation - pregenerated so we don't need kdelibs sources etc
-    cp -r ${WORKDIR}/KDE-Documentation ${D}/${PREFIX}/share/apps/kdevelop/
-    
-    # c/cpp reference package
-    dodir ${PREFIX}/share/doc/HTML/en/kdevelop/reference
-    cp -r ${WORKDIR}/c_cpp_reference-1.0/reference/{C,CPLUSPLUS,GRAPHICS} ${D}/${PREFIX}/share/doc/HTML/en/kdevelop/reference/
+	# setup htdig for use with kdevelop out-of-the-box (sort of)
+	sed -e "s:_KDEDIR_:${PREFIX}:g" \
+	 -e "s:/home/httpd/htdocs:${APACHE_ROOT}:" \
+		${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
+	dodir ${PREFIX}/share/apps/kdevelop/htdig/db
 
+	# kdelibs documentation - pregenerated so we don't need kdelibs sources etc
+	cp -r ${WORKDIR}/KDE-Documentation ${D}/${PREFIX}/share/apps/kdevelop/
+
+	# c/cpp reference package
+	dodir ${PREFIX}/share/doc/HTML/en/kdevelop/reference
+	cp -r ${WORKDIR}/c_cpp_reference-1.0/reference/{C,CPLUSPLUS,GRAPHICS} ${D}/${PREFIX}/share/doc/HTML/en/kdevelop/reference/
 }
 
 pkg_postinst() {
-
-einfo "Don't run the kdevelop setup! It will try to generate the kdelibs documentation,"
-einfo "but a pregenerated package of it has been installed with this ebuild."
-einfo "Instead, run kdevelop, go to Options->Kdevelop Setup, Documentation tab, and change"
-einfo "the value of KDE-Libraries-Doc to $PREFIX/share/apps/kdevelop/KDE-Documentation/ ."
-einfo ""
-einfo "Oh, and if you think of a nice way to automate this from the ebuild, pray tell"
-einfo "(but test first!) :-)"
-
-
+	einfo "Don't run the kdevelop setup! It will try to generate the kdelibs documentation,"
+	einfo "but a pregenerated package of it has been installed with this ebuild."
+	einfo "Instead, run kdevelop, go to Options->Kdevelop Setup, Documentation tab, and change"
+	einfo "the value of KDE-Libraries-Doc to $PREFIX/share/apps/kdevelop/KDE-Documentation/ ."
+	einfo
+	einfo "Oh, and if you think of a nice way to automate this from the ebuild, pray tell"
+	einfo "(but test first!) :-)"
 }