Add 0.6.5.98 (aka 0.6.6rc1) to the tree, include patch from Debian to use po/LINGUAS

Package-Manager: portage-2.1.4.4

4 files changed, 175 insertions, 2 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 658e349f568d..1e6f7838cd13 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.28 2008/02/14 05:35:29 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.29 2008/02/14 07:08:29 steev Exp $
+
+*networkmanager-0.6.5.98 (14 Feb 2008)
+
+  14 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  +files/NM-po-linguas.patch, +networkmanager-0.6.5.98.ebuild:
+  Add 0.6.5.98 (aka 0.6.6rc1) to the tree, include patch from Debian to use
+  po/LINGUAS.
 
   14 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
   networkmanager-0.6.5_p20070823.ebuild,
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 4c98b5c59632..ddbcb1e73b4d 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,12 +1,15 @@
+AUX NM-po-linguas.patch 966 RMD160 579d13567228f6747f979431b1ceec731daabf6c SHA1 9cffd4827b9141c1c49c09868fc8eaf1c6ce117a SHA256 1647b9e4b30529aee044ea5d5a4d71c7979943fa0d2bca23faf143a04083be70
 AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
 AUX networkmanager-0.6.5-confchanges.patch 1053 RMD160 ae76d5c029090848a9264e7559aaab90e7f3c084 SHA1 4847532aa15316a1a45e8667cd7947b514a1833f SHA256 bf3418ccbf8643d14b0413cf7a9d25290003d4443a7a051bb54f953aebede84f
 AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c9a365025e6b1b SHA1 a81be4e9c9bac854e092b82529c4ae2c12cdf91c SHA256 e1786f34a75d2e0a27ceccb960cf975176260886f70cc3e9b172180f8a1d2e6e
 AUX networkmanager-updatedbackend.patch 17700 RMD160 685132b4a98843416264f06c480ff205fa87f789 SHA1 a83d2b0ea7e4a563af3d14567ba1da3605fbf654 SHA256 ee4a1583db867fd6a1851a9dd243401166f29ee9d00ad6e03e5b677915e5bf43
 AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 SHA1 a9e269c9021888ca058b9fb72f9a71dc25a7488b SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402
+DIST NetworkManager-0.6.5.98.tar.gz 983047 RMD160 811a48d6a1e262f39cbf0a86b55baf2b90a584a5 SHA1 12c07338c425adbf9f3af35e65a77cd73fa8f65b SHA256 d62f1463f3c74ea0f059800c62ac631b3fd8471d90d461755403b5d1df94d28d
 DIST NetworkManager-0.6.5_p20070823.tar.gz 956975 RMD160 9d8556e3b5fc3155632bafdb726a5861412ae94b SHA1 c1d795cf114d2f5951a746eb4aa770e54eece9b6 SHA256 e6181ac9aadf1c36a20b979d313cfd0ae947bcf93f61c1c028cc1642c216454c
 DIST NetworkManager-0.6.5_p20080205.tar.gz 993199 RMD160 fcc8e2310da806e0603340d8acf79d5a7891048b SHA1 502f9fb1d3936a90c4ec01c71ca4b49687bd5e31 SHA256 30f3aec4f21c85190111535f69c35d6b8b0a393c63f767ff1ce869513f725b44
 DIST networkmanager-0.6.5_p20070823-updatedbackend.patch.bz2 5006 RMD160 f35c35a3db8dbd3178c8325a4eb8a641653a85f0 SHA1 5f9a3b1d85e4a08fa242ab1ff73c6d08ec2791d8 SHA256 0ee0ee38a3e5ac1f501d83dd424dd95e69871dd9e7d67cf2e09e9a378ae10fa8
+EBUILD networkmanager-0.6.5.98.ebuild 3037 RMD160 c6db2261a85e19e75d8222115248937101a3ded0 SHA1 85b7a9f2aca42968a7f183872c5b268ac0420655 SHA256 f2051a65ac9f5cb26cda10cf1b08ac9224c9c1dff58c5d1beb18b8766c4e91bb
 EBUILD networkmanager-0.6.5_p20070823.ebuild 2662 RMD160 1579d42a9ff716253a39438dc3ce1b8e596e3b73 SHA1 af1ab0739b042d562045773da7c1e3df2a6168aa SHA256 6a472351c0a61e6fe8779fbe8ac9bf4cb7b7e63de1e296af8eacbb3334376819
 EBUILD networkmanager-0.6.5_p20080205.ebuild 2861 RMD160 23b6e241563a868a28968da5493f7ed47bb2b8c1 SHA1 4026c993613436ff1af2e8a1dbe84d7ddb293bbb SHA256 1caaddd7dddb23ea4e92341bfc3dc4a07865b61e15061022d50e6d1f8abd0fb3
-MISC ChangeLog 6340 RMD160 5fb4872b82da91fae5782c4c07be6040b9cdfa18 SHA1 aa6c63d71597de84d8080ca5dafb590f0baba688 SHA256 9e8ceee7bd0d14fceaa6ac0ed1e6dcb1adff4ace480785d697317ac28e39864a
+MISC ChangeLog 6587 RMD160 029790c0983a69d4599483e238fc66a6bc0fd81a SHA1 2159e6f7d15b33c41b43cf73c0be47f6788dbdbe SHA256 f1b2544a8e13f5d3995ed8a43568a6d8e85da38d2d7f26573d1e85deaca4913f
 MISC metadata.xml 352 RMD160 dc1d33b6866b7a51fd60cc8508668cb80ccdf797 SHA1 401add51065c746c71da8b5992874c0556cedc04 SHA256 c5b303e6d5dbe90d34284c51a1c7ea8015e87c41d6f63446a1bf7ba5daf0d26d
diff --git a/net-misc/networkmanager/files/NM-po-linguas.patch b/net-misc/networkmanager/files/NM-po-linguas.patch
new file mode 100644
index 000000000000..50b5defbbce8
--- /dev/null
+++ b/net-misc/networkmanager/files/NM-po-linguas.patch
@@ -0,0 +1,64 @@
+Index: configure.in
+===================================================================
+--- configure.in	(Revision 3318)
++++ configure.in	(Arbeitskopie)
+@@ -46,8 +46,7 @@
+ GETTEXT_PACKAGE=NetworkManager
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+-ALL_LINGUAS="ar be@latin bg bs ca cs da de dz el en_CA en_GB es et fi fr gl gu hr hu it ja ka ko lt pl mk nb ne nl pa pt_BR rw sk sq sr@Latn sr sv uk vi wa zh_CN zh_TW"
+-AC_PROG_INTLTOOL([0.27.2])
++IT_PROG_INTLTOOL([0.35.0])
+ AM_GLIB_GNU_GETTEXT
+ 
+ dnl
+Index: po/LINGUAS
+===================================================================
+--- po/LINGUAS	(Revision 0)
++++ po/LINGUAS	(Revision 0)
+@@ -0,0 +1,45 @@
++# please keep this list sorted alphabetically
++#
++ar
++be@latin
++bg
++bs
++ca
++cs
++da
++de
++dz
++el
++en_CA
++en_GB
++es
++et
++fi
++fr
++gl
++gu
++hr
++hu
++it
++ja
++ka
++ko
++lt
++pl
++mk
++nb
++ne
++nl
++pa
++pt_BR
++rw
++sk
++sq
++sr@Latn
++sr
++sv
++uk
++vi
++wa
++zh_CN
++zh_TW
diff --git a/net-misc/networkmanager/networkmanager-0.6.5.98.ebuild b/net-misc/networkmanager/networkmanager-0.6.5.98.ebuild
new file mode 100644
index 000000000000..d4a087139e2d
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.6.5.98.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5.98.ebuild,v 1.1 2008/02/14 07:08:29 steev Exp $
+
+inherit autotools gnome2 eutils
+
+# NetworkManager likes itself with capital letters
+MY_P=${P/networkmanager/NetworkManager}
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+# Release candidate for 0.6.6, Hosted in dcbw's redhat space.
+SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz
+	mirror://gentoo/${PN}-0.6.5_p20070823-updatedbackend.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt doc gnome"
+
+# 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-0.60
+	>=sys-apps/hal-0.5.10
+	sys-apps/iproute2
+	>=dev-libs/libnl-1.1
+	>=net-misc/dhcdbd-1.4
+	>=net-wireless/wireless-tools-28_pre9
+	>=net-wireless/wpa_supplicant-0.4.8
+	>=dev-libs/glib-2.8
+	gnome? ( >=x11-libs/gtk+-2.8
+		>=gnome-base/libglade-2
+		>=gnome-base/gnome-keyring-0.4
+		>=gnome-base/gnome-panel-2
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnomeui-2 )
+	crypt? ( dev-libs/libgcrypt )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+PDEPEND="gnome? ( >gnome-extra/nm-applet-0.6.5 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
+
+G2CONF="${G2CONF} \
+	`use_with crypt gcrypt` \
+	`use_with gnome` \
+	--disable-more-warnings \
+	--localstatedir=/var \
+	--with-distro=gentoo \
+	--with-dbus-sys=/etc/dbus-1/system.d"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if built_with_use sys-apps/iproute2 minimal ; then
+		eerror "Please rebuild sys-apps/iproute2 without the minimal useflag."
+		die "Fix iproute2 first."
+	fi
+}
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	# Update to use our backend
+	epatch "${WORKDIR}/${PN}-0.6.5_p20070823-updatedbackend.patch"
+	# Use the kernel headers
+	epatch "${FILESDIR}/${PN}-use-kernel-headers.patch"
+	# Fix the resolv.conf permissions
+	epatch "${FILESDIR}/${PN}-resolvconf-perms.patch"
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
+	# Switch NM to using po/LINGUAS
+	epatch "${FILESDIR}/NM-po-linguas.patch"
+	# Since the switch to LINGUAS, need to regen configure
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
+	newinitd "${FILESDIR}/NetworkManagerDispatcher" NetworkManagerDispatcher
+}
+
+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 "You will need to restart DBUS if this is your first time"
+	elog "installing NetworkManager."
+}