Moved gtk-doc from runtime dep to build time

dep.
Initial ebuild for trunk ebuild.




svn path=/overlay/; revision=53

3 files changed, 96 insertions, 50 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 64134c4..b127c1b 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,6 +5,8 @@ AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 S
 DIST NetworkManager-0.7.0_pre20080817.tar.bz2 987249 RMD160 72233760f9c3a92eed029e122dad996d0a07361e SHA1 c6278980c6c321645415720c6e85ea76eec46f78 SHA256 aebb0341a5843b1f129e38b3264052382f8dd314af478f8542bf81b29f33f80c
 DIST NetworkManager-0.7.0_pre20080831.tar.bz2 994250 RMD160 74408ab1f83d57586f0638c1495ba2cf02d22f08 SHA1 5022e27bb4cd8dd247bc2f126450240aa0fe4387 SHA256 321452e4af34debff56059d107e875c9e57ec7626e83d9fe20164394b13d7ee1
 EBUILD networkmanager-0.7.0_pre20080817.ebuild 3376 RMD160 7c6e3840eab167fbab05453bfbc8e29c1b2a889c SHA1 9745fa140793aac136d16ca82a96aad4f4813b19 SHA256 e4eaf8bd288aa8ceb861206265d144d62e67603d23c3f1cb2d3c11f3a5bce027
-EBUILD networkmanager-0.7.0_pre20080831.ebuild 3459 RMD160 5597b4fb82e84b59787ce1322e5cb4b10a8e4d26 SHA1 e3fdfec5305d3e52fdb5e486248f77228eaf78a3 SHA256 aaa36236b730848c21e93baed623c5f5973acec0a148f3b142893055ee2ca01e
-EBUILD networkmanager-9999.ebuild 2279 RMD160 68d729e9d16b793902f690ddcd6b8383fd01cceb SHA1 b04f932f8b8b55f47ac5850adaf3c7263ab828e1 SHA256 5cfddaa3a8f6a1c3fb0f89fa49d3eb12b0a367a906514542c98dcac5a79c027d
+EBUILD networkmanager-0.7.0_pre20080831.ebuild 3464 RMD160 7acc641f68558157fda73966da57f945949466dc SHA1 197c0f0c4cd34f861aad42803ed637ad77e7ce85 SHA256 09879dd7b3de335b6d82c2fc4ba9853e72e7455ec757b6ac002d2f5edbd531a6
+EBUILD networkmanager-9999.ebuild 3740 RMD160 525ee37696228c3d86b3d785548dd8667c7632fa SHA1 d24c39d0dec7c9f40299c986a131bb6ec6d00cf2 SHA256 1ca2511a04dfebfbd9566fccf2ceecc38d0611f4caf38c8397e28b237422350a
 MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967
+MISC networkmanager-0.7.0_pre20080831.ebuild~ 3459 RMD160 5597b4fb82e84b59787ce1322e5cb4b10a8e4d26 SHA1 e3fdfec5305d3e52fdb5e486248f77228eaf78a3 SHA256 aaa36236b730848c21e93baed623c5f5973acec0a148f3b142893055ee2ca01e
+MISC networkmanager-9999.ebuild~ 5738 RMD160 637454baad619bde378aed0713caa7793dca3828 SHA1 17b668dade9efeeb8b8277387cdecfbd72467d13 SHA256 247d52a9438bcb3e9f835e450ee6c61cf199fcb335800b52d2860ed0e10febe0
diff --git a/net-misc/networkmanager/networkmanager-0.7.0_pre20080831.ebuild b/net-misc/networkmanager/networkmanager-0.7.0_pre20080831.ebuild
index 379e225..eb8d66f 100644
--- a/net-misc/networkmanager/networkmanager-0.7.0_pre20080831.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.0_pre20080831.ebuild
@@ -29,20 +29,19 @@ RDEPEND=">=sys-apps/dbus-1.2
 	gnutls? (
 		nss? ( >=dev-libs/nss-3.11 )
 		!nss? ( dev-libs/libgcrypt
-				net-libs/gnutls ) )
+			net-libs/gnutls ) )
 	!gnutls? ( >=dev-libs/nss-3.11 )
 
 	dhclient? (
 		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
 		!dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )
-	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-
-	doc? ( >=dev-util/gtk-doc-1.8 )"
+	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
-	net-dialup/ppp"
+	net-dialup/ppp
+        doc? ( >=dev-util/gtk-doc-1.8 )"
 
 PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 )
 	kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )"
diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild
index 133e32f..9e5af4b 100644
--- a/net-misc/networkmanager/networkmanager-9999.ebuild
+++ b/net-misc/networkmanager/networkmanager-9999.ebuild
@@ -2,10 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# Ebuild from http://forums.gentoo.org/viewtopic-t-629987.html
-
-
-inherit gnome2 subversion autotools eutils
+inherit autotools eutils subversion
 
 # NetworkManager likes itself with capital letters
 MY_P=${P/networkmanager/NetworkManager}
@@ -18,73 +15,121 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dhclient dhcpcd gnutls nss doc"
+IUSE="doc gnome nss gnutls dhclient dhcpcd"
+
+S=${WORKDIR}/${MY_P}
 
-# Yes, I know that configure will accept libnl 1.0-pre8, however we only have
-# 1.1 in the tree, therefore dep on it.
 RDEPEND=">=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.75
-	>=sys-apps/hal-0.5.9
-	>=dev-libs/libnl-1.1
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.5
-	>=dev-libs/glib-2.16
-	>=sys-auth/policykit-0.8
-
-	dhclient? (
-		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-		!dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )
-	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )"
+        >=dev-libs/dbus-glib-0.75
+        >=sys-apps/hal-0.5.10
+        >=net-wireless/wireless-tools-28_pre9
+        >=dev-libs/glib-2.16
+        >=sys-auth/policykit-0.8
+        >=dev-libs/libnl-1.1
+        >=net-wireless/wpa_supplicant-0.5.10
+        || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+
+        gnutls? (
+                nss? ( >=dev-libs/nss-3.11 )
+                !nss? ( dev-libs/libgcrypt  
+                                net-libs/gnutls ) )
+        !gnutls? ( >=dev-libs/nss-3.11 )
+
+        dhclient? (
+                dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+                !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )   
+        !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-util/intltool"
-PDEPEND="gnome? ( >=gnome-extra/nm-applet-9999 )"
+	dev-util/intltool
+	net-dialup/ppp
+	>=dev-util/gtk-doc-1.8
+	>=dev-util/intltool-0.35"
+
+#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
+		eerror "Please rebuild net-wireless/wpa_supplicant with the dbus useflag."
+		die "Fix wpa_supplicant first."
+	fi
+
+}
 
-DOCS="AUTHORS ChangeLog NEWS README"
-#USE_DESTDIR="1"
+src_unpack () {
+	subversion_src_unpack ${A}
+	cd "${S}"
 
-G2CONF="${G2CONF} \
-	--disable-more-warnings \
-	--localstatedir=/var \
-	--with-distro=gentoo"
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
+	gtkdocize
+	intltoolize
+	eautoreconf 
+}
 
-	# if both flags are used we default to dhcpcd
-	# if none flag is used we force dhcpcd
+src_compile() {
+	ECONF="--disable-more-warnings \
+		--localstatedir=/var \
+		--with-distro=gentoo \
+		--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
+			ECONF="${ECONF} --with-crypto=nss"
+		else
+			ECONF="${ECONF} --with-crypto=gnults"
+		fi
+	else
+		ECONF="${ECONF} --with-crypto=nss"
+	fi
 
+	econf ${ECONF} || die "econf failed"
+	emake || die "emake failed"
+}
 
-S=${WORKDIR}/${MY_P}
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
 
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
 
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
-	# Fix up the dbus conf file to use plugdev group
-	epatch "${FILESDIR}"/${P}-confchanges.patch
-	gtkdocize
-	eautoreconf
+	# Add keyfile plugin support
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	elog "You need to be in the plugdev group in order to use NetworkManager"
 	elog "Problems with your hostname getting changed?"
 	elog ""
 	elog "Add the following to /etc/dhcp/dhclient.conf"
 	elog 'send host-name "YOURHOSTNAME";'
 	elog 'supersede host-name "YOURHOSTNAME";'
-
+	elog ""
 	elog "You will need to restart DBUS if this is your first time"
 	elog "installing NetworkManager."
-} 
+	elog ""
+	elog "To save system-wide settings as a user, that user needs to have the"
+	elog "right policykit privileges. You can add them by running:"
+	elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify "USERNAME"'
+}