Sync with portage [Mon Jan 28 12:35:22 MSK 2013].

2013-01-28 12:35:25 +04:00 · 2013-01-28 12:35:25 +04:00 · bb25a37a8d
commit bb25a37a8d
parent d0a524447a
86 changed files with 1401 additions and 624 deletions
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@ -6,4 +6,5 @@ DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9
 DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
 DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
 DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
+DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
--- a/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch
+++ b/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch
@ -1,46 +1,5 @@
 # Patch Makefile to patch insource newlib, 
 # Prevent internal downloading of external packages
-diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
--- stubdom/Makefile	2012-09-17 18:21:17.000000000 +0800
-+++ stubdom/Makefile	2012-12-05 14:01:10.694260256 +0800
-@@ -8,30 +8,30 @@
- include $(XEN_ROOT)/Config.mk
- 
- #ZLIB_URL?=http://www.zlib.net
-ZLIB_URL=$(XEN_EXTFILES_URL)
-+ZLIB_URL=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
- ZLIB_VERSION=1.2.3
- 
- #LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils
-LIBPCI_URL?=$(XEN_EXTFILES_URL)
-+LIBPCI_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
- LIBPCI_VERSION=2.2.9
- 
- #NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib
-NEWLIB_URL?=$(XEN_EXTFILES_URL)
-+NEWLIB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
- NEWLIB_VERSION=1.16.0
- 
- #LWIP_URL?=http://download.savannah.gnu.org/releases/lwip
-LWIP_URL?=$(XEN_EXTFILES_URL)
-+LWIP_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
- LWIP_VERSION=1.3.0
- 
- #GRUB_URL?=http://alpha.gnu.org/gnu/grub
-GRUB_URL?=$(XEN_EXTFILES_URL)
-+GRUB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
- GRUB_VERSION=0.97
- 
-#OCAML_URL?=$(XEN_EXTFILES_URL)
-+#OCAML_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
- OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11
- OCAML_VERSION=3.11.0
- 
-WGET=wget -c
-+WGET=cp -t . 
- 
- GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH)
- ifeq ($(XEN_TARGET_ARCH),x86_32)
@@ -95,12 +95,13 @@
 ##############
 
--- a/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch
+++ b/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch
@ -1,12 +0,0 @@
-diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
--- stubdom/Makefile	2012-12-05 08:01:01.480241322 +0800
-+++ stubdom/Makefile	2012-12-05 08:01:37.432238026 +0800
-@@ -101,6 +101,7 @@
- 	tar xzf $<
- 	patch -d $@ -p0 < newlib.patch
- 	patch -d $@ -p0 < newlib-chk.patch
-+	patch -d $@ -p0 < newlib-implicits.patch
- 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
- 	find $@ -type f | xargs perl -i.bak \
- 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
-
--- a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch
+++ b/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch
@ -0,0 +1,74 @@
+# Patch Makefile to patch insource newlib, 
+# Prevent internal downloading of external packages
+diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
+--- stubdom/Makefile	2012-09-17 18:21:17.000000000 +0800
+++ stubdom/Makefile	2012-12-05 14:01:10.694260256 +0800
+@@ -95,12 +95,13 @@
+ ##############
+ 
+ newlib-$(NEWLIB_VERSION).tar.gz:
+-	$(WGET) $(NEWLIB_URL)/$@
+#	$(WGET) $(NEWLIB_URL)/$@
+ 
+ newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
+ 	tar xzf $<
+ 	patch -d $@ -p0 < newlib.patch
+ 	patch -d $@ -p0 < newlib-chk.patch
+	patch -d $@ -p0 < newlib-implicits.patch
+ 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+ 	find $@ -type f | xargs perl -i.bak \
+ 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
+@@ -110,7 +110,7 @@
+ $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
+ 	mkdir -p newlib-$(XEN_TARGET_ARCH)
+ 	( cd newlib-$(XEN_TARGET_ARCH) && \
+-	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
+	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
+ 	  $(MAKE) DESTDIR= && \
+ 	  $(MAKE) DESTDIR= install )
+ 
+@@ -121,7 +122,7 @@
+ ############
+ 
+ zlib-$(ZLIB_VERSION).tar.gz:
+-	$(WGET) $(ZLIB_URL)/$@
+#	$(WGET) $(ZLIB_URL)/$@
+ 
+ zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
+ 	tar xzf $<
+@@ -141,7 +142,7 @@
+ ##############
+ 
+ pciutils-$(LIBPCI_VERSION).tar.bz2:
+-	$(WGET) $(LIBPCI_URL)/$@
+#	$(WGET) $(LIBPCI_URL)/$@
+ 
+ pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
+ 	tar xjf $<
+@@ -169,7 +170,7 @@
+ ######
+ 
+ lwip-$(LWIP_VERSION).tar.gz:
+-	$(WGET) $(LWIP_URL)/$@
+#	$(WGET) $(LWIP_URL)/$@
+ 
+ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
+ 	tar xzf $<
+@@ -325,7 +326,7 @@
+ ######
+ 
+ grub-$(GRUB_VERSION).tar.gz:
+-	$(WGET) $(GRUB_URL)/$@
+#$(WGET) $(GRUB_URL)/$@
+ 
+ grub-upstream: grub-$(GRUB_VERSION).tar.gz
+ 	tar xzf $<
+@@ -392,7 +393,7 @@
+ 	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
+ 	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
+ 
+-install-grub: pv-grub
+install-grub:
+ 	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
+ 	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz"
+ 
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1.ebuild
@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1.ebuild,v 1.1 2013/01/28 05:29:05 idella4 Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+DEPEND="sys-devel/gettext
+	sys-devel/gcc"
+
+RDEPEND="=app-emulation/xen-${PV}"
+
+src_prepare() {
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	#Substitute for internal downloading
+	cp $DISTDIR/zlib-1.2.3.tar.gz \
+		$DISTDIR/pciutils-2.2.9.tar.bz2 \
+		$DISTDIR/lwip-1.3.0.tar.gz \
+		$DISTDIR/newlib-1.16.0.tar.gz \
+		$DISTDIR/grub-0.97.tar.gz \
+		./stubdom/ || die "files not coped to stubdom"
+	# Note: tip to patch grub gentoo style, for review soon. This is around 1/3.
+#	cp "${WORKDIR}"/patch/{00[3-6]_all_grub*,010_all_grub*,01[3-9]_all_grub*,0[6-7]0_all_grub*} \
+#		"${WORKDIR}"/patch/{110_all_grub*,300_all_grub*} \
+#		 stubdom/grub.patches/ || die
+	einfo "files copied to stubdom"
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${P/-pvgrub/}-externals.patch
+
+	# Drop .config and Fix gcc-4.6
+	epatch 	"${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools/include
+
+	# TODO; fix those -j1
+	if use x86; then
+		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if use multilib; then
+			multilib_toolchain_setup x86
+			emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if use multilib; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+}
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@ -1,2 +1 @@
-DIST fcitx-rime-0.1.1.tar.xz 6316 SHA256 5a2b954e3feaf10bcb8d2f7fa414640a8e74c51d6aeabefba5c856703c326725 SHA512 e83dc354bab65a2fd75476a08843705a71cbd66e4f382b723caf34c6b2ac48bbc3ef7506c40c4ffe08df187090a3827f8e84831fcdb4ce884298456cf21d125b WHIRLPOOL e5d871a56b4065078ca46c21a0ba1b5e113ce9d52bdd11c97e2bf19fde945bf5b3511ec37c062e68684802dd8c3f2fd1bcf712f448c47b25eec47a9da709be1b
 DIST fcitx-rime-0.1.2.tar.xz 7356 SHA256 528472c13adb050543ba0402077d2e2b37258cb494f7d7900411cfd8c1ad9048 SHA512 325afed9807f99669d63c67bf1de33354697be924f5317e4020ae078755981c3a64d66d64f245bda6197fc2b0aef1a19b32a24e9a7c1a701d3b6b13653767a6a WHIRLPOOL b99177cecf5cce9e2c098e0d716f35a5add2ad0cd89ad655db81fb9c0e7bc4d111e6de1891d488af5eca29a65542af0c626d8cd0a69be87af5782db7905e3ef4
--- a/app-i18n/fcitx-rime/fcitx-rime-0.1.1.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.1.1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.1.1.ebuild,v 1.1 2012/09/01 10:52:19 yngwin Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="Rime Support for Fcitx"
-HOMEPAGE="http://code.google.com/p/rimeime/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-i18n/fcitx
-	app-i18n/librime
-	app-i18n/rime-data
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# dont build data resource here, already provided by app-i18n/rime-data
-	sed -i -e 's|add_subdirectory(data)||' CMakeLists.txt || die
-	# search correct data path
-	sed -i -e 's|/usr/share/rime/brise|/usr/share/rime-data|' \
-		cmake/FindBrise.cmake || die
-	sed -i -e '/ibus_rime_traits\.shared_data_dir/s/= shared_data_dir/= \
-		\"\/usr\/share\/rime-data\"/' src/fcitx-rime.c || die
-}
--- a/app-i18n/ibus-rime/Manifest
+++ b/app-i18n/ibus-rime/Manifest
@ -1,3 +1 @@
-DIST ibus-rime-0.9.2.tar.gz 23400 SHA256 204c00498293d1a1c28d785c540e57001cb92aa99d43806a2970afd100f1bcca SHA512 40405783f87f46d3a5a681c912869786686a276709d4b41f91f4df915951d7bc82ee6e907f2da346fcfb20c412fe7ccfc2fc50cfac507206b7b1fada67b826f7 WHIRLPOOL 21bb1f73a8dad7245c4f8848ab15232e5542ec837d8d76b3a0c1a1b2a934c152dd06a0366048dd2c8be282f1ae364142c610158b9528cba28607fd9d5a79e611
-DIST ibus-rime-0.9.3.tar.gz 24210 SHA256 62d584b999bbb68f2e7ba383334e47fb2935f8ac8fb40771b5f7e1ef003f77a5 SHA512 1394a914aad82d58021b9b91af1f4c1c0106089c7afc4c59622d6fdb2beef5b4abde179e4854055916e3c05df6ca3e5edd05b06e6d207662d581479e4003966d WHIRLPOOL c12ee3cbf5ba0a730fcceb296af1e18dc13b9abdfa54773ddd846a6a29bd1c34662bd325a2f60a1f37665ec4acec2f8e98a46d107077e08aa0c5dab1ac9a9228
 DIST ibus-rime-0.9.6.tar.gz 23519 SHA256 9c53967d9d592714802def9be44d87779e7590789d465b733e8ddb39ff60030d SHA512 f0dbf13ef7cc801fcb1e155a68081499a39b92760414ad913d2284f4e803174f25f32a8fbf415a6853e540804eeb228c0cc964b0cc1d23df05c3be61acf04c0e WHIRLPOOL edf91550d190a537b25161f01e9b06a04c67a0a36a107db7659d57a54fa61186c33ffe3dbb8aca789f39ccbf5e25441edb4169f9b115a924882209977dda8f19
--- a/app-i18n/ibus-rime/ibus-rime-0.9.2.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-0.9.2.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-rime/ibus-rime-0.9.2.ebuild,v 1.1 2012/09/01 10:54:20 yngwin Exp $
-
-EAPI=4
-
-inherit vcs-snapshot
-
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/rimeime/"
-SRC_URI="https://github.com/lotem/${PN}/tarball/rime-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="app-i18n/ibus
-	app-i18n/librime
-	x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
-	app-i18n/rime-data"
-
-src_prepare() {
-	sed -i -e "/libexecdir/s:/usr/lib:/usr/libexec:" Makefile || die
-	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
-}
--- a/app-i18n/ibus-rime/ibus-rime-0.9.3.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-0.9.3.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-rime/ibus-rime-0.9.3.ebuild,v 1.1 2013/01/15 09:21:12 naota Exp $
-
-EAPI=4
-
-inherit vcs-snapshot
-
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/rimeime/"
-SRC_URI="https://github.com/lotem/${PN}/tarball/rime-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="app-i18n/ibus
-	app-i18n/librime
-	x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
-	app-i18n/rime-data"
-
-src_prepare() {
-	sed -i -e "/libexecdir/s:/usr/lib:/usr/libexec:" Makefile || die
-	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
-}
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@ -1,3 +1 @@
-DIST librime-0.9.2.tar.gz 2303954 SHA256 90478a24f8635d8edb2b37f02e80a3b9358df32e0feab1c4b0e41fa51fda99f9 SHA512 62af91db5e52640551e970f4ad17622cd5629f360320bd4618e574890b3d380b5576a612b767fcfa2689f89cc1704bf79c300eb3733e2efda01c14c4449421fb WHIRLPOOL 9ed5fd3cbe4a213f5662a49fb46316756ffb34495cccd292ac5c2a2f757d69a978682d4e8d60aec8cca6e20257672197a27c5e901ef6b6fa5d5bed982efd0099
-DIST librime-0.9.4.tar.gz 2300407 SHA256 626082f5a2954686059445e414786691ee568777104ce8e093fbfd47c0095795 SHA512 739b656c9a56e3fc557e9aa3d2ec36f748463286ad84051ce707c43f83bbc1e1569ac88c1a8152d84315cbac600d1ffda1a387a282d66d9943556a2ef6e15688 WHIRLPOOL 1d5606372b17387071d290e7981153495c4f3b3107ba9644ed95d223b1ff082a52b53f904df9929e77abec6a0cfa4b6be51da6ca5b142a54cd39cb4818b44966
 DIST librime-0.9.6.tar.gz 2538446 SHA256 cb98bc3c79a6ea0a08dd5476158f7d222f83e3702d610d78807d609595bc6b8d SHA512 e50bf6a9b71f402a8db6a33afa3fdfcdd3edde971c25a0a965f56291c0b64be175c722626abe8c466599cf6bdeb13585afcc5eb02ebdae22ea2937ad846c5a45 WHIRLPOOL b1363615b877a2cb901152cecc5173ff819c7c6436531e2056b8a4fedf494653d1129b908902f8ead23bad1bb66b86d6c12c25843c1653ef81ab7d262529ab25
--- a/app-i18n/librime/librime-0.9.2.ebuild
+++ b/app-i18n/librime/librime-0.9.2.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.2.ebuild,v 1.2 2012/09/02 01:34:01 mr_bones_ Exp $
-
-EAPI=4
-
-inherit cmake-utils multilib vcs-snapshot
-
-DESCRIPTION="Rime Input Method Engine library"
-HOMEPAGE="http://code.google.com/p/rimeime/"
-SRC_URI="https://github.com/lotem/${PN}/tarball/rime-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="app-i18n/opencc
-	dev-cpp/glog
-	dev-cpp/yaml-cpp
-	dev-db/kyotocabinet
-	>=dev-libs/boost-1.46.0
-	sys-libs/zlib
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# patch the cmake system to make it disable data resource build
-	epatch "${FILESDIR}"/${PN}-data-option.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC)
-		-DBUILD_DATA=OFF
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
--- a/app-i18n/librime/librime-0.9.4.ebuild
+++ b/app-i18n/librime/librime-0.9.4.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.4.ebuild,v 1.1 2012/10/22 08:03:06 pinkbyte Exp $
-
-EAPI=4
-
-inherit cmake-utils multilib vcs-snapshot
-
-DESCRIPTION="Rime Input Method Engine library"
-HOMEPAGE="http://code.google.com/p/rimeime/"
-SRC_URI="http://rimeime.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="app-i18n/opencc
-	dev-cpp/glog
-	dev-cpp/yaml-cpp
-	dev-db/kyotocabinet
-	>=dev-libs/boost-1.46.0
-	sys-libs/zlib
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC)
-		-DBUILD_DATA=OFF
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
--- a/app-i18n/librime/librime-0.9.6.ebuild
+++ b/app-i18n/librime/librime-0.9.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.6.ebuild,v 1.1 2013/01/16 17:59:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.6.ebuild,v 1.2 2013/01/28 06:48:48 yngwin Exp $

 EAPI=4

@ -19,7 +19,7 @@ RDEPEND="app-i18n/opencc
 	dev-cpp/glog
 	dev-cpp/yaml-cpp
 	dev-db/kyotocabinet
-	>=dev-libs/boost-1.46.0
+	>=dev-libs/boost-1.46.0[threads(+)]
 	sys-libs/zlib
 	x11-proto/xproto"
 DEPEND="${RDEPEND}"
--- a/app-i18n/rime-data/Manifest
+++ b/app-i18n/rime-data/Manifest
@ -1,2 +1 @@
-DIST rime-data-0.9.2.tar.gz 4964478 SHA256 ce50b947b95116bdc7006476fa46a55121a260257a135257d1229dedf63fc5e8 SHA512 738a3a8119971582cbfd8a3d25f58af3f13d1fc63722b429e1446033843219ec1f4725799d2b41926f8c16af06c2260e2d2409bb669e463d21b824ee5eb5f45b WHIRLPOOL 1843ca41e27da1695e73da8cb8fd83bc8a3aca0b818dac0621b546460828ce07ca6a60e04ab30c8760d35dabac0c6074998e9acd3f7e71de5e90d5fc57099de0
 DIST rime-data-0.9.6.tar.gz 6783998 SHA256 8951f94c565106136b02094d8080f043900c4005a2599469e15991288bcc1763 SHA512 80e05e3b9060eec7c9c9a980202901d44a9cda1112d16294c357155741dc05853294b3da7bf59b5938073b43fe6098b99f36b88ca72eb5ee48fea352fe881179 WHIRLPOOL ccf9186cb7d36c5c875940989a51d5f449b0723a4cd0605e780b039072a3918f9acfa764d3ae5a1c060cd57fa053a8fd703dac758396e838b03187f876e28dee
--- a/app-i18n/rime-data/rime-data-0.9.2.ebuild
+++ b/app-i18n/rime-data/rime-data-0.9.2.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rime-data/rime-data-0.9.2.ebuild,v 1.2 2012/09/01 10:47:34 yngwin Exp $
-
-EAPI=4
-
-inherit vcs-snapshot
-
-DESCRIPTION="Data resources for Rime Input Method Engine"
-HOMEPAGE="http://code.google.com/p/rimeime/"
-SRC_URI="https://github.com/lotem/brise/tarball/rime-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-i18n/librime"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cp "${FILESDIR}"/Makefile "${S}" || die
-}
--- a/dev-libs/nspr/nspr-4.9.4.ebuild
+++ b/dev-libs/nspr/nspr-4.9.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.9 2013/01/21 16:27:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.10 2013/01/28 04:37:36 vapier Exp $

 EAPI=3
 WANT_AUTOCONF="2.1"
@ -47,35 +47,36 @@ src_prepare() {
 src_configure() {
 	cd "${S}"/build

+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf
 	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
 	case $(file "${T}"/test.o) in
-		*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";;
+		*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
 		*32-bit*|*ppc*|*i386*) ;;
 		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
 	esac
-	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"

-	LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \
+	ac_cv_path_AR="${AR}" \
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use_enable debug) \
 		$(use_enable !debug optimize) \
-		${myconf} || die "econf failed"
+		${myconf}
 }

 src_compile() {
 	cd "${S}"/build
-	if tc-is-cross-compiler; then
-		$(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/nsinstall.c \
-			-o config/native-nsinstall || die "failed to build nsinstall"
-		$(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/now.c \
-			-o config/native-now || die "failed to build now"
-		sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk
-		for d in pr/src lib/libc/src lib/ds; do
-			sed -s 's#/now$#/native-now#' -i ${d}/Makefile
-	done
-	fi
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "failed to build"
+	emake || die "failed to build"
 }

 src_install () {
@ -85,10 +86,8 @@ src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"

 	cd "${ED}"/usr/$(get_libdir)
-	for file in *.a; do
-		einfo "removing static libraries as upstream has requested!"
-		rm -f ${file} || die "failed to remove static libraries."
-	done
+	einfo "removing static libraries as upstream has requested!"
+	rm -f *.a || die "failed to remove static libraries."

 	local n=
 	# aix-soname.patch does this already
--- a/dev-libs/smack/Manifest
+++ b/dev-libs/smack/Manifest
@ -0,0 +1 @@
+DIST smack-0.5.0.tar.bz2 38923 SHA256 5fa0473bc988920e4d475fc57b1793c7dbe41f39105578291ceb3e5ad8f2bf32 SHA512 16c02538d44e3c53a783a5fd546a2813ae4da8e3d4e61fcc03a2c6c5127453ffaac1b5d5a04c499f6158d747b5cf37fdfa675dc4017d884f3eccb6dc0d76e754 WHIRLPOOL 406666a15ad2726e9868fc98ca43de34e22fd22e45f1ce35ba539c8b38c5723d11ec37ff05cc23589f328b6b309a9f8fbe6fc57e239b51aecdabdb0742c60924
--- a/dev-libs/smack/metadata.xml
+++ b/dev-libs/smack/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-libs/smack/smack-0.5.0.ebuild
+++ b/dev-libs/smack/smack-0.5.0.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/smack/smack-0.5.0.ebuild,v 1.1 2013/01/28 06:22:10 patrick Exp $
+
+EAPI=4
+DESCRIPTION="low-level IO storage which packs data into sorted compressed blobs"
+HOMEPAGE="http://reverbrain.com/smack/"
+SRC_URI="http://dev.gentoo.org/~patrick/${P}.tar.bz2"
+
+inherit eutils cmake-utils
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/snappy"
+RDEPEND="${DEPEND}"
--- a/dev-ruby/amatch/Manifest
+++ b/dev-ruby/amatch/Manifest
@ -1,2 +1,2 @@
 DIST amatch-0.2.10.gem 28160 SHA256 43d862821173432fbcc870b402fdfe6a966fde7f760fc4f9283af57e7951c263 SHA512 1a7a54d7abef30ebabcdf9d717d9d17df3c8aa5bb3e0e0f4da46fa9bf2db53df00c99463ff006055097b1c27a1e1b764356619a9e04c89e254fe93f955d9c5a4 WHIRLPOOL d0a32998fde9bc3b02d56a7805a1b43c6a4ee10e5a189486de09266189141de07c0651faf7bd155329345d326f555f2a280793b3616fa35b59f2698ef48b56a5
-DIST amatch-0.2.5.gem 41984 SHA256 a77602917c18ab72ce9b3490f091963710b0dbc7e3ff667ca00de6ca6155b8a5 SHA512 cf5f90c2f2bb926a9d0f0ecb88840fb5dc81f737dfa8b90092095fad6218a94732d7f8da40850c97d0321c993e1b0c2b9a5a193b4c2c37eec4b8bc784daf704b WHIRLPOOL 1666c65a37067139bc6c49b47b6bb46500c418c8e47f8e63a3dae5730cb6ce5a29b6e878e7033fe863230ae481a3fe6513f2d6e2f0b18b44fa2be7d151225f53
+DIST amatch-0.2.11.gem 28672 SHA256 3955bd06c0f9a208dd38bec6c2bc55d5aa8839c934e491f72ce99a48717a52ef SHA512 75b21173a0f4917ebe0418a09896eea04f46ba23eba371c589e1c27b492c40f820e866c6c2b8250c67179b757f11c12a1dff532c3fa55e27476904ad97f04b0b WHIRLPOOL 304bd97d8a6535401aa796732bbfc89467c22c41bba59e3c7bd9d25b69126b62a8247aeb3d7ffa8f69e240c62f7e399200e3c0c0fef4375ad924345c7b1f6c56
--- a/dev-ruby/amatch/amatch-0.2.11.ebuild
+++ b/dev-ruby/amatch/amatch-0.2.11.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amatch/amatch-0.2.11.ebuild,v 1.1 2013/01/28 07:17:36 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Approximate Matching Extension for Ruby"
+HOMEPAGE="http://flori.github.com/amatch/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/tins-0.3"
+
+each_ruby_configure() {
+	${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext
+	cp ext/amatch_ext$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb tests/* || die
+}
--- a/dev-ruby/amatch/amatch-0.2.5.ebuild
+++ b/dev-ruby/amatch/amatch-0.2.5.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amatch/amatch-0.2.5.ebuild,v 1.6 2012/05/01 18:24:06 armin76 Exp $
-
-EAPI=2
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template library for ruby like amrita"
-HOMEPAGE="http://flori.github.com/amatch/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 x86"
-IUSE=""
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@ -1,6 +1,4 @@
-DIST net-ssh-2.0.23.gem 129536 SHA256 395b5f604dfcbdb5e9a80967443941ec174321c7c6085b4b1d4130feaa7194ba SHA512 f2df54ad5ba4950e38495f55598d6075dcef10d0b6b824bc6d52b9dded2a08aabf6102c86908586e427a212ca9feef15760ef69450642dba926778e151aba96c WHIRLPOOL 9c59bae1c90f5530e24cb9b4eeaa8547047ef9950cd98aefb21efbca855baffe805952e2922a83a0aa488966790fc239ffacb9df6519b679adc3db9d1fab7665
-DIST net-ssh-2.1.3.gem 131584 SHA256 974211c9f7a0b7bb8752a19f806d00e7a4ba4ddb47928dcd8de27a71b4728975 SHA512 1d20cfe1fbd522a6c5b25e9f16df9b8a2b9071cc3fff2124746900842dfa5fc0b31f070df651e445f012659d8c663988c5892d4e38ad92060d6f5d31e3fd337f WHIRLPOOL 86489f089af3e958805af080697f3e579d1b0e8758ced631caa575f29e475ee6464bf0f0cbe65f5fcf8692cb86c4892fe6fa80722d223f7767cc11805a7b41eb
 DIST net-ssh-2.2.2.gem 133120 SHA256 211cf80d5d5805ca59723708a3cdfe43fa4dc30e5f86177a108f8cc2cd623487 SHA512 d2d7a463a8dc2f915e7050cdae1af8cd7e1d691700e47260f02728297b2616efba83cfac516febff37825c1c27070440dea1ddab057ae93e5085f9a83da94f63 WHIRLPOOL 3205074c56c046a4e7fd8c088256ca0c959eb4cfcfba3ba0616bf13fc3d790443eb6dc32647b68b2e25247522efd0f0c3ee27954e224938f3992efd85e42d2c1
 DIST net-ssh-git-2.4.0.tgz 135388 SHA256 d2e41ca9fd63c6235d556efd030b8bc0f515f9588ad22330884630c67b0a8eaa SHA512 6e851d3e231169f2b1411c8bdc44212cafb52dcbbbba9d8a757aa8fdf52af31efb698cc6bcc103aa4006caffcc9c929fd50be5ad323a8fd2c3fe97e6f23a484a WHIRLPOOL 1d55a43109cb8f69da9ccf55281b7456445c68ff4e9c730b479ca62d0a9dc9ed70b4fdfadfbfa81cb94f5815142685445f6b48e2ad9588bd96152fbd4530c369
-DIST net-ssh-git-2.6.1.tgz 157700 SHA256 a7006b102e4e62b577a792e18377dffcec1f3fab86d9104591fb30d7008eb62f SHA512 a8b6bb20dbd17ed04f97a7366ef41392d64e6c0cb00919d78a86712195ebd166551f345d6674661143ed3254a97b8e20a14670016133b6e85217af99319f3431 WHIRLPOOL c9330d1d94543a189129b6b8f98f4381fb69062f55d9d79896dfcf75d9e37295bb28ce5ead68b8645ca4c5cb830865dae0d050c127a0f3a12505abd702f0046f
 DIST net-ssh-git-2.6.2.tgz 157988 SHA256 e99e49299bc51810251e030a5da23c99eb755ca3a986615883fb100b5922cbe4 SHA512 bf487309f31d85a17ba647da8101b4a09bafa20c669105e7295c8414fabb0d2689ddbae81d25cf88d2f430c6a8f28f1067bde8c694a62deddb48d780eebb2cdc WHIRLPOOL 0b1e66f00fe26843f9aab763fc474c817f66a733e0831ec6f9ff507b3b8e53779a485e3aea6f918b46bdead9c48613d7dbbb7c8342d34d5fd764d47e5d0be693
+DIST net-ssh-git-2.6.3.tgz 158155 SHA256 1c7c35b13dd9e00ebbe7e4fdc5aa615b9de469dcd4f800d6b820f140508c670f SHA512 c5ee5f6224fcaf36c7e37d3528d7a402d2504fb859d7addd50ecba8e9e5dfa98a6d2c46d9815df80593991fac5d762fb490b1a036bcd611f67a0a4220b6e3c7e WHIRLPOOL f4d9ab716a839594f9033c77d9a730ffc78e186d45a384cffaeeb8f54913db2e33ee8908a6e02099bb5933c179da34b1308adb61d2312119f47149e22fd2f237
--- a/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild,v 1.8 2012/05/01 18:24:13 armin76 Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_TEST="" # Tests depend on test-unit-2.x which is masked.
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc THANKS.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="http://net-ssh.rubyforge.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
--- a/dev-ruby/net-ssh/net-ssh-2.1.3.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.1.3.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.1.3.ebuild,v 1.7 2012/05/01 18:24:13 armin76 Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc THANKS.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="http://net-ssh.rubyforge.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-# Explicit dependency on test-unit should be avoided but currently test
-# suite fails with 2.2.0. Reported upstream as a bug:
-# http://net-ssh.lighthouseapp.com/projects/36253-net-ssh/tickets/29-tests-fails-with-test-unit-220
-ruby_add_bdepend "test? ( ~dev-ruby/test-unit-2.1.2:2 dev-ruby/mocha )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
-}
--- a/dev-ruby/net-ssh/net-ssh-2.6.3.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.6.3.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.6.1.ebuild,v 1.1 2012/11/23 07:21:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.6.3.ebuild,v 1.1 2013/01/28 07:00:58 graaff Exp $

-EAPI=4
+EAPI=5
 # no longer compatible with ruby 1.8.
 USE_RUBY="ruby19"

@ -16,8 +16,7 @@ inherit ruby-fakegem

 DESCRIPTION="Non-interactive SSH processing in pure Ruby"
 HOMEPAGE="http://net-ssh.rubyforge.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/v${PV} -> net-ssh-git-${PV}.tgz"
-RUBY_S="${PN}-${PN}-*"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"

 LICENSE="GPL-2"
 SLOT="2.6"
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@ -1,2 +1,3 @@
 DIST roundcubemail-0.8.4.tar.gz 3723638 SHA256 9f52a0f4ad69df2da9636304ac3c072a13fbda197e7cfbc98a3516dda0fdc234 SHA512 a0d76584a59ea035be0ffa637956dc56745c32f3c84037e46b41b92650fe50d89db0be12103ae49a62a8a4286c9db05df3f13bb4453db9cff551baeddd92fb0a WHIRLPOOL d3dac3d89ad47c55049125433de107889ea28e4e9bda3839bab484271fc0ed179f55e04b454f021fd815dab2f68e59f3f0bcd94d76f7215f79d9dc3276fb3fbd
+DIST roundcubemail-0.8.5.tar.gz 3724025 SHA256 cd35d7c8c7886af7d2853ddd0970c57b5db037dc757647858a7a906d874e9824 SHA512 a1cb1e847a616a3d1c415610268b08377afb7230a3daf286ccf7b992bae61df00ef94455ab0770057793d148725c595db9d61f9f3dba80f1d77c668f7a5267cb WHIRLPOOL 5a6333172608f3ef3cfc85bbfa51450cdb7a7ca6a5d844ac2a125cd539daffe6c8d4b4a84d5c1bc57afbeceffd9bdfb72e6534e59d4d14d7eb08b2f582018848
 DIST roundcubemail-0.9-beta.tar.gz 3496947 SHA256 3cd2544f577b49b1e76c3f718b39f61f84f7a2561bc7c0b2d735c483ab2e9994 SHA512 f4f8b1b5a89ecf23176431955b15170179c57d9861e5dbe04cee447dfc93f9a1ff03d21fb1352f443ea31ea4bbb82cc6e3c98f6fc39c0c244e13a96a87f00bd7 WHIRLPOOL 5471d61766e61fb7639cec814582cc32b82859623f8378b5808e2f3a9e3c9d6ace590df7b05a186b2b57bea3ab6638e616ef29525264444bedef5128d369a271
--- a/mail-client/roundcube/roundcube-0.8.5.ebuild
+++ b/mail-client/roundcube/roundcube-0.8.5.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.8.5.ebuild,v 1.1 2013/01/28 07:08:49 radhermit Exp $
+
+EAPI="5"
+
+inherit webapp
+
+MY_PN="${PN}mail"
+MY_P="${MY_PN}-${PV/_/-}"
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="http://roundcube.net"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap +mysql postgres ssl spell"
+
+RDEPEND="virtual/httpd-php
+	>=dev-lang/php-5.3[crypt,gd,iconv,json,ldap?,postgres?,session,sockets,ssl?,xml,unicode]
+	mysql? (
+		|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )
+		|| ( dev-php/PEAR-MDB2_Driver_mysql dev-php/PEAR-MDB2_Driver_mysqli )
+	)
+	postgres? ( dev-php/PEAR-MDB2_Driver_pgsql )
+	spell? ( dev-lang/php[curl,spell] )
+	>=dev-php/PEAR-MDB2-2.5.0_beta3
+	>=dev-php/PEAR-Mail_Mime-1.8.1
+	>=dev-php/PEAR-Net_SMTP-1.4.2
+	>=dev-php/PEAR-Net_IDNA2-0.1.1
+	>=dev-php/PEAR-Auth_SASL-1.0.3"
+
+need_httpd_cgi
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cp config/db.inc.php{.dist,} || die
+	cp config/main.inc.php{.dist,} || die
+
+	# Remove bundled PEAR packages
+	rm -r program/lib/{Auth,Mail,MDB2*,Net,PEAR*} || die
+}
+
+src_install() {
+	webapp_src_preinst
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/{db,main}.inc.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-0.6.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en-0.6.txt
+	webapp_postupgrade_txt en UPGRADING
+	webapp_src_install
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 28 Jan 2013 04:40:35 +0000
+Mon, 28 Jan 2013 07:36:52 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 28 Jan 2013 04:40:35 +0000
+Mon, 28 Jan 2013 07:36:52 +0000
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-devel/gettext sys-devel/gcc
+DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
+EAPI=4
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==app-emulation/xen-4.2.1
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.1/xen-4.2.1.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3215667e15a9a17abce5084f0ef2d400
--- a/metadata/md5-cache/app-i18n/fcitx-rime-0.1.1
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-0.1.1
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-i18n/fcitx app-i18n/librime app-i18n/rime-data x11-libs/libnotify >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Rime Support for Fcitx
-EAPI=4
-HOMEPAGE=http://code.google.com/p/rimeime/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/fcitx app-i18n/librime app-i18n/rime-data x11-libs/libnotify
-SLOT=0
-SRC_URI=https://fcitx.googlecode.com/files/fcitx-rime-0.1.1.tar.xz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	3cb7a29aafd4b984d2bf12bc50abe5da	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ccd162e1880fe914166075fbfc4bb3ef
--- a/metadata/md5-cache/app-i18n/ibus-rime-0.9.2
+++ b/metadata/md5-cache/app-i18n/ibus-rime-0.9.2
@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake
-DESCRIPTION=Rime Input Method Engine for IBus Framework
-EAPI=4
-HOMEPAGE=http://code.google.com/p/rimeime/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify app-i18n/rime-data
-SLOT=0
-SRC_URI=https://github.com/lotem/ibus-rime/tarball/rime-0.9.2 -> ibus-rime-0.9.2.tar.gz
-_eclasses_=vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
-_md5_=83e88d0ad32b163457fa1a8383b9be02
--- a/metadata/md5-cache/app-i18n/ibus-rime-0.9.3
+++ b/metadata/md5-cache/app-i18n/ibus-rime-0.9.3
@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake
-DESCRIPTION=Rime Input Method Engine for IBus Framework
-EAPI=4
-HOMEPAGE=http://code.google.com/p/rimeime/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify app-i18n/rime-data
-SLOT=0
-SRC_URI=https://github.com/lotem/ibus-rime/tarball/rime-0.9.3 -> ibus-rime-0.9.3.tar.gz
-_eclasses_=vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
-_md5_=6dc4f78534056a67f77c346cefdb566c
--- a/metadata/md5-cache/app-i18n/librime-0.9.2
+++ b/metadata/md5-cache/app-i18n/librime-0.9.2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-i18n/opencc dev-cpp/glog dev-cpp/yaml-cpp dev-db/kyotocabinet >=dev-libs/boost-1.46.0 sys-libs/zlib x11-proto/xproto >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Rime Input Method Engine library
-EAPI=4
-HOMEPAGE=http://code.google.com/p/rimeime/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/opencc dev-cpp/glog dev-cpp/yaml-cpp dev-db/kyotocabinet >=dev-libs/boost-1.46.0 sys-libs/zlib x11-proto/xproto
-SLOT=0
-SRC_URI=https://github.com/lotem/librime/tarball/rime-0.9.2 -> librime-0.9.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	3cb7a29aafd4b984d2bf12bc50abe5da	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
-_md5_=c2a169c70a8a28a4bfec72f767a1174a
--- a/metadata/md5-cache/app-i18n/librime-0.9.4
+++ b/metadata/md5-cache/app-i18n/librime-0.9.4
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-i18n/opencc dev-cpp/glog dev-cpp/yaml-cpp dev-db/kyotocabinet >=dev-libs/boost-1.46.0 sys-libs/zlib x11-proto/xproto >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Rime Input Method Engine library
-EAPI=4
-HOMEPAGE=http://code.google.com/p/rimeime/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/opencc dev-cpp/glog dev-cpp/yaml-cpp dev-db/kyotocabinet >=dev-libs/boost-1.46.0 sys-libs/zlib x11-proto/xproto
-SLOT=0
-SRC_URI=http://rimeime.googlecode.com/files/librime-0.9.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	3cb7a29aafd4b984d2bf12bc50abe5da	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
-_md5_=2b866a9366e1934d980df7a8088de953
--- a/metadata/md5-cache/app-i18n/librime-0.9.6
+++ b/metadata/md5-cache/app-i18n/librime-0.9.6
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-i18n/opencc dev-cpp/glog dev-cpp/yaml-cpp dev-db/kyotocabinet >=dev-libs/boost-1.46.0 sys-libs/zlib x11-proto/xproto >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=app-i18n/opencc dev-cpp/glog dev-cpp/yaml-cpp dev-db/kyotocabinet >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Rime Input Method Engine library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/rimeime/
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-i18n/opencc dev-cpp/glog dev-cpp/yaml-cpp dev-db/kyotocabinet >=dev-libs/boost-1.46.0 sys-libs/zlib x11-proto/xproto
+RDEPEND=app-i18n/opencc dev-cpp/glog dev-cpp/yaml-cpp dev-db/kyotocabinet >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto
 SLOT=0
 SRC_URI=https://github.com/lotem/librime/tarball/rime-0.9.6 -> librime-0.9.6.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	3cb7a29aafd4b984d2bf12bc50abe5da	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
-_md5_=b6096c66e00939ac31de443a7ab9a7e4
+_md5_=f883b98b5f015131126702a220ac919a
--- a/metadata/md5-cache/app-i18n/rime-data-0.9.2
+++ b/metadata/md5-cache/app-i18n/rime-data-0.9.2
@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-i18n/librime
-DESCRIPTION=Data resources for Rime Input Method Engine
-EAPI=4
-HOMEPAGE=http://code.google.com/p/rimeime/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/librime
-SLOT=0
-SRC_URI=https://github.com/lotem/brise/tarball/rime-0.9.2 -> rime-data-0.9.2.tar.gz
-_eclasses_=vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
-_md5_=aad6c859aaed4f6e758b33370a3ab44b
--- a/metadata/md5-cache/dev-libs/nspr-4.9.4
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.4
@ -9,4 +9,4 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.4/src/nspr-4.9.4.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3ea96e819a150b41f26cbc76fd801139
+_md5_=e3fd18f9e4b407ba98b8c726fcd0785d
--- a/metadata/md5-cache/dev-libs/smack-0.5.0
+++ b/metadata/md5-cache/dev-libs/smack-0.5.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/snappy >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=low-level IO storage which packs data into sorted compressed blobs
+EAPI=4
+HOMEPAGE=http://reverbrain.com/smack/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-arch/snappy
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~patrick/smack-0.5.0.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	3cb7a29aafd4b984d2bf12bc50abe5da	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=974cd314b5c4825eb5b460b395405e85
--- a/metadata/md5-cache/dev-ruby/amatch-0.2.11
+++ b/metadata/md5-cache/dev-ruby/amatch-0.2.11
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/tins-0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/tins-0.3[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/tins-0.3[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Approximate Matching Extension for Ruby
+EAPI=5
+HOMEPAGE=http://flori.github.com/amatch/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/tins-0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/tins-0.3[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/tins-0.3[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=0
+SRC_URI=mirror://rubygems/amatch-0.2.11.gem
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ad4e0a398aac2942771491ecda1b27c0
--- a/metadata/md5-cache/dev-ruby/amatch-0.2.5
+++ b/metadata/md5-cache/dev-ruby/amatch-0.2.5
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
-DESCRIPTION=A template library for ruby like amrita
-EAPI=2
-HOMEPAGE=http://flori.github.com/amatch/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
-SLOT=0
-SRC_URI=mirror://rubygems/amatch-0.2.5.gem
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=48936a29a5b56659860cbb287e8a72b1
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.0.23
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.0.23
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=2
-HOMEPAGE=http://net-ssh.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 doc test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
-SLOT=2
-SRC_URI=mirror://rubygems/net-ssh-2.0.23.gem
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=08841eb22da13f09a4b8e12d80d35c06
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.1.3
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.1.3
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( ~dev-ruby/test-unit-2.1.2:2[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/test-unit-2.1.2:2[ruby_targets_ree18] dev-ruby/mocha[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=2
-HOMEPAGE=http://net-ssh.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-SLOT=2
-SRC_URI=mirror://rubygems/net-ssh-2.1.3.gem
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c83e83d692ac817d4d2f8776b92a9501
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.6.3
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.6.3
@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=4
+EAPI=5
 HOMEPAGE=http://net-ssh.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=2.6
-SRC_URI=https://github.com/net-ssh/net-ssh/tarball/v2.6.1 -> net-ssh-git-2.6.1.tgz
+SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.6.3.tar.gz -> net-ssh-git-2.6.3.tgz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0c1abc8e0c627b8425cf0f123eee20ea
+_md5_=89b963aa9584a07888cb070ae2b49b04
--- a/metadata/md5-cache/mail-client/roundcube-0.8.5
+++ b/metadata/md5-cache/mail-client/roundcube-0.8.5
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=5
+HOMEPAGE=http://roundcube.net
+IUSE=ldap +mysql postgres ssl spell vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=virtual/httpd-php >=dev-lang/php-5.3[crypt,gd,iconv,json,ldap?,postgres?,session,sockets,ssl?,xml,unicode] mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) || ( dev-php/PEAR-MDB2_Driver_mysql dev-php/PEAR-MDB2_Driver_mysqli ) ) postgres? ( dev-php/PEAR-MDB2_Driver_pgsql ) spell? ( dev-lang/php[curl,spell] ) >=dev-php/PEAR-MDB2-2.5.0_beta3 >=dev-php/PEAR-Mail_Mime-1.8.1 >=dev-php/PEAR-Net_SMTP-1.4.2 >=dev-php/PEAR-Net_IDNA2-0.1.1 >=dev-php/PEAR-Auth_SASL-1.0.3 >=app-admin/webapp-config-1.50.15
+SLOT=0.8.5
+SRC_URI=mirror://sourceforge/roundcubemail/roundcubemail-0.8.5.tar.gz
+_eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=ab05aa9fa6d04ed4a8d6cf667668a558
--- a/metadata/md5-cache/net-misc/modemmanager-0.4
+++ b/metadata/md5-cache/net-misc/modemmanager-0.4
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.18 virtual/udev[gudev] >=dev-libs/dbus-glib-0.86 net-dialup/ppp policykit? ( >=sys-auth/polkit-0.95 ) >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Modem and mobile broadband management libraries
-EAPI=2
-HOMEPAGE=http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html
-IUSE=doc policykit test
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.18 virtual/udev[gudev] >=dev-libs/dbus-glib-0.86 net-dialup/ppp policykit? ( >=sys-auth/polkit-0.95 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/ModemManager/0.4/ModemManager-0.4.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0cdd4a227f54991ba1b13f5142dc5f8b
--- a/metadata/md5-cache/net-misc/modemmanager-0.5.2.0-r2
+++ b/metadata/md5-cache/net-misc/modemmanager-0.5.2.0-r2
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=dev-libs/glib-2.18:2 virtual/udev[gudev] >=dev-libs/dbus-glib-0.86 net-dialup/ppp policykit? ( >=sys-auth/polkit-0.99 ) doc? ( dev-libs/libxslt ) >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Modem and mobile broadband management libraries
-EAPI=4
-HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
-IUSE=doc policykit test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.18:2 virtual/udev[gudev] >=dev-libs/dbus-glib-0.86 net-dialup/ppp policykit? ( >=sys-auth/polkit-0.99 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/ModemManager/0.5/ModemManager-0.5.2.0.tar.xz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=18fff92d07c4c7c9c39fd7583aede610
--- a/metadata/md5-cache/net-misc/modemmanager-0.5.2.0-r3
+++ b/metadata/md5-cache/net-misc/modemmanager-0.5.2.0-r3
@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
 IUSE=doc policykit test
 KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=LGPL-2.1
+LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.18:2 virtual/udev[gudev] >=dev-libs/dbus-glib-0.86 net-dialup/ppp policykit? ( >=sys-auth/polkit-0.99 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/ModemManager/0.5/ModemManager-0.5.2.0.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d101a1d621b50ee57159a4c3bc9e4af6
+_md5_=b01d293419a7df91661811acc9169fb7
--- a/metadata/md5-cache/net-misc/modemmanager-0.6.0.0
+++ b/metadata/md5-cache/net-misc/modemmanager-0.6.0.0
@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
 IUSE=doc policykit test
 KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1
+LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.18:2 virtual/udev[gudev] >=dev-libs/dbus-glib-0.86 net-dialup/ppp policykit? ( >=sys-auth/polkit-0.99 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/ModemManager/0.6/ModemManager-0.6.0.0.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f064a96c9c75a4d13fd05590dea7f630
+_md5_=69d93da157cd4c4252a722951a358e70
--- a/metadata/md5-cache/net-misc/modemmanager-0.7.990
+++ b/metadata/md5-cache/net-misc/modemmanager-0.7.990
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/glib-2.30.2:2 net-dialup/ppp >=virtual/udev-147[gudev] policykit? ( >=sys-auth/polkit-0.106 ) doc? ( app-office/dia dev-libs/libxslt dev-util/gtk-doc ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Modem and mobile broadband management libraries
+EAPI=5
+HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
+IUSE=doc policykit test test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.30.2:2 net-dialup/ppp >=virtual/udev-147[gudev] policykit? ( >=sys-auth/polkit-0.106 )
+SLOT=0/1
+SRC_URI=mirror://gnome/sources/ModemManager/0.7/ModemManager-0.7.990.tar.xz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=b3ec0a8d0c5510772e1a74762d145922
--- a/metadata/md5-cache/net-misc/modemmanager-9999
+++ b/metadata/md5-cache/net-misc/modemmanager-9999
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=>=dev-libs/glib-2.30.2:2 net-dialup/ppp >=virtual/udev-147[gudev] policykit? ( >=sys-auth/polkit-0.106 ) qmi? ( net-libs/libqmi ) doc? ( app-office/dia dev-libs/libxslt dev-util/gtk-doc ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Modem and mobile broadband management libraries
+EAPI=5
+HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
+IUSE=doc policykit +qmi qmi-newest test test
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.30.2:2 net-dialup/ppp >=virtual/udev-147[gudev] policykit? ( >=sys-auth/polkit-0.106 ) qmi? ( net-libs/libqmi )
+REQUIRED_USE=qmi-newest? ( qmi )
+SLOT=0/1
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=8ea158973f7e2d148ba2242d62678444
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.7.995
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.7.995
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup test
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.990 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-power/upower ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
+EAPI=5
+HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
+IUSE=avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala +wext test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.990 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-power/upower ) consolekit? ( sys-auth/consolekit )
+REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd ) ?? ( consolekit systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.7.995.tar.xz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	gnome.org	8fef8f967214f56e08fa92d61163d891	linux-info	c27564a568491445be036a10498ed8be	multilib	ded93e450747134a079e647d888aa80b	systemd	28706ddc21464b4ed255eee9fc70b516	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	vala	ad1e7234faa2244a7e10f1c864371475	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=2045162e6b8fd7573e2d2a1190f25270
--- a/metadata/md5-cache/net-misc/networkmanager-9999
+++ b/metadata/md5-cache/net-misc/networkmanager-9999
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup test unpack
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.990 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-power/upower ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) dev-libs/vala-common dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git app-arch/xz-utils test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
+EAPI=5
+HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
+IUSE=avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala +wext test
+LICENSE=GPL-2+
+RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.990 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-power/upower ) consolekit? ( sys-auth/consolekit )
+REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd ) ?? ( consolekit systemd )
+SLOT=0
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	c27564a568491445be036a10498ed8be	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	28706ddc21464b4ed255eee9fc70b516	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	vala	ad1e7234faa2244a7e10f1c864371475	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=5885fe57446f64da5b7e660aed91c264
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-19-r1
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-19-r1
@ -3,6 +3,7 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=udev startup scripts for openrc
 EAPI=4
 HOMEPAGE=http://www.gentoo.org
+IUSE=build
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/udev-180 sys-apps/openrc !<sys-fs/udev-186
@ -10,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~williamh/dist/udev-init-scripts-19.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bf184fc3fe5edc10d222af05c0e39d7f
+_md5_=f658f7444c92a460a0e82c6bfd7484bb
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-22
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-22
@ -3,6 +3,7 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=udev startup scripts for openrc
 EAPI=4
 HOMEPAGE=http://www.gentoo.org
+IUSE=build
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/udev-180 sys-apps/openrc !<sys-fs/udev-186
@ -10,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~williamh/dist/udev-init-scripts-22.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a1833fbc70c2b18bc11e056109698f65
+_md5_=ff833988f8657fdaa1a04aaf10b4c4d1
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-9999
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-9999
@ -3,9 +3,10 @@ DEPEND=virtual/pkgconfig dev-vcs/git
 DESCRIPTION=udev startup scripts for openrc
 EAPI=4
 HOMEPAGE=http://www.gentoo.org
+IUSE=build
 LICENSE=GPL-2
 RDEPEND=>=virtual/udev-180 sys-apps/openrc !<sys-fs/udev-186
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	e92e09651292b1bef5656592364550f7	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9220f0b2798eb0846ad8b133691d0ec7
+_md5_=09963df1a31d8bc28cc20b5afa4144c1
--- a/metadata/md5-cache/www-client/weboob-0e
+++ b/metadata/md5-cache/www-client/weboob-0e
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X] dev-python/pyxdg ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DESCRIPTION=Weboob (Web Out of Browsers) provides several applications to interact with a lot of websites.
+EAPI=5
+HOMEPAGE=http://weboob.org/
+IUSE=X +secure-updates fast-libs
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3
+RDEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X] dev-python/pyxdg ) dev-python/prettytable dev-python/html2text dev-python/mechanize dev-python/python-dateutil dev-python/pyyaml dev-python/imaging dev-python/gdata dev-python/feedparser secure-updates? ( app-crypt/gnupg ) fast-libs? ( dev-python/simplejson dev-python/pyyaml[libyaml] ) || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) || ( ( <dev-python/lxml-3.0 ) ( >=dev-python/lxml-3.0 dev-python/cssselect ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+SLOT=0
+SRC_URI=http://symlink.me/attachments/download/206/weboob-0.e.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	ded93e450747134a079e647d888aa80b	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f5872b14d38d3b6f99e2fb8f4b454c0e
--- a/metadata/md5-cache/www-client/weboob-9998
+++ b/metadata/md5-cache/www-client/weboob-9998
@ -8,4 +8,4 @@ LICENSE=AGPL-3
 RDEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X] dev-python/pyxdg ) dev-python/prettytable dev-python/html2text dev-python/mechanize dev-python/python-dateutil dev-python/pyyaml dev-python/imaging dev-python/gdata dev-python/feedparser secure-updates? ( app-crypt/gnupg ) fast-libs? ( dev-python/simplejson dev-python/pyyaml[libyaml] ) || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) || ( ( <dev-python/lxml-3.0 ) ( >=dev-python/lxml-3.0 dev-python/cssselect ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	e92e09651292b1bef5656592364550f7	multilib	ded93e450747134a079e647d888aa80b	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f7dfe8e0ee19af66955509333d3041c8
+_md5_=faeed0930c0c3a41395a5c6bdee96a83
--- a/metadata/md5-cache/www-client/weboob-9999
+++ b/metadata/md5-cache/www-client/weboob-9999
@ -8,4 +8,4 @@ LICENSE=AGPL-3
 RDEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X] dev-python/pyxdg ) dev-python/prettytable dev-python/html2text dev-python/mechanize dev-python/python-dateutil dev-python/pyyaml dev-python/imaging dev-python/gdata dev-python/feedparser secure-updates? ( app-crypt/gnupg ) fast-libs? ( dev-python/simplejson dev-python/pyyaml[libyaml] ) || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) || ( ( <dev-python/lxml-3.0 ) ( >=dev-python/lxml-3.0 dev-python/cssselect ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	e92e09651292b1bef5656592364550f7	multilib	ded93e450747134a079e647d888aa80b	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cd2f3736cfa0becdc9b6cd57f57ade9c
+_md5_=6fb9a2a513fbafcd23ea80f7fd4b2f40
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 28 Jan 2013 04:40:37 +0000
+Mon, 28 Jan 2013 07:36:54 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Jan 28 04:40:35 UTC 2013
+Mon Jan 28 07:36:52 UTC 2013
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 28 Jan 2013 05:00:02 +0000
+Mon, 28 Jan 2013 08:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1359348001 Mon Jan 28 04:40:01 2013 UTC
+1359358501 Mon Jan 28 07:35:01 2013 UTC
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@ -1,3 +1,3 @@
-DIST ModemManager-0.4.tar.bz2 444746 SHA256 8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f SHA512 921af89ddbe6b4001e35bd9a231dd214da6a956033bc1375d5d7714a6cb2b09d65aa34b3c147aa83c90fcfaf64a220f987577e4542cd6027883b5aba7ac281a5 WHIRLPOOL 86c8431f1b38d4dbeabc0da31a5411d5d780c53b7f69e3d860045f23ea516ac3e6bb9ef4af54984334b4c0ae4f3538dc61603603eb5d5834d7612f82bf67a970
 DIST ModemManager-0.5.2.0.tar.xz 492728 SHA256 7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8 SHA512 4c304c08c3740171148f9d5c8102ec18fa128589a5dac0f8bcb172e49d5e236a36b2167fa2e6ab6f592dd54cda24740309618c39b5afa8d020b66e9639e05fc4 WHIRLPOOL faf8db858c6e833a1e7475e626f247838f1f863e18e813eb39b1231fe138d1ade12e6f8f73a3e1768cc00442e313a9717e06b8263dec1198810ece6e2f67ed3e
 DIST ModemManager-0.6.0.0.tar.xz 531136 SHA256 d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2 SHA512 c4c823a422ee458b70ad5c78feb61de4007507050e8c4789e4397b7bd476ea14b68f9a6b1c95820ec437b97310e34c0396912ea936474638651d868d3828eb4a WHIRLPOOL 2434b39c53f5233c0e03a6b27afa00f0d46927bf29794a643f42b7b797f8c018f69019769903f08398a49093f788f26d2882a735b46be374f903d50752228225
+DIST ModemManager-0.7.990.tar.xz 1101016 SHA256 36547db99fccd7eac1f1dd75178232a61306c6b11e8926b83bcfc3a12c4222ca SHA512 bb0b3527b62d4cb6d1b8faeeab00b026965475e06cfc4109256d5dde4708d5f6b99f8ba4dd2bb82157671cc0026ad7cfed96b0d68ee63e2cfe361149dffe720d WHIRLPOOL 7d9a175af915b5058e2890f7a39aecd66bdf2b4e9524de96b6d5481708df5c1119e744f7ffb1755ad8ec20198521f8a843a90eedc7a28e75006f98326ca96afe
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@ -9,4 +9,10 @@
 		<email>tetromino@gentoo.org</email>
 		<name>Alexandre Rostovtsev</name>
 	</maintainer>
+	<use>
+		<flag name="qmi">Enable support for the QMI modem protocol used by
+			devices with Qualcomm chipsets</flag>
+		<flag name="qmi-newest">Avoid deprecated QMI commands. Warning: may
+			cause incompatibility with older devices.</flag>
+	</use>
 </pkgmetadata>
--- a/net-misc/modemmanager/modemmanager-0.4.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.4.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.4.ebuild,v 1.10 2012/12/02 22:46:07 ssuominen Exp $
-
-EAPI="2"
-
-inherit gnome.org eutils multilib udev
-
-# ModemManager likes itself with capital letters
-MY_PN="${PN/modemmanager/ModemManager}"
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="doc policykit test"
-
-RDEPEND=">=dev-libs/glib-2.18
-	virtual/udev[gudev]
-	>=dev-libs/dbus-glib-0.86
-	net-dialup/ppp
-	policykit? ( >=sys-auth/polkit-0.95 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# fix building against glib-2.31 headers
-	epatch "${FILESDIR}/${PN}-0.5-glib-2.31.patch"
-}
-
-src_configure() {
-	# ppp-2.4.5 will change the plugin directory (not added to portage yet)
-	if has_version '=net-dialup/ppp-2.4.4*'; then
-		pppd_plugin_dir="pppd/2.4.4"
-	elif has_version '=net-dialup/ppp-2.4.5*'; then
-		pppd_plugin_dir="pppd/2.4.5"
-	fi
-
-	econf \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(udev_get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
-		$(use_with doc docs) \
-		$(use_with policykit polkit) \
-		$(use_with test tests)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-	# Remove useless .la files
-	rm -vf "${D}"/usr/$(get_libdir)/{${MY_PN},${pppd_plugin_dir}}/*.la
-}
-
-pkg_postinst() {
-	elog "If your USB modem shows up as a Flash drive when you plug it in,"
-	elog "You should install sys-apps/usb_modeswitch which will automatically"
-	elog "switch it over to USB modem mode whenever you plug it in."
-}
--- a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild,v 1.6 2012/12/02 22:46:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild,v 1.7 2013/01/28 05:11:32 tetromino Exp $

 EAPI="4"
 GNOME_ORG_MODULE="ModemManager"
@ -10,7 +10,7 @@ inherit gnome.org user multilib toolchain-funcs udev
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"

-LICENSE="LGPL-2.1"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc policykit test"
--- a/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild,v 1.8 2013/01/27 13:54:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild,v 1.9 2013/01/28 05:11:32 tetromino Exp $

 EAPI="4"
 GNOME_ORG_MODULE="ModemManager"
@ -10,7 +10,7 @@ inherit gnome.org user multilib toolchain-funcs udev
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"

-LICENSE="LGPL-2.1"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="doc policykit test"
--- a/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild
@ -1,32 +1,48 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild,v 1.2 2012/12/02 22:46:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.7.990.ebuild,v 1.1 2013/01/28 07:04:24 tetromino Exp $

-EAPI="4"
+EAPI="5"
 GNOME_ORG_MODULE="ModemManager"

-inherit gnome.org user multilib udev
+inherit eutils gnome.org user multilib toolchain-funcs udev virtualx

 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"

-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc policykit test"
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc policykit test" # +qmi qmi-newest
+# REQUIRED_USE="qmi-newest? ( qmi )"

-RDEPEND=">=dev-libs/glib-2.18:2
-	virtual/udev[gudev]
-	>=dev-libs/dbus-glib-0.86
+RDEPEND=">=dev-libs/glib-2.30.2:2
 	net-dialup/ppp
-	policykit? ( >=sys-auth/polkit-0.99 )"
+	>=virtual/udev-147[gudev]
+	policykit? ( >=sys-auth/polkit-0.106 )
+"
 DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt )
-	>=dev-util/intltool-0.35.0
+	doc? (
+		app-office/dia
+		dev-libs/libxslt
+		dev-util/gtk-doc )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+	>=dev-util/intltool-0.40
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"

-DOCS="AUTHORS ChangeLog NEWS README"
+src_prepare() {
+	# Use python2.7 shebangs for test scripts
+	sed -e 's@\(^#!.*python\)@\12.7@' \
+		-i test/*.py || die
+
+	epatch_user
+	default
+}

 src_configure() {
 	# ppp-2.4.5 changes the plugin directory
@ -36,6 +52,8 @@ src_configure() {
 		pppd_plugin_dir="pppd/2.4.5"
 	fi

+	# FIXME: add $(use_with qmi) and $(use_with qmi-newest newest-qmi-commands)
+	# when libqmi-1.0.0 is in gx86 (bug #454382)
 	econf \
 		--disable-more-warnings \
 		--with-udev-base-dir="$(udev_get_udevdir)" \
@ -44,6 +62,8 @@ src_configure() {
 		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
 		$(use_with doc docs) \
 		$(use_with policykit polkit) \
+		--without-qmi \
+		--without-newest-qmi-commands \
 		$(use_with test tests)
 }

@ -55,14 +75,10 @@ src_install() {
 	if use policykit; then
 		insinto /usr/share/polkit-1/rules.d/
 		doins "${FILESDIR}"/01-org.freedesktop.ModemManager.rules
-		if has_version '<sys-auth/polkit-0.106'; then
-			insinto /etc/polkit-1/localauthority/10-vendor.d
-			doins "${FILESDIR}/01-org.freedesktop.ModemManager.pkla"
-		fi
 	fi

 	# Remove useless .la files
-	find "${D}" -name '*.la' -delete
+	prune_libtool_files --modules
 }

 pkg_postinst() {
--- a/net-misc/modemmanager/modemmanager-9999.ebuild
+++ b/net-misc/modemmanager/modemmanager-9999.ebuild
@ -0,0 +1,122 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-9999.ebuild,v 1.1 2013/01/28 07:04:24 tetromino Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="ModemManager"
+
+inherit autotools eutils git-2 gnome.org user multilib toolchain-funcs udev virtualx
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS=
+IUSE="doc policykit +qmi qmi-newest test"
+REQUIRED_USE="qmi-newest? ( qmi )"
+SRC_URI=
+EGIT_REPO_URI="git://anongit.freedesktop.org/ModemManager/ModemManager"
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+	net-dialup/ppp
+	>=virtual/udev-147[gudev]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	qmi? ( net-libs/libqmi )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-office/dia
+		dev-libs/libxslt
+		dev-util/gtk-doc )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-util/gtk-doc-am
+"
+
+src_unpack() {
+	git-2_src_unpack
+}
+
+src_prepare() {
+	# Use python2.7 shebangs for test scripts
+	sed -e 's@\(^#!.*python\)@\12.7@' \
+		-i test/*.py || die
+
+	epatch_user
+	eautoreconf # for 9999
+	default
+}
+
+src_configure() {
+	# ppp-2.4.5 changes the plugin directory
+	if has_version '=net-dialup/ppp-2.4.4*'; then
+		pppd_plugin_dir="pppd/2.4.4"
+	elif has_version '=net-dialup/ppp-2.4.5*'; then
+		pppd_plugin_dir="pppd/2.4.5"
+	fi
+
+	econf \
+		--disable-more-warnings \
+		--with-udev-base-dir="$(udev_get_udevdir)" \
+		--disable-static \
+		--with-dist-version=${PVR} \
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
+		$(use_with doc docs) \
+		$(use_with policykit polkit) \
+		$(use_with qmi) \
+		$(use_with qmi-newest newest-qmi-commands) \
+		$(use_with test tests)
+}
+
+src_install() {
+	default
+	use doc && dohtml docs/spec.html
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager.rules
+	fi
+
+	# Remove useless .la files
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	if use policykit; then
+		enewgroup plugdev
+		elog "To control your modem without needing to enter the root password,"
+		elog "add your user account to the 'plugdev' group."
+		elog
+	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	elog "If your USB modem shows up as a Flash drive when you plug it in,"
+	elog "You should install sys-apps/usb_modeswitch which will automatically"
+	elog "switch it over to USB modem mode whenever you plug it in."
+}
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@ -1,2 +1,3 @@
 DIST NetworkManager-0.9.4.0.tar.xz 1885364 SHA256 eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f SHA512 1895bb10d6d1954bd083729ac0f4529a983c510701cb5460cc6621651ea6b3e3db2585799594746701e5b6ded37b799f0a8a03b09baccc44fd371973e3ab22dd WHIRLPOOL af7ba4a1d5402e9062a0d333e8ad0d8a8669f7a881316d447f4d567f0354be63e12074cde2d94dc476de7bcbe594c49b27906ae495df0577b1a16d2e065b9581
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
+DIST NetworkManager-0.9.7.995.tar.xz 2049284 SHA256 662ac086ce7ab19accea922a31a6368650815adb76da720489c1fe96e4356f8e SHA512 5d57e2df7baac19454876aa6be54bcf0754f98a96c15facb731c5508bbd68f0224378dc480056bb9caa92d323b0f73c50aecdc582beb75e2ec267131faff51ae WHIRLPOOL 2411ce00252e78bb6184c6cd12b8dad5e97e611fe8925be57f6391b880f1c1143d6169b4e24eab9a6cc1cda7999c5b802612c99c3b7eac924a276c5c62d62629
--- a/net-misc/networkmanager/files/init.d.NetworkManager
+++ b/net-misc/networkmanager/files/init.d.NetworkManager
@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
+# Distributed under the terms of the GNU General Purpose License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/files/init.d.NetworkManager,v 1.1 2013/01/28 07:05:05 tetromino Exp $
+
+description="NetworkManager daemon. The service is marked as started only \
+when a network connection is established."
+
+depend() {
+	need dbus
+	provide net
+}
+
+start() {
+	# If we are re-called by a dispatcher event, we want to mark the service
+	# as started without starting the daemon again
+	yesno "${IN_BACKGROUND}" && return 0
+
+	[ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1"
+
+	ebegin "Starting NetworkManager"
+	start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \
+		--exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid
+	local _retval=$?
+	eend "${_retval}"
+	if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
+		einfo "Marking NetworkManager as inactive. It will automatically be marked"
+		einfo "as started after a network connection has been established."
+		mark_service_inactive
+	fi
+	return "${_retval}"
+}
+
+stop() {
+	# If we are re-called by a dispatcher event, we want to mark the service
+	# as inactive without stopping the daemon
+	if yesno "${IN_BACKGROUND}"; then
+		mark_service_inactive "${SVCNAME}"
+		return 0
+	fi
+
+	ebegin "Stopping NetworkManager"
+	local pidfile=/run/NetworkManager/NetworkManager.pid
+	if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then 
+		# Try stopping the pid file used by <0.9.7
+		pidfile=/var/run/NetworkManager.pid
+		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
+		ret=$?
+		[ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}"
+		eend ${ret}
+	else
+		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
+		eend $?
+	fi
+}
+
+# vim: set ft=gentoo-init-d ts=4 :
--- a/net-misc/networkmanager/files/networkmanager-0.9.7.995-pre-sleep.patch
+++ b/net-misc/networkmanager/files/networkmanager-0.9.7.995-pre-sleep.patch
@ -0,0 +1,131 @@
+From 83dd792c8678337aba0af100bb4590c6325b696e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 27 Jan 2013 23:39:56 -0500
+Subject: [PATCH] Implement "pre-sleep" action dispatch
+
+Based on work by Christian Becke <christianbecke@gmail.com> in
+https://bugzilla.gnome.org/show_bug.cgi?id=387832
+---
+ callouts/nm-dispatcher-utils.c |  3 ++-
+ src/nm-dispatcher.c            |  8 ++++++--
+ src/nm-dispatcher.h            |  3 ++-
+ src/nm-manager.c               | 28 +++++++++++++++++++++-------
+ 4 files changed, 31 insertions(+), 11 deletions(-)
+
+diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
+index 887e80d..db66b61 100644
+--- a/callouts/nm-dispatcher-utils.c
+++ b/callouts/nm-dispatcher-utils.c
+@@ -407,7 +407,8 @@ nm_dispatcher_utils_construct_envp (const char *action,
+ 	g_return_val_if_fail (*out_iface == NULL, NULL);
+ 
+ 	/* Hostname changes don't require a device nor contain a connection */
+-	if (!strcmp (action, "hostname"))
+	if (!strcmp (action, "hostname") ||
+	    !strcmp (action, "pre-sleep"))
+ 		return g_new0 (char *, 1);
+ 
+ 	/* Canonicalize the VPN interface name; "" is used when passing it through
+diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
+index 61dfd7c..c4a2829 100644
+--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
+@@ -237,6 +237,8 @@ action_to_string (DispatcherAction action)
+ 		return "dhcp4-change";
+ 	case DISPATCHER_ACTION_DHCP6_CHANGE:
+ 		return "dhcp6-change";
+	case DISPATCHER_ACTION_PRE_SLEEP:
+		return "pre-sleep";
+ 	default:
+ 		break;
+ 	}
+@@ -269,7 +271,8 @@ _dispatcher_call (DispatcherAction action,
+ 	DispatchInfo *info;
+ 
+ 	/* All actions except 'hostname' require a device */
+-	if (action != DISPATCHER_ACTION_HOSTNAME)
+	if (action != DISPATCHER_ACTION_HOSTNAME &&
+	    action != DISPATCHER_ACTION_PRE_SLEEP)
+ 		g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
+ 	/* VPN actions require at least an IPv4 config (for now) */
+ 	if (action == DISPATCHER_ACTION_VPN_UP)
+@@ -308,7 +311,8 @@ _dispatcher_call (DispatcherAction action,
+ 	vpn_ip6_props = value_hash_create ();
+ 
+ 	/* hostname actions only send the hostname */
+-	if (action != DISPATCHER_ACTION_HOSTNAME) {
+	if (action != DISPATCHER_ACTION_HOSTNAME &&
+	    action != DISPATCHER_ACTION_PRE_SLEEP) {
+ 		fill_device_props (device,
+ 		                   device_props,
+ 		                   device_ip4_props,
+diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
+index 05a6c87..8e95834 100644
+--- a/src/nm-dispatcher.h
+++ b/src/nm-dispatcher.h
+@@ -39,7 +39,8 @@ typedef enum {
+ 	DISPATCHER_ACTION_VPN_PRE_DOWN,
+ 	DISPATCHER_ACTION_VPN_DOWN,
+ 	DISPATCHER_ACTION_DHCP4_CHANGE,
+-	DISPATCHER_ACTION_DHCP6_CHANGE
+	DISPATCHER_ACTION_DHCP6_CHANGE,
+	DISPATCHER_ACTION_PRE_SLEEP = 999,
+ } DispatcherAction;
+ 
+ typedef void (*DispatcherFunc) (gconstpointer call, gpointer user_data);
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index fbc9d23..197b213 100644
+--- a/src/nm-manager.c
+++ b/src/nm-manager.c
+@@ -71,6 +71,7 @@
+ #include "wifi-utils.h"
+ #include "nm-enum-types.h"
+ #include "nm-sleep-monitor.h"
+#include "nm-dispatcher.h"
+ 
+ #if WITH_CONCHECK
+ #include "nm-connectivity.h"
+@@ -3149,6 +3150,23 @@ impl_manager_deactivate_connection (NMManager *self,
+ }
+ 
+ static void
+pre_sleep_dispatcher_done (gpointer call, gpointer user_data)
+{
+	NMManager *self = (NMManager *) user_data;
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+	GSList *iter;
+
+	/* Just deactivate and down all devices from the device list,
+	 * to keep things fast the device list will get resynced when
+	 * the manager wakes up.
+	 */
+	for (iter = priv->devices; iter; iter = iter->next)
+		nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
+
+	nm_manager_update_state (self);
+}
+
+static void
+ do_sleep_wake (NMManager *self)
+ {
+ 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+@@ -3158,13 +3176,9 @@ do_sleep_wake (NMManager *self)
+ 	if (manager_sleeping (self)) {
+ 		nm_log_info (LOGD_SUSPEND, "sleeping or disabling...");
+ 
+-		/* Just deactivate and down all devices from the device list,
+-		 * to keep things fast the device list will get resynced when
+-		 * the manager wakes up.
+-		 */
+-		for (iter = priv->devices; iter; iter = iter->next)
+-			nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
+-
+		nm_dispatcher_call (DISPATCHER_ACTION_PRE_SLEEP, NULL, NULL,
+		                    pre_sleep_dispatcher_done, self);
+		return;
+ 	} else {
+ 		nm_log_info (LOGD_SUSPEND, "waking up and re-enabling...");
+ 
+-- 
+1.8.1.1
+
--- a/net-misc/networkmanager/networkmanager-0.9.7.995.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.7.995.ebuild
@ -0,0 +1,228 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.7.995.ebuild,v 1.1 2013/01/28 07:05:05 tetromino Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="NetworkManager"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome.org linux-info systemd user toolchain-funcs vala virtualx udev
+
+DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+IUSE="avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd doc gnutls
+introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala
+wext" # wimax
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )
+	?? ( consolekit systemd )
+"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: Qt support?
+COMMON_DEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.94
+	>=dev-libs/glib-2.30
+	>=dev-libs/libnl-3.2.7:3=
+	>=sys-auth/polkit-0.106
+	>=net-libs/libsoup-2.26:2.4=
+	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
+	>=virtual/udev-165[gudev]
+	bluetooth? ( >=net-wireless/bluez-4.82 )
+	avahi? ( net-dns/avahi:=[autoipd] )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )
+	gnutls? (
+		dev-libs/libgcrypt:=
+		net-libs/gnutls:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+	nss? ( >=dev-libs/nss-3.11:= )
+	dhclient? ( =net-misc/dhcp-4*[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
+	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( sys-power/upower )
+"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.8 )
+	vala? ( $(vala_depend) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+"
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See http://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See http://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
+	epatch "${FILESDIR}/${PN}-0.9.7.995-pre-sleep.patch"
+
+	# Use python2.7 shebangs for test scripts
+	sed -e 's@\(^#!.*python\)@\12.7@' \
+		-i */tests/*.py || die
+
+	epatch_user
+
+	use vala && vala_src_prepare
+
+	# Force use of /run, avoid eautoreconf
+	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+	default
+}
+
+src_configure() {
+	# TODO: enable wimax when we have a libnl:3 compatible revision of it
+	econf \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		--enable-ifnet \
+		--without-netconfig \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d \
+		--with-udev-dir="$(udev_get_udevdir)" \
+		--with-iptables=/sbin/iptables \
+		--enable-concheck \
+		--with-crypto=$(usex nss nss gnutls) \
+		--with-session-tracking=$(usex consolekit consolekit $(usex systemd systemd no)) \
+		--with-suspend-resume=$(usex systemd systemd upower) \
+		$(use_enable doc) \
+		$(use_enable introspection) \
+		$(use_enable ppp) \
+		--disable-wimax \
+		$(use_with dhclient) \
+		$(use_with dhcpcd) \
+		$(use_with doc docs) \
+		$(use_with modemmanager modem-manager-1) \
+		$(use_with resolvconf) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_with wext) \
+		"$(systemd_with_unitdir)"
+}
+
+src_test() {
+	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
+	Xemake check
+}
+
+src_install() {
+	default
+
+	# Gentoo init script
+	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+
+	# /var/run/NetworkManager is used by some distros, but not by Gentoo
+	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	if use systemd; then
+		# Our init.d script requires running a dispatcher script that annoys
+		# systemd users; bug #434692
+		rm -rv "${ED}/etc/init.d" || die "rm failed"
+	else
+		# Provide openrc net dependency only when nm is connected
+		exeinto /etc/NetworkManager/dispatcher.d
+		newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
+		sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+			-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+		# Default conf.d file
+		newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+	fi
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	# Remove useless .la files
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "To modify system network connections without needing to enter the"
+	elog "root password, add your user account to the 'plugdev' group."
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  574d0cfa7e911b1f7792077003060240* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+}
--- a/net-misc/networkmanager/networkmanager-9999.ebuild
+++ b/net-misc/networkmanager/networkmanager-9999.ebuild
@ -0,0 +1,238 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-9999.ebuild,v 1.1 2013/01/28 07:05:05 tetromino Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="NetworkManager"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils git-2 gnome.org linux-info systemd user toolchain-funcs vala virtualx udev
+
+DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+IUSE="avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd doc gnutls
+introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala
+wext" # wimax
+KEYWORDS=
+SRC_URI=
+EGIT_REPO_URI="git://anongit.freedesktop.org/NetworkManager/NetworkManager"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )
+	?? ( consolekit systemd )
+"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: Qt support?
+COMMON_DEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.94
+	>=dev-libs/glib-2.30
+	>=dev-libs/libnl-3.2.7:3=
+	>=sys-auth/polkit-0.106
+	>=net-libs/libsoup-2.26:2.4=
+	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
+	>=virtual/udev-165[gudev]
+	bluetooth? ( >=net-wireless/bluez-4.82 )
+	avahi? ( net-dns/avahi:=[autoipd] )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )
+	gnutls? (
+		dev-libs/libgcrypt:=
+		net-libs/gnutls:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+	nss? ( >=dev-libs/nss-3.11:= )
+	dhclient? ( =net-misc/dhcp-4*[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
+	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( sys-power/upower )
+"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.8 )
+	vala? ( $(vala_depend) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+
+	dev-libs/vala-common
+	dev-util/gtk-doc-am
+"
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See http://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See http://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_unpack() {
+	git-2_src_unpack
+}
+
+src_prepare() {
+	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
+	epatch "${FILESDIR}/${PN}-0.9.7.995-pre-sleep.patch"
+
+	# Use python2.7 shebangs for test scripts
+	sed -e 's@\(^#!.*python\)@\12.7@' \
+		-i */tests/*.py || die
+
+	epatch_user
+
+	use vala && vala_src_prepare
+	eautoreconf # for 9999
+
+	# Force use of /run, avoid eautoreconf
+	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+	default
+}
+
+src_configure() {
+	# TODO: enable wimax when we have a libnl:3 compatible revision of it
+	econf \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		--enable-ifnet \
+		--without-netconfig \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d \
+		--with-udev-dir="$(udev_get_udevdir)" \
+		--with-iptables=/sbin/iptables \
+		--enable-concheck \
+		--with-crypto=$(usex nss nss gnutls) \
+		--with-session-tracking=$(usex consolekit consolekit $(usex systemd systemd no)) \
+		--with-suspend-resume=$(usex systemd systemd upower) \
+		$(use_enable doc) \
+		$(use_enable introspection) \
+		$(use_enable ppp) \
+		--disable-wimax \
+		$(use_with dhclient) \
+		$(use_with dhcpcd) \
+		$(use_with doc docs) \
+		$(use_with modemmanager modem-manager-1) \
+		$(use_with resolvconf) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_with wext) \
+		"$(systemd_with_unitdir)"
+}
+
+src_test() {
+	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
+	Xemake check
+}
+
+src_install() {
+	default
+
+	# Gentoo init script
+	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+
+	# /var/run/NetworkManager is used by some distros, but not by Gentoo
+	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	if use systemd; then
+		# Our init.d script requires running a dispatcher script that annoys
+		# systemd users; bug #434692
+		rm -rv "${ED}/etc/init.d" || die "rm failed"
+	else
+		# Provide openrc net dependency only when nm is connected
+		exeinto /etc/NetworkManager/dispatcher.d
+		newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
+		sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+			-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+		# Default conf.d file
+		newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+	fi
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	# Remove useless .la files
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "To modify system network connections without needing to enter the"
+	elog "root password, add your user account to the 'plugdev' group."
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  574d0cfa7e911b1f7792077003060240* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+}
--- a/profiles/package.mask
+++ b/profiles/package.mask
@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14411 2013/01/28 00:19:34 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14412 2013/01/28 07:02:59 tetromino Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@ -31,6 +31,11 @@

 #--- END OF EXAMPLES ---

+# Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jan 2013)
+# Beta versions masked for testing
+=net-misc/modemmanager-0.7*
+=net-misc/networkmanager-0.9.7*
+
 # Tim Harder <radhermit@gentoo.org> (27 Jan 2013)
 # Masked due to deprecated API, use dev-python/PyGithub instead
 # Removal in 30 days
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -4496,6 +4496,8 @@ net-misc/mediatomb:mysql - Use dev-db/mysql as backend rather than SQLite3
 net-misc/mediatomb:taglib - Use media-libs/taglib for reading files' metadata rather than id3lib
 net-misc/mediatomb:thumbnail - Enables video thumbnails generation throughmedia-video/ffmpegthumbnailer
 net-misc/memcached:slabs-reassign - Allow manual reassignment of memory slabs at the cost of slab optimizations.
+net-misc/modemmanager:qmi - Enable support for the QMI modem protocol used by devices with Qualcomm chipsets
+net-misc/modemmanager:qmi-newest - Avoid deprecated QMI commands. Warning: may cause incompatibility with older devices.
 net-misc/mosh:client - Build network client
 net-misc/mosh:examples - Include example scripts
 net-misc/mosh:mosh-hardening - Enable compiler and linker options to frustrate memory corruption exploits
--- a/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.ebuild,v 1.4 2013/01/27 13:53:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.ebuild,v 1.5 2013/01/28 05:14:15 williamh Exp $

 EAPI=4

@ -16,7 +16,7 @@ HOMEPAGE="http://www.gentoo.org"

 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="build"

 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
--- a/sys-fs/udev-init-scripts/udev-init-scripts-22.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-22.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-22.ebuild,v 1.1 2013/01/27 20:12:03 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-22.ebuild,v 1.2 2013/01/28 05:14:15 williamh Exp $

 EAPI=4

@ -16,7 +16,7 @@ HOMEPAGE="http://www.gentoo.org"

 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="build"

 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.16 2013/01/21 21:30:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.17 2013/01/28 05:14:15 williamh Exp $

 EAPI=4

@ -16,7 +16,7 @@ HOMEPAGE="http://www.gentoo.org"

 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="build"

 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
--- a/www-client/weboob/Manifest
+++ b/www-client/weboob/Manifest
@ -1 +1,2 @@
 DIST weboob-0.d.tar.gz 1026273 SHA256 faefbd90611bd64386b43073d2eea2bf2506f38448c971430448fdcbbd0a304e SHA512 f1141f0ecf56982686a9b2f622048f6b1210c499dabe75eef7f19e89901a2fc6b0664f62d5d786c492984c2c1f13ef6c4b9b7b935bc15169fc47dcb89e932377 WHIRLPOOL 2c5f759fee5e9b49c812a135f4d4033bfaf26a063592ce145da4ef897eba51952ddd2e6de19767e171a671164539201f7ed538fcfb4e9d55cddf43afbe5d7d86
+DIST weboob-0.e.tar.gz 1087165 SHA256 03331e3afbcaface36f079cbc70d38f34876309c7cb25f53741fd938046319aa SHA512 c07ee148e4b75e6074d0cc1962fdac12cd7b01d4bd6dfedc89667fc3415adb9757dee568750f1b765384483bb01bb082dceba16fac2979a217cf43362b2f40d0 WHIRLPOOL 0d7ec57d807f3f4a1457196d604b92a7b68b3bc031eb0afa4f0b29707a85d73645d3d9485496afb24e9b36ded19ee70fc8064a95189f45c76e77bcc4904a90aa
--- a/www-client/weboob/weboob-0e.ebuild
+++ b/www-client/weboob/weboob-0e.ebuild
@ -0,0 +1,70 @@
+# Copyright 2010-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-0e.ebuild,v 1.1 2013/01/28 05:27:02 patrick Exp $
+
+EAPI=5
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit base distutils
+if [ "$PV" == "9999" ]; then
+	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
+	inherit git-2
+	KEYWORDS=""
+	SRC_URI=""
+elif [ "$PV" == "9998" ]; then
+	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
+	inherit git-2
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~x86 ~amd64"
+	SRC_URI="http://symlink.me/attachments/download/206/${PN}-0.e.tar.gz"
+	S="${WORKDIR}/${PN}-0.e"
+fi
+
+DESCRIPTION="Weboob (Web Out of Browsers) provides several applications to interact with a lot of websites."
+HOMEPAGE="http://weboob.org/"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="X +secure-updates fast-libs"
+
+DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X] dev-python/pyxdg )"
+RDEPEND="${DEPEND}
+	dev-python/prettytable
+	dev-python/html2text
+	dev-python/mechanize
+	dev-python/python-dateutil
+	dev-python/pyyaml
+	dev-python/imaging
+	dev-python/gdata
+	dev-python/feedparser
+	secure-updates? ( app-crypt/gnupg )
+	fast-libs? ( dev-python/simplejson dev-python/pyyaml[libyaml] )
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
+	|| ( ( <dev-python/lxml-3.0 ) ( >=dev-python/lxml-3.0 dev-python/cssselect ) )"
+
+DOCS="AUTHORS COPYING ChangeLog README INSTALL"
+
+set_global_options() {
+	DISTUTILS_GLOBAL_OPTIONS=("* --$(usex X '' 'no-')qt" "* --$(usex X '' 'no-')xdg")
+}
+
+distutils_src_install_pre_hook() {
+	set_global_options
+}
+
+distutils_src_install_post_hook() {
+	exeinto "/usr/share/${PN}"
+	doexe contrib/*-munin
+}
+
+distutils_src_compile_pre_hook() {
+	set_global_options
+}
+
+pkg_postinst() {
+	elog "You should now run \"weboob-config update\" (as your login user)."
+}
--- a/www-client/weboob/weboob-9998.ebuild
+++ b/www-client/weboob/weboob-9998.ebuild
@ -1,6 +1,6 @@
 # Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-9998.ebuild,v 1.1 2013/01/25 08:31:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-9998.ebuild,v 1.2 2013/01/28 05:27:02 patrick Exp $

 EAPI=5
 PYTHON_DEPEND="2:2.5"
@ -9,19 +9,19 @@ RESTRICT_PYTHON_ABIS="3.*"

 inherit base distutils
 if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/romain/${PN}.git"
+	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
 	inherit git-2
 	KEYWORDS=""
 	SRC_URI=""
 elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/romain/${PN}-stable.git"
+	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
 	inherit git-2
 	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~x86 ~amd64"
-	SRC_URI="http://symlink.me/attachments/download/199/${PN}-0.d.tar.gz"
-	S="${WORKDIR}/${PN}-0.d"
+	SRC_URI="http://symlink.me/attachments/download/206/${PN}-0.e.tar.gz"
+	S="${WORKDIR}/${PN}-0.e"
 fi

 DESCRIPTION="Weboob (Web Out of Browsers) provides several applications to interact with a lot of websites."
--- a/www-client/weboob/weboob-9999.ebuild
+++ b/www-client/weboob/weboob-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-9999.ebuild,v 1.1 2013/01/25 08:31:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-9999.ebuild,v 1.2 2013/01/28 05:27:02 patrick Exp $

 EAPI=5
 PYTHON_DEPEND="2:2.5"
@ -9,19 +9,19 @@ RESTRICT_PYTHON_ABIS="3.*"

 inherit base distutils
 if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/romain/${PN}.git"
+	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
 	inherit git-2
 	KEYWORDS=""
 	SRC_URI=""
 elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/romain/${PN}-stable.git"
+	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
 	inherit git-2
 	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~x86 ~amd64"
-	SRC_URI="http://symlink.me/attachments/download/199/${PN}-0.d.tar.gz"
-	S="${WORKDIR}/${PN}-0.d"
+	SRC_URI="http://symlink.me/attachments/download/206/${PN}-0.e.tar.gz"
+	S="${WORKDIR}/${PN}-0.e"
 fi

 DESCRIPTION="Weboob (Web Out of Browsers) provides several applications to interact with a lot of websites."
				`@ -0,0 +1 @@`
				`DIST smack-0.5.0.tar.bz2 38923 SHA256 5fa0473bc988920e4d475fc57b1793c7dbe41f39105578291ceb3e5ad8f2bf32 SHA512 16c02538d44e3c53a783a5fd546a2813ae4da8e3d4e61fcc03a2c6c5127453ffaac1b5d5a04c499f6158d747b5cf37fdfa675dc4017d884f3eccb6dc0d76e754 WHIRLPOOL 406666a15ad2726e9868fc98ca43de34e22fd22e45f1ce35ba539c8b38c5723d11ec37ff05cc23589f328b6b309a9f8fbe6fc57e239b51aecdabdb0742c60924`