Clean up.

(Portage version: 2.1.4)

4 files changed, 6 insertions, 137 deletions

diff --git a/app-admin/system-config-httpd/ChangeLog b/app-admin/system-config-httpd/ChangeLog
index a6d0ff5c5f0a..1291f1fc9679 100644
--- a/app-admin/system-config-httpd/ChangeLog
+++ b/app-admin/system-config-httpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/system-config-httpd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-httpd/ChangeLog,v 1.5 2007/10/15 09:22:20 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-httpd/ChangeLog,v 1.6 2008/01/31 06:15:06 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.3.3-gentooify.patch, -system-config-httpd-1.3.3.ebuild:
+  Clean up.
 
   15 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   system-config-httpd-1.3.3.ebuild, system-config-httpd-1.4.3.ebuild:
diff --git a/app-admin/system-config-httpd/files/1.3.3-gentooify.patch b/app-admin/system-config-httpd/files/1.3.3-gentooify.patch
deleted file mode 100644
index 8e0e2eb89e9e..000000000000
--- a/app-admin/system-config-httpd/files/1.3.3-gentooify.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -urN system-config-httpd-1.3.3.orig/src/ApacheBase.py system-config-httpd-1.3.3/src/ApacheBase.py
---- system-config-httpd-1.3.3.orig/src/ApacheBase.py	2006-09-04 11:57:25.000000000 -0700
-+++ system-config-httpd-1.3.3/src/ApacheBase.py	2006-09-04 12:01:10.000000000 -0700
-@@ -4349,7 +4349,7 @@
- 
-     # Compute md5sum of currently installed httpd.conf
-     try:
--        rmd5 = hexstr (md5 (open ('/etc/httpd/conf/httpd.conf', 'r').read ()).digest())
-+        rmd5 = hexstr (md5 (open ('/etc/apache2/httpd.conf', 'r').read ()).digest())
-     except:
-         rmd5 = ''
- 
-@@ -4361,14 +4361,14 @@
-     if omd5 != rmd5:
-         if force:
-             try:
--                os.remove ('/etc/httpd/conf/httpd.conf.bak')
-+                os.remove ('/etc/apache2/httpd.conf.bak')
-             except:
-                 pass
-             try:
--                os.rename ('/etc/httpd/conf/httpd.conf', '/etc/httpd/conf/httpd.conf.bak')
-+                os.rename ('/etc/apache2/httpd.conf', '/etc/apache2/httpd.conf.bak')
-             except:
-                 pass
--            open ('/etc/httpd/conf/httpd.conf', 'w').write (result)
-+            open ('/etc/apache2/httpd.conf', 'w').write (result)
-             open ('/usr/share/system-config-httpd/httpd.conf.md5', 'w').write (nmd5)
-             local_box.write (ctx)
- 	    return 0
-@@ -4377,7 +4377,7 @@
-         else:
-             return -2
-     else:
--        open ('/etc/httpd/conf/httpd.conf', 'w').write (result)
-+        open ('/etc/apache2/httpd.conf', 'w').write (result)
-         open ('/usr/share/system-config-httpd/httpd.conf.md5', 'w').write (nmd5)
-         local_box.write (ctx)
- 	return 0
-diff -urN system-config-httpd-1.3.3.orig/src/httpd.conf.xsl system-config-httpd-1.3.3/src/httpd.conf.xsl
---- system-config-httpd-1.3.3.orig/src/httpd.conf.xsl	2006-09-04 11:57:25.000000000 -0700
-+++ system-config-httpd-1.3.3/src/httpd.conf.xsl	2006-09-04 12:00:25.000000000 -0700
-@@ -29,8 +29,8 @@
- # of the server's control files begin with "/" (or "drive:/" for Win32), the
- # server will use that explicit path.  If the filenames do *not* begin
- # with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
--# with ServerRoot set to "/etc/httpd" will be interpreted by the
--# server as "/etc/httpd/logs/foo.log".
-+# with ServerRoot set to "/etc/apache2" will be interpreted by the
-+# server as "/etc/apache2/logs/foo.log".
- #
- 
- ### Section 1: Global Environment
-@@ -203,9 +203,14 @@
- LoadModule cgi_module modules/mod_cgi.so
- 
- #
--# Load config files from the config directory "/etc/httpd/conf.d".
-+# Load config files from the config directory "/etc/apache2/modules.d".
- #
--Include conf.d/*.conf
-+Include modules.d/*.conf
-+
-+#
-+# Load config files from the config directory "/etc/apache2/vhosts.d".
-+#
-+Include vhosts.d/*.conf
- 
- #
- # ExtendedStatus controls whether Apache will generate "full" status
-@@ -865,7 +870,7 @@
- # To enable the cache as well, edit and uncomment the following lines:
- # (no cacheing without CacheRoot)
- #
--#CacheRoot "/etc/httpd/proxy"
-+#CacheRoot "/etc/apache2/proxy"
- #CacheSize 5
- #CacheGcInterval 4
- #CacheMaxExpire 24
diff --git a/app-admin/system-config-httpd/files/digest-system-config-httpd-1.3.3 b/app-admin/system-config-httpd/files/digest-system-config-httpd-1.3.3
deleted file mode 100644
index ec82282320f6..000000000000
--- a/app-admin/system-config-httpd/files/digest-system-config-httpd-1.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3cfcd670ba650ed5781e03d0f7ba130c system-config-httpd-1.3.3-1.1.1.src.rpm 833094
-RMD160 2a96e737d3b1b8ef9128ca149edd46fb60ae3b30 system-config-httpd-1.3.3-1.1.1.src.rpm 833094
-SHA256 e52343a1290fd39b0b55fd58ab6961c998104e3423de72e7b2574eb84907d942 system-config-httpd-1.3.3-1.1.1.src.rpm 833094
diff --git a/app-admin/system-config-httpd/system-config-httpd-1.3.3.ebuild b/app-admin/system-config-httpd/system-config-httpd-1.3.3.ebuild
deleted file mode 100644
index c818b547352c..000000000000
--- a/app-admin/system-config-httpd/system-config-httpd-1.3.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-httpd/system-config-httpd-1.3.3.ebuild,v 1.4 2007/10/15 09:22:19 dberkholz Exp $
-
-inherit python eutils rpm
-
-# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
-# tarball out of it
-RPMREV="1.1.1"
-
-DESCRIPTION="Apache configuration tool"
-HOMEPAGE="http://fedoraproject.org/wiki/SystemConfig/httpd"
-SRC_URI="mirror://fedora/development/source/SRPMS/${P}-${RPMREV}.src.rpm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-RDEPEND="dev-libs/alchemist
-	=dev-python/pygtk-2*
-	dev-lang/python
-	=dev-python/gnome-python-2*
-	>=www-servers/apache-2.0.52-r3
-	sys-apps/usermode
-	dev-libs/libxslt"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool"
-
-pkg_setup() {
-	if ! built_with_use dev-libs/libxslt python; then
-		local msg="Build dev-libs/libxslt with USE=python"
-		eerror "$msg"
-		die "$msg"
-	fi
-}
-
-src_unpack() {
-	rpm_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-gentooify.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	make_desktop_entry /usr/bin/${PN}
-
-	fperms 644 /etc/pam.d/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}