[Initng-svn] r3774 - portage/gentoo/sys-apps/initng-ifiles

[svn at initng.thinktux.net]

Author: deac
Date: Wed Apr 12 10:34:50 2006
New Revision: 3774

Modified:
   portage/gentoo/sys-apps/initng-ifiles/initng-ifiles-9998.ebuild
   portage/gentoo/sys-apps/initng-ifiles/initng-ifiles-9999.ebuild

Log:
initng-ifiles-9999.ebuild and initng-ifiles-9998.ebuild switched. 9999 uses cmake, 9998 configure

Modified: portage/gentoo/sys-apps/initng-ifiles/initng-ifiles-9998.ebuild
==============================================================================
--- portage/gentoo/sys-apps/initng-ifiles/initng-ifiles-9998.ebuild	(original)
+++ portage/gentoo/sys-apps/initng-ifiles/initng-ifiles-9998.ebuild	Wed Apr 12 10:34:50 2006
@@ -15,7 +15,6 @@
 SRC_URI=""
 KEYWORDS="-*"
 S=${WORKDIR}/${PN}
-DEPEND='sys-apps/initng dev-util/cmake'
 
 
 IUSE_INITNG_PLUGINS="initng_plugins_splash "
@@ -24,20 +23,19 @@
 
 src_unpack() {
 	subversion_src_unpack
+	cd "${S}"
+	emake -fMakefile.cvs
 }
 
 src_compile() {
-	CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/"
+	ECONF_OPTS="--prefix=/usr \
+		--exec-prefix=/ \
+		--with-doc-dir=/usr/share/doc/${PF}"
 	for plugin in ${IUSE_INITNG_PLUGINS}
 	do
-		p="BUILD_$(echo ${plugin#initng_plugins_} | tr '[a-z]' '[A-Z]')"
-		if use ${plugin}
-		then CMAKE_OPTS="${CMAKE_OPTS} -D${p}=ON"
-		else CMAKE_OPTS="${CMAKE_OPTS} -D${p}=OFF"
-		fi
+		ECONF_OPTS="${ECONF_OPTS} $(use_with ${plugin} ${plugin#initng_plugins_})"
 	done
-	cd ${S}
-	cmake ${CMAKE_OPTS} || die
+	econf ${ECONF_OPTS} || die
 	emake || die
 }
 

Modified: portage/gentoo/sys-apps/initng-ifiles/initng-ifiles-9999.ebuild
==============================================================================
--- portage/gentoo/sys-apps/initng-ifiles/initng-ifiles-9999.ebuild	(original)
+++ portage/gentoo/sys-apps/initng-ifiles/initng-ifiles-9999.ebuild	Wed Apr 12 10:34:50 2006
@@ -15,6 +15,7 @@
 SRC_URI=""
 KEYWORDS="-*"
 S=${WORKDIR}/${PN}
+DEPEND='sys-apps/initng dev-util/cmake'
 
 
 IUSE_INITNG_PLUGINS="initng_plugins_splash "
@@ -23,19 +24,20 @@
 
 src_unpack() {
 	subversion_src_unpack
-	cd "${S}"
-	emake -fMakefile.cvs
 }
 
 src_compile() {
-	ECONF_OPTS="--prefix=/usr \
-		--exec-prefix=/ \
-		--with-doc-dir=/usr/share/doc/${PF}"
+	CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/"
 	for plugin in ${IUSE_INITNG_PLUGINS}
 	do
-		ECONF_OPTS="${ECONF_OPTS} $(use_with ${plugin} ${plugin#initng_plugins_})"
+		p="BUILD_$(echo ${plugin#initng_plugins_} | tr '[a-z]' '[A-Z]')"
+		if use ${plugin}
+		then CMAKE_OPTS="${CMAKE_OPTS} -D${p}=ON"
+		else CMAKE_OPTS="${CMAKE_OPTS} -D${p}=OFF"
+		fi
 	done
-	econf ${ECONF_OPTS} || die
+	cd ${S}
+	cmake ${CMAKE_OPTS} || die
 	emake || die
 }