remove gnome eclass and extract relevant parts into the ebuild

svn path=/overlay/; revision=44

3 files changed, 34 insertions, 29 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 79116de..35cf3c6 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,7 +3,7 @@ AUX networkmanager-0.7.0-resolvconf-perms.patch 559 RMD160 b54ec431e9050176845dc
 AUX networkmanager-0.7.0_pre20070627-updatedbackend.patch 17941 RMD160 343abd3b8a35b7373a5651e7ec8fb10342eb36d7 SHA1 63c7dccf7ed31fb465d57db84e33e08488031dfe SHA256 89ccb2dfc05cdb2ee9bca558f661f30b6923f81b9bd7e2999c61880461b14826
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 DIST NetworkManager-0.7.0_pre20080817.tar.bz2 987249 RMD160 72233760f9c3a92eed029e122dad996d0a07361e SHA1 c6278980c6c321645415720c6e85ea76eec46f78 SHA256 aebb0341a5843b1f129e38b3264052382f8dd314af478f8542bf81b29f33f80c
-EBUILD networkmanager-0.7.0_pre20080817.ebuild 3194 RMD160 b2408985f2aca523bbaf0e07806a063a7cc327bf SHA1 fd45cb43c6b3832d31e86e334ba52531b7d080f9 SHA256 ae1b00ec31bcb00b43fed0cc75af5507926b45e1a87f93d9986165c7538e8ee4
+EBUILD networkmanager-0.7.0_pre20080817.ebuild 3386 RMD160 82a128cfb67c36498f91490b8ed712bfdc4db6ce SHA1 cc2642816f5ba29e2962645406fac96c39fc1674 SHA256 af5c3529eb5e32eda799ae5a914c1ce6d9f9d194808f93c9890abcf9f0cd8708
 EBUILD networkmanager-9999.ebuild 2279 RMD160 68d729e9d16b793902f690ddcd6b8383fd01cceb SHA1 b04f932f8b8b55f47ac5850adaf3c7263ab828e1 SHA256 5cfddaa3a8f6a1c3fb0f89fa49d3eb12b0a367a906514542c98dcac5a79c027d
-MISC TODO 121 RMD160 af0654117d2e5ced01f83ea5de5b2a8a02691874 SHA1 7fd48cc5593dfe1aacd8e926ffb291556ed6b7c5 SHA256 d34d08af57f4b0a195dfeb3ae2cafdcaa6f11949fccdd478f12bd62f95faca12
+MISC TODO 153 RMD160 b11fd7eeb70db6d49106b2a661103e3c18e0156e SHA1 d61d60872cf9851f6e3c94ab1d798156ea68be81 SHA256 c96dd5c740ddd175fc29d967f686adb7ba3da6ac45581d92e52008c32479e7cc
 MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967
diff --git a/net-misc/networkmanager/TODO b/net-misc/networkmanager/TODO
index 4c2258b..d323549 100644
--- a/net-misc/networkmanager/TODO
+++ b/net-misc/networkmanager/TODO
@@ -1,6 +1,4 @@
 Short TODO list
 
-1) Remove inherit gnome2
-2) add action for doc flag
-3) check if gtk-doc is required, and add if needed
-
+1) check if gtk-doc is required, and add if needed
+2) fix docs building upstream, USE=doc currently fails and USE=-doc installs gtk-doc
diff --git a/net-misc/networkmanager/networkmanager-0.7.0_pre20080817.ebuild b/net-misc/networkmanager/networkmanager-0.7.0_pre20080817.ebuild
index bcaacab..656db46 100644
--- a/net-misc/networkmanager/networkmanager-0.7.0_pre20080817.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.0_pre20080817.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit gnome2 eutils
+inherit eutils
 
 # NetworkManager likes itself with capital letters
 MY_P=${P/networkmanager/NetworkManager}
@@ -43,64 +43,71 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	net-dialup/ppp"
 
-PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
+PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 )
+	kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )"
 
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	if !built_with_use net-wireless/wpa_supplicant dbus ; then
+	if ! built_with_use net-wireless/wpa_supplicant dbus ; then
 		eerror "Please rebuild net-wireless/wpa_supplicant with the dbus useflag."
 		die "Fix wpa_supplicant first."
 	fi
+}
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
+}
 
-	G2CONF="${G2CONF} \
-		--disable-more-warnings \
+src_compile() {
+	ECONF="--disable-more-warnings \
 		--localstatedir=/var \
 		--with-distro=gentoo \
-		--with-dbus-sys=/etc/dbus-1/system.d"
+		--with-dbus-sys=/etc/dbus-1/system.d
+		$(use_enable doc gtk-doc)
+		$(use_with doc docs)"
 
 	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
 	if use dhclient ; then
 		if use dhcpcd ; then
-			G2CONF="${G2CONF} --with-dhcp-client=dhcpcd"
+			ECONF="${ECONF} --with-dhcp-client=dhcpcd"
 		else
-			G2CONF="${G2CONF} --with-dhcp-client=dhclient"
+			ECONF="${ECONF} --with-dhcp-client=dhclient"
 		fi
 	else
-		G2CONF="${G2CONF} --with-dhcp-client=dhcpcd"
+		ECONF="${ECONF} --with-dhcp-client=dhcpcd"
 	fi
 
 	# default is NSS (if none or both are specified), GnuTLS otherwise
 	if use gnutls ; then
 		if use nss ; then
-			G2CONF="${G2CONF} --with-crypto=nss"
+			ECONF="${ECONF} --with-crypto=nss"
 		else
-			G2CONF="${G2CONF} --with-crypto=gnults"
+			ECONF="${ECONF} --with-crypto=gnults"
 		fi
 	else
-		G2CONF="${G2CONF} --with-crypto=nss"
+		ECONF="${ECONF} --with-crypto=nss"
 	fi
-}
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
 
-	# Fix up the dbus conf file to use plugdev group
-	epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
+	econf ${ECONF} || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	gnome2_src_install
+	emake DESTDIR="${D}" install || die "emake install failed"
+
 	# Need to keep the /var/run/NetworkManager directory
 	keepdir /var/run/NetworkManager
 
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
 	# Add keyfile plugin support
 	insinto /etc/NetworkManager
 	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf
-
 }
 
 pkg_postinst() {