removed my APACHE fix

4 files changed, 2 insertions, 89 deletions

diff --git a/dev-util/kdevelop/files/digest-kdevelop-2.1.3 b/dev-util/kdevelop/files/digest-kdevelop-2.1.3
deleted file mode 100644
index fdb12e0fb534..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-2.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f71ad2aa07522f99ef62bc46d2e3e8bf kdevelop-2.1.3_for_KDE_3.0.tar.bz2 3403196
-MD5 cd84fd2c8c8129d19e6e2686d6bf63a5 c_cpp_reference-1.0.tar.gz 1146504
-MD5 ca365b62446d131ea0e4a631ec6e2a08 kdelibs-kdevelop-docs-3.0.1.tar.bz2 1848072
diff --git a/dev-util/kdevelop/kdevelop-2.1.2.ebuild b/dev-util/kdevelop/kdevelop-2.1.2.ebuild
index 646c3179ecad..3e2418be9d68 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.14 2002/12/09 04:21:15 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.2.ebuild,v 1.15 2002/12/17 21:48:19 vapier Exp $
 
 inherit kde-base
 need-kde 3
@@ -35,9 +35,6 @@ 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
@@ -53,7 +50,6 @@ 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
 
diff --git a/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild b/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild
index 0fadf2083cc6..6c97ee115ed6 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.5 2002/11/15 01:06:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild,v 1.6 2002/12/17 21:48:19 vapier Exp $
 
 inherit kde-base
 need-kde 3
@@ -36,9 +36,6 @@ 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
@@ -58,7 +55,6 @@ 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
 
diff --git a/dev-util/kdevelop/kdevelop-2.1.3.ebuild b/dev-util/kdevelop/kdevelop-2.1.3.ebuild
deleted file mode 100644
index 9850d285a0de..000000000000
--- a/dev-util/kdevelop/kdevelop-2.1.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.7 2002/11/15 01:08:01 vapier Exp $
-
-inherit kde-base
-need-kde 3
-
-S=${WORKDIR}/${P}_for_KDE_3.0
-DESCRIPTION="KDevelop ${PV}"
-HOMEPAGE="http://www.kdevelop.org/"
-SRC_PATH="kde/stable/3.0.3/src/${P}_for_KDE_3.0.tar.bz2"
-SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
-	ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH
-	ftp://ftp.sourceforge.net/pub/mirrors/$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"
-
-newdepend ">=kde-base/kdebase-3
-	>=dev-util/kdoc-2.0_alpha24
-	>=dev-util/kdbg-1.2.5.3
-	>=net-www/htdig-3.1.6
-	>=app-text/enscript-1.6.1
-	>=app-text/a2ps-4.13b
-	>=dev-util/ctags-5.0.1
-	>=app-text/sgmltools-lite-3.0.3
-	>=app-doc/qt-docs-${QTVER}"
-
-# -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
-}
-
-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
-
-	# 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!) :-)"
-}