authconfig: gentooify. still grays out all the interesting options, though.

3 files changed, 152 insertions, 5 deletions

diff --git a/app-admin/authconfig/Manifest b/app-admin/authconfig/Manifest
index 020e1fb..b8d6dd5 100644
--- a/app-admin/authconfig/Manifest
+++ b/app-admin/authconfig/Manifest
@@ -1,8 +1,12 @@
+AUX 5.3.5-gentooify.patch 4328 RMD160 e5d77c5ef2e447a21dce290b438168f530a7a154 SHA1 af701e8d1f3f32e68968637459a7dd7c637852e5 SHA256 78a5da6feb0e2c0482b25b09d54d180e557f7d79e67886c9bcaf03c30931bbc9
+MD5 0902bb222d20b0662249ba465d0af8b4 files/5.3.5-gentooify.patch 4328
+RMD160 e5d77c5ef2e447a21dce290b438168f530a7a154 files/5.3.5-gentooify.patch 4328
+SHA256 78a5da6feb0e2c0482b25b09d54d180e557f7d79e67886c9bcaf03c30931bbc9 files/5.3.5-gentooify.patch 4328
 DIST authconfig-5.3.5-1.src.rpm 686134 RMD160 f8caf7358e3b65ef6edc564a14bb6b297168d5de SHA1 87fb9702bf24997602800b656550cde9b1250f26 SHA256 20d6fc84d4e0f01f9876dde15bf40ce2e7360094ec60baff0ead36005bdaea77
-EBUILD authconfig-5.3.5.ebuild 865 RMD160 276a41b8a506f2bd67ee5cb37498a4fd9992a939 SHA1 c1ed361daeb0f6c81aecec37c0cd288a6483a28d SHA256 5228f920286fa7e473ccbc7531b019438289c39d457687a2bf505abb83708484
-MD5 587e5dbfebaa54e1bc8a8575c036b470 authconfig-5.3.5.ebuild 865
-RMD160 276a41b8a506f2bd67ee5cb37498a4fd9992a939 authconfig-5.3.5.ebuild 865
-SHA256 5228f920286fa7e473ccbc7531b019438289c39d457687a2bf505abb83708484 authconfig-5.3.5.ebuild 865
+EBUILD authconfig-5.3.5.ebuild 961 RMD160 26b04b8d1f4f12ee43de5b0fe603f4a16d95ff7c SHA1 67e310e679351a7e91ec20f3ff72354dd6c83347 SHA256 673c06604b4baa20a44023443f55157dfb030371c6a80ee3bbeee36c103bcd3f
+MD5 9cf2ff47028e6f67dd85905a103560df authconfig-5.3.5.ebuild 961
+RMD160 26b04b8d1f4f12ee43de5b0fe603f4a16d95ff7c authconfig-5.3.5.ebuild 961
+SHA256 673c06604b4baa20a44023443f55157dfb030371c6a80ee3bbeee36c103bcd3f authconfig-5.3.5.ebuild 961
 MD5 71823fd0b807fd0fb6c47fad4daa1a84 files/digest-authconfig-5.3.5 259
 RMD160 ca5a01448969efce1d551ad2fadf0f16c197146b files/digest-authconfig-5.3.5 259
 SHA256 9ed2ad7702bbfe5c0b198bb6ed2f5d80f66efa69f2c3225f61d4d33ff77e7b89 files/digest-authconfig-5.3.5 259
diff --git a/app-admin/authconfig/authconfig-5.3.5.ebuild b/app-admin/authconfig/authconfig-5.3.5.ebuild
index bad7f4c..f251a7b 100644
--- a/app-admin/authconfig/authconfig-5.3.5.ebuild
+++ b/app-admin/authconfig/authconfig-5.3.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit rpm
+inherit eutils rpm
 
 # Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
 # tarball out of it
@@ -27,6 +27,12 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/intltool"
 
+src_unpack() {
+	rpm_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-gentooify.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
diff --git a/app-admin/authconfig/files/5.3.5-gentooify.patch b/app-admin/authconfig/files/5.3.5-gentooify.patch
new file mode 100644
index 0000000..b3a529d
--- /dev/null
+++ b/app-admin/authconfig/files/5.3.5-gentooify.patch
@@ -0,0 +1,137 @@
+Index: authconfig-gtk.py
+===================================================================
+RCS file: /usr/local/CVS/authconfig/authconfig-gtk.py,v
+retrieving revision 1.42
+diff -u -b -B -r1.42 authconfig-gtk.py
+--- authconfig-gtk.py	24 Aug 2006 19:22:17 -0000	1.42
++++ authconfig-gtk.py	4 Sep 2006 19:38:35 -0000
+@@ -387,12 +387,12 @@
+ 		if "--firstboot" in sys.argv:
+ 			for service in firstbootservices:
+ 				if os.access("/etc/init.d/" + service, os.X_OK):
+-					os.system("/etc/init.d/" + service + " condrestart")
++					os.system("/etc/init.d/" + service + " restart")
+ 			if os.access("/etc/init.d/autofs", os.X_OK):
+     				if self.info.enableNIS:
+ 					cond = ""
+ 				else:
+-    					cond = "cond"
++    					cond = ""
+ 				os.system("/etc/init.d/autofs " + cond + "restart")
+ 
+ 	def ldap_cacerts_test(self):
+Index: authinfo.py
+===================================================================
+RCS file: /usr/local/CVS/authconfig/authinfo.py,v
+retrieving revision 1.20
+diff -u -b -B -r1.20 authinfo.py
+--- authinfo.py	24 Aug 2006 19:22:17 -0000	1.20
++++ authinfo.py	4 Sep 2006 19:38:37 -0000
+@@ -455,11 +455,11 @@
+ def toggleCachingService(enableCaching, nostart):
+ 	if not nostart:
+ 		if enableCaching:
+-			os.system("/sbin/service nscd restart")
++			os.system("/etc/init.d/nscd restart")
+ 		else:
+ 			try:
+ 				os.stat(PATH_NSCD_PID)
+-				os.system("/sbin/service nscd stop")
++				os.system("/etc/init.d/nscd stop")
+ 			except OSError:
+ 				pass
+ 	return True
+@@ -469,24 +469,22 @@
+ 		os.system("/bin/domainname " + nisDomain)
+ 		try:
+ 			os.stat(PATH_PORTMAP)
+-			os.system("/sbin/chkconfig --add portmap")
+-			os.system("/sbin/chkconfig --level 345 portmap on")
++			os.system("/sbin/rc-update add portmap default")
+ 			if not nostart:
+-				os.system("/sbin/service portmap restart")
++				os.system("/etc/init.d/portmap restart")
+ 		except OSError:
+ 			pass
+ 		try:
+ 			os.stat(PATH_YPBIND)
+-			os.system("/sbin/chkconfig --add ypbind")
+-			os.system("/sbin/chkconfig --level 345 ypbind on")
++			os.system("/sbin/rc-update add ypbind default")
+ 			if os.access(PATH_SEBOOL, os.R_OK | os.X_OK):
+ 				os.system(PATH_SEBOOL + " -P allow_ypbind 1")
+ 			if not nostart:
+ 				try:
+ 					os.stat(PATH_YPBIND_PID)
+-					os.system("/sbin/service ypbind restart")
++					os.system("/etc/init.d/ypbind restart")
+ 				except OSError:
+-					os.system("/sbin/service ypbind start")
++					os.system("/etc/init.d/ypbind start")
+ 		except OSError:
+ 			pass
+ 	else:
+@@ -496,10 +494,10 @@
+ 			if not nostart:
+ 				try:
+ 					os.stat(PATH_YPBIND_PID)
+-					os.system("/sbin/service ypbind stop")
++					os.system("/etc/init.d/ypbind stop")
+ 				except OSError:
+ 					pass
+-			os.system("/sbin/chkconfig --level 345 ypbind off")
++			os.system("/sbin/rc-update del ypbind")
+ 			if os.access(PATH_SEBOOL, os.R_OK | os.X_OK):
+ 				os.system(PATH_SEBOOL + " -P allow_ypbind 0")
+ 		except OSError:
+@@ -510,10 +508,9 @@
+ 	if enable:
+ 		try:
+ 			os.stat(path)
+-			os.system("/sbin/chkconfig --add " + name)
+-			os.system("/sbin/chkconfig --level 345 " + name + " on")
++			os.system("/sbin/rc-update add " + name + " default")
+ 			if not nostart:
+-				os.system("/sbin/service " + name +" restart")
++				os.system("/etc/init.d/" + name +" restart")
+ 		except OSError:
+ 			pass
+ 	else:
+@@ -522,11 +519,11 @@
+ 			if not nostart:
+ 				try:
+ 					os.stat(pidfile)
+-					os.system("/sbin/service " + name +" stop")
++					os.system("/etc/init.d/" + name +" stop")
+ 				except OSError:
+ 					pass
+ 			
+-			os.system("/sbin/chkconfig --level 345 " + name + " off")
++			os.system("/sbin/rc-update del " + name)
+ 		except OSError:
+ 			pass
+ 	return True
+@@ -1088,7 +1085,7 @@
+ 
+ 	# Read whether or not caching is enabled.
+ 	def readCache(self):
+-		rv = os.system("/sbin/chkconfig nscd >/dev/null 2>&1")
++		rv = os.system("/bin/rc-status | grep -q nscd")
+ 		self.enableCache = os.WIFEXITED(rv) and os.WEXITSTATUS(rv) == 0
+ 		return True
+ 
+@@ -1485,12 +1482,11 @@
+ 
+ 	def writeCache(self):
+ 		if self.enableCache:
+-			os.system("/sbin/chkconfig --add nscd")
+-			os.system("/sbin/chkconfig --level 345 nscd on")
++			os.system("/sbin/rc-update add nscd default")
+ 		else:
+ 			try:
+ 				os.stat(PATH_NSCD)
+-		    		os.system("/sbin/chkconfig --level 345 nscd off");
++		    		os.system("/sbin/rc-update del nscd");
+ 			except OSError:
+ 				pass
+ 		return True