Split sunpinyin packages

(Portage version: 2.1.9.31/git/Linux x86_64, signed Manifest commit with key 17B157E9)

15 files changed, 274 insertions, 60 deletions

diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
new file mode 100644
index 0000000..e79fc0a
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ibus-sunpinyin-2.0.3-rc2.tar.gz 203937 RMD160 93225efcb975864ca855706f19e0492ebddd9790 SHA1 5cc3e5c32f42c5fe1f563813bf0467e10e2d67d9 SHA256 c22728fc86b97397709d651fdd2ac76f7a392078974ec4a2d89a91cac421f2b1
+EBUILD ibus-sunpinyin-2.0.3_rc2.ebuild 735 RMD160 9708f1d011f20775f572fd199c1cfbd9adbfd02b SHA1 e207b642bab2ed877d255e263219b95cbc5c7451 SHA256 6545df9006db62a19ee4b3732d552495336e5a56ffab556ba21a007fee2350c9
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNMBTlAAoJEDCzDeQXsVfph8YH/1shf5t5egzOX3GkZ/EMZJ64
+8YTt2mltdz92tMq8d42V/sS/0OyCBgfI3+HwnXGOqSjUJJtu5N12V3qSyNoD5N4r
+ZjioqNJEOvCZzAYfB02JmQA+GVbKStfdmRuRkjjsD+4s5VU/1IFUfjQofoZzu35k
+YJ7W3FGr04lEZTMzb4t+Fh/QLEuVFA+jHf7WeOrDUHCX1KZBAtvuJYx2zVkcv6Rn
+x759rgWzrq9F8pJFVFQavq71BkTHIJIThjAMhR/NqhIpo8sczDO7uvL2lwyJ/YWj
+MpxKoI7vXBYioPWCSEaZBMAbN58oH4EWKjH/0kikE+KqMNldKJn6i5bPT9x2U0Q=
+=44U8
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3_rc2.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3_rc2.ebuild
new file mode 100644
index 0000000..c33d9d0
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3_rc2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.2.ebuild,v 1.1 2010/12/02 07:03:49 qiaomuf Exp $
+
+EAPI="1"
+PYTHON_DEPEND="2:2.5"
+inherit python scons-utils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="The SunPinYin IMEngine for IBus Framework"
+HOMEPAGE="http://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus
+		app-i18n/sunpinyin"
+DEPEND="${RDEPEND}
+		sys-devel/gettext"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	escons --prefix="/usr"
+}
+
+src_install() {
+	escons --prefix="/usr" --install-sandbox="${D}" install
+}
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
new file mode 100644
index 0000000..2d5852c
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+</pkgmetadata>
diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest
new file mode 100644
index 0000000..bccab60
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST scim-sunpinyin-2.0.3-rc2.tar.gz 18026 RMD160 726e490ef6677f018262c5f47a4853aa579cf34b SHA1 1516cfc0ab7529a86685e8aaf327dab439526962 SHA256 55e719603341d36d8eb93157dc632a4dec566d577c4580d9e6f216139eadcb2a
+EBUILD scim-sunpinyin-2.0.3_rc2.ebuild 722 RMD160 63e03ffac7901b5d78fec88c518dc72a9592ea2e SHA1 52f9bb398a964c292a209ec81cee3189af751903 SHA256 0cfe081daca3ac4db19127ba478dc7946f0610dd1671d977c3b522705fc15418
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNMBTkAAoJEDCzDeQXsVfpunMH/3BJcSliEfnYy38eEAfmsOAy
+1WrMpGfrtY5Q1hBxiyynyjhc2niUVZHTgPXS5PVlO10fyMticzOGiVcx/BUcrGe2
+/FctmclF3R04udy54yC1kuFXpVbXlJpstzL5f0e/YmbzEPCsME/7lONOzsVITe05
+eWdqheo3dDNGkz6nxtOhQ0LZFGl9ngENUUVdENeoewcDqPTU2YQTlAmLYtANqxjE
+3DxGVL38oTzpoPPjgNcgX1f3blUGcLgftAcf8wON+iLvEf76cPxSeieC+SrfDQ5s
+pWFTwsRgZzDGGr7iK1/bOPy1HErHF97G0WSPZvuIAVm21/szlyny8gpoTpmxRSo=
+=Jfz8
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/scim-sunpinyin/metadata.xml b/app-i18n/scim-sunpinyin/metadata.xml
new file mode 100644
index 0000000..2d5852c
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+</pkgmetadata>
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3_rc2.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3_rc2.ebuild
new file mode 100644
index 0000000..ed24e26
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3_rc2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.2.ebuild,v 1.1 2010/12/02 07:03:49 qiaomuf Exp $
+
+EAPI="1"
+inherit scons-utils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="The SunPinyin IMEngine for Smart Common Input Method (SCIM)"
+HOMEPAGE="http://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-i18n/scim
+		app-i18n/sunpinyin
+		x11-libs/gtk+:2 "
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	escons --prefix="/usr"
+}
+
+src_install() {
+	escons --prefix="/usr" --install-sandbox="${D}" install
+}
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 8e10f37..afdeb73 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST dict.utf8.tar.bz2 1598995 RMD160 748e7e4e4f6e0f557b46dc8a7f1eb747210f3aea SHA1 44bfe155044326d2343aa2cf589db41a81cdaf13 SHA256 d8261f6b0bfcdd40a9c4f366228f86b017e06c9d7d64d6ddec1c2c3511eea805
 DIST lm_sc.t3g.arpa.tar.bz2 25098718 RMD160 f7ba622aa909ea624049f3572ec1363953dee974 SHA1 be340be53007637e58feba211715df59f9c86025 SHA256 c80093a8b43561e64158de4139967eef39b851432a2660e8050429d7560907cd
-DIST sunpinyin-all-in-one-2.0.3-rc2.tar.gz 502409 RMD160 3a0ecb33074202923c1fd519aa8dacf10092ffea SHA1 a04d8d837693d1ee7afd101054f3f0b254f33642 SHA256 228d1256198ee5a3dfd2c86a0e78ec851ee45a65c8bca04e899c6215fdc7abcb
-EBUILD sunpinyin-2.0.3_rc2.ebuild 1627 RMD160 7beb570f3af91e4c97206f58e87ca7a755a8fd7d SHA1 36319e286ce7b5fb57f11461b001eb750f69fc67 SHA256 2e72278099a20c0b81dfd88f121094c7488213f5a6f981944a95c13fcc0146c6
+DIST sunpinyin-2.0.3-rc2.tar.gz 168707 RMD160 ceeed6640ef92e3c669a1c30373ea773df96599f SHA1 b37787628e3ee2fe60631e09458cecdb2a7c7235 SHA256 754542d8d527349f593edc27c290b6f0518b12309b8e467cf76e62f384868c0c
+EBUILD sunpinyin-2.0.3_rc2.ebuild 1266 RMD160 1af6fdb03bd1922465130aa7a210da396a81f8e9 SHA1 fa2a837061aa8cac45a1aaf748d2ef5134d03d16 SHA256 55131cf27d0e2293eccff1c1ecba0af4a3e3ca118765c4b19118c7fbefe1e01d
 MISC ChangeLog 1335 RMD160 cbc90a470eebdea018781967b3774e8e648bba56 SHA1 cb34a0b6d7143318f07405e5d6d0efaf4883b54e SHA256 e9c3ce4f5daa6553dc2b9ed0da8fc74e3798824eda686eb39834cb6a5a45aa9a
-MISC metadata.xml 391 RMD160 fa545044e99c7fae6b12d20023180d3e850ba4bb SHA1 484471ed3d03c51cfc31e9bb6175eff8840e5d40 SHA256 006bf199298cb96e9cf411c18d755f1cb2f810d0ed4a88501b7f786e22fad8ba
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNL7uzAAoJEDCzDeQXsVfpylgH/1uwNf/QkpaSRyck8O2VrRoa
-fSdu/d2xNT6JiqKvWJNQYPFCXVwsQ6PAm/dxWvXmq+JsLSd/kmhhhW7JUeesLMMR
-ZFCbsdfAZOyVeGfH2kcAitm6vSRZ8w+Wm28yEY3AdVeYzwY5QjdANIwvawEDgFlX
-uBuSnw3dOIVxMqeahQ8n+r3DD64iSvCxSDB5dah2JIar2WC/aRecXwNbv/X4klYn
-bS9adOHNG6Ixt9AmfwbyJuWKne3JK9rBGKfzOdV/wUHT/r+v5ZehFwLnWejv3E3Z
-YSSzCzLgDCM7p8p19owFNnrb3WVhvtBcOsewXYEg3nLVzSrxS5qNSx/l1/xLXW8=
-=+4cm
+iQEcBAEBAgAGBQJNMBTkAAoJEDCzDeQXsVfph1AH/AnaMG+36JE2xT0sDc2IuRRB
+cd6RVhi1LZgdcOwYUhCHczySAVPdf+KtXtXEQsj1ZoBq8BQs5yfICdinM92/6grZ
+XYbmIe8fusGRliBycYC6dzIksAmagFfyPrDDAWiEkdQ8mNyM4WGMN1JMH0dsfemb
+FZiXmohvOSEhIkSb43nZ85vMRTZyCRqMICRG2fKXcT5oX0y/R3fpd5nwEUWNnI/o
+ffP8BraoHdgForNmCjk4zz02KaHl1ACLDJUMWtC/CdvQUzdIDmM/Z4MXzQLXZLZq
+ntIrhSx/j1HNMq2/a1S+zyvFm2wgTfebOxxcGwYyxw3l2IWmhzV/2sWV+oba+Ew=
+=6a5p
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/sunpinyin/metadata.xml b/app-i18n/sunpinyin/metadata.xml
index ecfb862..2d5852c 100644
--- a/app-i18n/sunpinyin/metadata.xml
+++ b/app-i18n/sunpinyin/metadata.xml
@@ -2,10 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>cjk</herd>
-<use>
-  <flag name='ibus'>Enable support for <pkg>app-i18n/ibus</pkg> input method
-    </flag>
-  <flag name='scim'>Enable support for <pkg>app-i18n/scim</pkg> input method</flag>
-  <flag name='xim'>Enable support for XIM</flag>
-</use>
 </pkgmetadata>
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3_rc2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3_rc2.ebuild
index 9c6187f..0f4e52e 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.3_rc2.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.3_rc2.ebuild
@@ -3,45 +3,28 @@
 # $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.2.ebuild,v 1.1 2010/12/02 07:03:49 qiaomuf Exp $
 
 EAPI="1"
-PYTHON_DEPEND="ibus? 2:2.5"
-inherit python scons-utils
+inherit scons-utils
 
 MY_P=${P/_/-}
-MY_PV=${PV/_/-}
-ARCHIVE="${PN}-all-in-one-${MY_PV}.tar.gz"
 
 DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
 HOMEPAGE="http://sunpinyin.googlecode.com"
-SRC_URI="${HOMEPAGE}/files/${ARCHIVE}
+SRC_URI="${HOMEPAGE}/files/${MY_P}.tar.gz
 		http://open-gram.googlecode.com/files/dict.utf8.tar.bz2
 		http://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2"
-RESTRICT="mirror"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ibus scim +xim"
+IUSE=""
 
-RDEPEND="dev-db/sqlite:3
-	ibus? (
-		>=app-i18n/ibus-1.1
-		sys-devel/gettext
-	)
-	xim? (
-		x11-libs/gtk+:2
-		x11-libs/libX11
-	)
-	scim? (
-		app-i18n/scim
-		x11-libs/gtk+:2
-	)"
+RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	xim? ( x11-proto/xproto )"
+		dev-util/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-	unpack "${ARCHIVE}"
+	unpack "${MY_P}.tar.gz"
 	mv "${DISTDIR}/dict.utf8.tar.bz2" "${S}/raw/" || die "dict file not found"
 	mv "${DISTDIR}/lm_sc.t3g.arpa.tar.bz2" "${S}/raw/" || die "dict file not found"
 }
@@ -52,14 +35,14 @@ src_compile() {
 
 src_install() {
 	escons --prefix="/usr" --install-sandbox="${D}" install
-	if use ibus; then
-		cd "${S}/wrapper/ibus"
-		escons --prefix="/usr" --install-sandbox="${D}" install
-	elif use xim; then
-		cd "${S}/wrapper/xim"
-		escons --prefix="/usr" --install-sandbox="${D}" install
-	elif use scim; then
-		cd "${S}/wrapper/scim"
-		escons --prefix="/usr" --install-sandbox="${D}" install
-	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "To use any wrapper for ${PN}, please merge any of the following"
+	elog "packages: "
+	elog "emerge app-i18n/ibus-sunpinyin"
+	elog "emerge app-i18n/scim-sunpinyin"
+	elog "emerge app-i18n/xsunpinyin"
+	elog ""
 }
diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
new file mode 100644
index 0000000..306fffb
--- /dev/null
+++ b/app-i18n/xsunpinyin/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST xsunpinyin-2.0.3-rc2.tar.gz 113509 RMD160 dd0980638878d2601cf61a0f57b53703e12c4008 SHA1 b0d9fa3e91fc3ba355dec721eb625f9855735943 SHA256 bb8dfc11008c8e8d757fb861e50c8832fcb8b1cd60909f8f3ac532138147bc73
+EBUILD xsunpinyin-2.0.3_rc2.ebuild 712 RMD160 aca3f17fd9f706a12df5edac33e62973ef784a27 SHA1 74f2f050c65139634ccd575463b67aa056db11de SHA256 5d7e4745c10aa0ff62b34e5a3c6709b4b20d49c79b7badd49a0a2dc1bc50644c
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNMBTkAAoJEDCzDeQXsVfpGqgIAJSN1eyRqJu5GvuBfVwY/0N5
+IOlzFjDKtdlegRAxQbzUZ1DMITWdqn7XiLU3Hc/tXUTKJ0L3uG+4fq1/ISWGPxA+
+GVs/RfHbwpnKb5U0VtEIbcpkS6cD5g/7Gi7+pg8pQFPOlA1jidyPXW1ZtcrdRqqz
++9Wf7PYb6qVN4kGAguT6w7/SD6BgWrsU0OJ8M1VkPx/wVklRH+FJ1eEyw5nIbzZR
+PCT3ApVnzJ/gJnjGVow4tSLx/WukgDbXdTuFyY1Dg6rD0OTmtkklHolTisKvTXM6
+cm8ljdBpJgJXfJsUzpUDjm41oJSWcwmTsKua+2IwSKfHYoXnIBamBg9EnJtzEK4=
+=NZzA
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
new file mode 100644
index 0000000..2d5852c
--- /dev/null
+++ b/app-i18n/xsunpinyin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+</pkgmetadata>
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.3_rc2.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.3_rc2.ebuild
new file mode 100644
index 0000000..4609172
--- /dev/null
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.3_rc2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.2.ebuild,v 1.1 2010/12/02 07:03:49 qiaomuf Exp $
+
+EAPI="1"
+inherit scons-utils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
+HOMEPAGE="http://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-i18n/sunpinyin
+		x11-libs/gtk+:2
+		x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	escons --prefix="/usr"
+}
+
+src_install() {
+	escons --prefix="/usr" --install-sandbox="${D}" install
+}
diff --git a/net-im/openfetion/Manifest b/net-im/openfetion/Manifest
index 23af704..17baee5 100644
--- a/net-im/openfetion/Manifest
+++ b/net-im/openfetion/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST openfetion-2.0.7.tar.gz 794386 RMD160 15bf83747d9825b4819d90cad7d080d68e85b05b SHA1 5b2a8abfa61928618c033ebc034b4a5f730003a6 SHA256 37bdab942713512ab02d34e1b16a810764e55688c93cd5daee88c64c50c22695
 DIST openfetion-2.1.0.tar.gz 369094 RMD160 f190894863713b916f76f962a3eeecc53f453715 SHA1 3f078bea8a3a2fa198deebd73ded8637a81f0176 SHA256 3bd06731b6bdbeb5a66c65061ca9887b965f835e7fabf6d5da9e72ad38e34d44
 EBUILD openfetion-2.0.7.ebuild 920 RMD160 57cd873fa9dfb73a1b5ae749ca0e4b6dc688ed3d SHA1 0ef3a361c038a907c1275a0289313ead7cea47ff SHA256 2a84b85d88b7e98c5c30b1c09850ff3f909494e693c96bf984e1195576a4fea9
 EBUILD openfetion-2.1.0.ebuild 1331 RMD160 e1d55525b227f70be032f0c529f9d6486c575930 SHA1 6be97535b75f4ece23121566d41a0a773a087654 SHA256 5ef015fb333fe9b0a6dde07391ed7c1e103752b1acf1ccdce20873103275efea
-MISC ChangeLog 246 RMD160 70512a2ada62cc065c03ab67a316916d7817f29b SHA1 ea3a97d6b93113203ce11cdf0239face0da9015d SHA256 7683cc21f892ff43de43abf3b00be6a1465b8353c244c519229cd2e6f1b42543
+MISC ChangeLog 412 RMD160 b32739502cd624cb10d6c28cc80027f593d4339b SHA1 1c30c2c704a7d0ba3dae5197d073f55b4a3c04cf SHA256 a5d70802e6fc5a7affa9d38795327f6a8ae21bca387ca089ad52b233d202d290
 MISC metadata.xml 216 RMD160 e99c47ba555ab9c5840db973af6b2bdd21127091 SHA1 ea3e97b8a730687767cf13495aeaa94ac17352c1 SHA256 778c8364ef437a2407d3bcda74a4d84b1a29902ac8ef3dd9de78405d7f54f5fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNMBTlAAoJEDCzDeQXsVfpSuEH/1gbclmWe4W2V9aUPUzz4ZJX
+VqiQDVKYD3x96TlEgqyJty3AkyKlHbJ/CZLaStsyd0bKOMQsvd6J+djSP8HAQhw6
+sA4TUpSoaotmqT3wA8KTcRo9dI0m3sBuhB9IoFZcu5lResIpyS+jD0LeeS0Vh6fx
+fv9cSbEb+rdtceZcLBWCVxEP3ItU8mRaT0gI9gItOrSjLwRLjmdfD35YaQao61ms
+ZiWXnZd3Spv1JI7m3vyynB/6MQzPbVuiuvtdl2tX2H6ePEZCSEQO6vwGKMmoiRLe
+rjPw7DFviLCKFswF/9jd988pnDkNhKJBvmEQkxU45/hfbGIHQSlIJoW+hMhAc+4=
+=Ecgl
+-----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 081bcb6..33e73ff 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,7 +5,7 @@ AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98
 AUX networkmanager-0.8.2-1.patch 6642 RMD160 466f7c2bd34043d13d1b265f4a52b172c594430e SHA1 7af80cb4ea3cf1d60566c8dacd3eadc3ef4cc186 SHA256 f29cfa186c9b77452266e9c303711c2368986fb7e5455e388a5dfe064e80b3e3
 AUX networkmanager-0.8.2-accept-gw.patch 3679 RMD160 b163afa5215f0eb52ba2562d22c65ec5e0bd3380 SHA1 a71f25413abf0c359439add74a73545790604ac9 SHA256 631ccad5bc4c2d880b5235bc8e6ace494467bad1734023ded9d8bcd52b9177af
 AUX networkmanager-0.8.2-confchanges.patch 1279 RMD160 1ff5b6d663aa4417beaf9c7630d710a17a1812b5 SHA1 634ad19b189509e75362e5cd7f069ca795b4aeba SHA256 7c9ed8dc35b5b6d0414f96902fbe8117408ad556af655c0afc593ec5a1beac28
-AUX networkmanager-0.8.2-shared-connection.patch 7075 RMD160 cf38a8c807d55299cf94cc8280caceda39ec1d19 SHA1 1a3aa09d7e728c046f9b99e485cd3dea8c30f279 SHA256 696c2d15f0f393f65036a06ca30ece29335fd6931da50bb1220cd1db7f7bc206
+AUX networkmanager-0.8.2-shared-connection.patch 9289 RMD160 8358c9cce6377aba34a7eee6413bca3e21064543 SHA1 612825aa41129c070909d63d47e0ec3dd061c6a5 SHA256 0c906511c32eb50692aa09878dec223f04b75301347870239b8b9cb10e527a8a
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 DIST NetworkManager-0.8.2.tar.bz2 1629296 RMD160 d5ef4adfc74db4a77fadcbeb545175b2f49dfd9c SHA1 2c9a9f0317d2ad4fd8a05631211cfd6040070f8e SHA256 58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1
@@ -16,11 +16,11 @@ MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNLVjdAAoJEDCzDeQXsVfpyh4H/RiVPVrI5DYBHxqyZHDoSmKQ
-dlXV2T6/k/3IojZ7U2H76t/oiu+fkX5vQn58oFlvERA8NfyWom4WmBhsVM8L3v4s
-9b4c8prklXh/t9ohFNegYj5hhcrl0lLfw6KPtmYHvOKV/7OlwfLWh96EYWyLDeA+
-5pNCE3Oyj9CgoFvqjC3OA2voC1vGnjDEcRFlcM66PpVDzZ919bUhBz0QVsaHQcgC
-3ELM35HuN5n+yGxbTpaB+Hbe/5B009Ra7/PAxa+k/gNPySlOHXrPrbx8f6N5bzBO
-VVKImQNdRlO/hL6/QXZn1tDHKux1Y7F00USbRGbaEeovEwjZh4eHTZigx4UQ7QM=
-=xa1/
+iQEcBAEBAgAGBQJNMBTkAAoJEDCzDeQXsVfpHnAIAIuFU6iZIAHdosYAirYYl0zO
+OcaQE4sJeFjL+N1tc2ZpX2p9VGEWUpoY/yqA563d9/ISwaUnwl4pV//kYYEOUsEE
+e3s62plA+daRwY3eTb5BJa+Z6rM2KhO7VGkDNOVDvyQEYuXuRkUMplVmdcAcBX7g
+FCGegXHhLGpeV/NkN4YRGqcLncTAVep3o1WP28EFd7q3rKgoYAL/jFaCyBhKJkae
+4dgGTDdCNcnb4hL4eRN7wEe0TJ3aGo8NqEWiaJhgYxclXH1vOXxHiL8Xk4x/Op4d
+ixJ9KRTOk+N6j8RI9a27j/xa3GYehtLKGKvk2V8Sr9q0d7e5Aydn2SXUWSzIzYc=
+=niVd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
index ebd24a6..6513221 100644
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
+++ b/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
@@ -1,4 +1,4 @@
-From 28cd0d7fec3c09bcace6f68501b9f5cd53b5f192 Mon Sep 17 00:00:00 2001
+From 5dc7075a1bb262b60880ee5130ee128e33f71b87 Mon Sep 17 00:00:00 2001
 From: Mu Qiao <qiaomuf@gentoo.org>
 Date: Wed, 5 Jan 2011 13:30:08 +0800
 Subject: [PATCH] Support shared and link-local method for ipv4
@@ -6,9 +6,11 @@ Subject: [PATCH] Support shared and link-local method for ipv4
 
 ---
  system-settings/plugins/ifnet/connection_parser.c  |   74 +++++++++++++++-----
+ system-settings/plugins/ifnet/net_parser.c         |    7 ++-
  system-settings/plugins/ifnet/net_utils.c          |    4 +
  .../plugins/ifnet/nm-ifnet-connection.c            |    8 ++-
- 3 files changed, 65 insertions(+), 21 deletions(-)
+ system-settings/plugins/ifnet/wpa_parser.c         |   14 ++--
+ 5 files changed, 78 insertions(+), 29 deletions(-)
 
 diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
 index f9fae51..703059d 100644
@@ -159,6 +161,30 @@ index f9fae51..703059d 100644
  
  	/* DNS Servers */
  	ifnet_set_data (conn_name, "dns_servers", NULL);
+diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c
+index b4a381d..a0b45cb 100644
+--- a/system-settings/plugins/ifnet/net_parser.c
++++ b/system-settings/plugins/ifnet/net_parser.c
+@@ -384,14 +384,17 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
+ 		return;
+ 	}
+ 	/* Remove existing key value pair */
++	if (value)
++		strip_string (value);
+ 	if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) {
++		if (value && !strcmp (orin_value, value))
++			return;
+ 		g_hash_table_remove (conn, orin_key);
+ 		g_free (orin_key);
+ 		g_free (orin_value);
+ 	}
+ 	if (value)
+-		g_hash_table_insert (conn, g_strdup (key),
+-				     strip_string (g_strdup (value), '"'));
++		g_hash_table_insert (conn, g_strdup (key), g_strdup (value), '"');
+ 	net_parser_data_changed = TRUE;
+ }
+ 
 diff --git a/system-settings/plugins/ifnet/net_utils.c b/system-settings/plugins/ifnet/net_utils.c
 index 2dc253c..7e52f10 100644
 --- a/system-settings/plugins/ifnet/net_utils.c
@@ -196,6 +222,40 @@ index e47495c..ebe2581 100644
  	object = (GObject *) g_object_new (NM_TYPE_IFNET_CONNECTION,
  					   NM_IFNET_CONNECTION_CONN_NAME,
  					   conn_name, NULL);
+diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c
+index 5e94108..879a026 100644
+--- a/system-settings/plugins/ifnet/wpa_parser.c
++++ b/system-settings/plugins/ifnet/wpa_parser.c
+@@ -454,8 +454,15 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
+ 	g_return_if_fail (security != NULL);
+ 
+ 	/* Remove old key value pairs */
++	if (value){
++		if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
++			&& !g_str_has_prefix (key, "wep_key"))
++			strip_string (value, '"');
++	}
+ 	if (g_hash_table_lookup_extended
+ 	    (security, key, &orig_key, &orig_value)) {
++		if (value && !strcmp(orig_value, value))
++			return;
+ 		g_hash_table_remove (security, orig_key);
+ 		g_free (orig_key);
+ 		g_free (orig_value);
+@@ -463,12 +470,7 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
+ 
+ 	/* Add new key value */
+ 	if (value) {
+-		gchar *new_value = g_strdup (value);
+-
+-		if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
+-		    && !g_str_has_prefix (key, "wep_key"))
+-			strip_string (new_value, '"');
+-		g_hash_table_insert (security, g_strdup (key), new_value);
++		g_hash_table_insert (security, g_strdup (key), g_strdup (value));
+ 	}
+ 	wpa_parser_data_changed = TRUE;
+ }
 -- 
 1.7.3.4