reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /gnome-extra
354 files changed, 15305 insertions, 0 deletions
diff --git a/gnome-extra/activity-log-manager/Manifest b/gnome-extra/activity-log-manager/Manifest
new file mode 100644
index 000000000000..062efd4f91b6
--- /dev/null
+++ b/gnome-extra/activity-log-manager/Manifest
@@ -0,0 +1,8 @@
+AUX activity-log-manager-0.9.0.1-gold.patch 414 SHA256 56092d56b86af2a7e6a99d7c96b5a6d446221c8a89600e160fce597ee9a6f21b SHA512 e83aecff6a7eae785f40094292433518141771b729ea236b44a58e82cb2e63721a4d0d9b17bc8816c612718342ad83b2b4336bff203d4308369a7504f488e266 WHIRLPOOL 8c754e5c0a20638e6e43b0a340fb39b0bab03ce030734439b177ea62f00f35ca0b9d3ba7bb1854397be21521a0131c0d3b79ae4e4968aec65b355f9c923c3638
+AUX activity-log-manager-0.9.7-ambiguous.patch 4383 SHA256 8560255631533ccd8500c71789f0ad6075d35225e98585e96f243bf186ab7635 SHA512 73d020b6cc76090fac8f9c06f9ad029d78b3e5ff6c246f25bbd13d4c29bc1e47b0c77ee20f09b77f89c9e842df103300287e149cdd3bf43cbfe17c506537936a WHIRLPOOL 42940fff1574fc7a16e1bf9656de716d78fc5bc01a4aadd31cd7ea66a788e08d2c488658794fbea32a7fc804fabbf790d1d09ee4b61e24efbf8f417132c12b0f
+AUX activity-log-manager-0.9.7-gtk-icon_size.patch 480 SHA256 e9f8fe64576662ca1905ea7682929a5e2dcb1665a623eb517fec7a4331416c4a SHA512 d4b3b4f21c6ee67f577b78236ca6308fcb1e20aed85a0b43d5946ab243f27180f52e96652bf3105bcb11692807eab7f2df4f83f5f15d154dd8f743612460aaeb WHIRLPOOL 4dee2178593621bed72f7972c3edb846f197b4cfa8c176ad7895a395219a1ad1b3e6153c88371356c78ef03edd9f4b784b136e2245b301f697423f6a0a150db3
+DIST activity-log-manager-0.9.7.tar.xz 332004 SHA256 53014a08056168171579c210a8e5cfd949a0efe3bd23f6d38cd0ce0b0168841f SHA512 e0a43cae08e7f86b35ab8a4b0c70a4eb4a2ae821d3ab907a5c4135640e67c572ec2e735a3350099e3febe177d67db83af526c62b7b595894c0df08d84c3bb6ce WHIRLPOOL 7d92d5cb0fbc1b3353dab4164115e9e93efb4859a055ce9b9fffe3a580c49534e0b6e61c321ea7f896b7f166551c57bd3fd06a2692694a1c36e7554b0a014352
+EBUILD activity-log-manager-0.9.7-r1.ebuild 1191 SHA256 1ff34679afc0177931e2e2fd8c733d7b6c58e4ac6f78949356807bdbda6e493f SHA512 dab29cc0d5fa6a50d76316359ed44bd53ded9cbb8e79570b32c5a01f870b2bea758770d9c6ec7df5f178e6b4230fd22e38f39f51e3f282dc3544a9c21db556a9 WHIRLPOOL 14c9f84a15192d3be104556a5df1b238d78c8019ec4e8d36c4d13ce22b692aa4f2c6384768dc96e3a6c58e73e0471219be413dca4c9540af3836fe1c0be17b2a
+MISC ChangeLog 3868 SHA256 669fc1e156dad50570b9d4fcf9835aee14e4e7a7397db6cabddda99594c89854 SHA512 88c613f214b83a575c6697ca0bbe6c0eaacf5f8f49dcfb670adc744c89994b64707bd24742fadc48c447d5d8414de2e2390b05264631f06dde730f5d3760348c WHIRLPOOL 024c433e82e37e479e6fff0b237b75a320b611736262e59b07675d466fa415003ccf45fcf972fb65a5f21b62762fa68afce6c0d4f0e75660b0bd39d4b8c7b323
+MISC ChangeLog-2015 4458 SHA256 85423f8b464d6b56389ba669b636dee6fd3a4ccfef2db6f468cb1edfa9ce0b27 SHA512 7947ddb475fcce1846673fb3422ad794ba2c25cf467ba0def34198edbd8b1aac31e9ce98ba929822fbcd5ff5b24d4379d6160fc57c39584a1b548833d73ccf47 WHIRLPOOL 7c0243b399d0dea65e937853d05289a4d2ab672001fab92ee46d3f1c74b7853b06dd887651e1af7ad91a809e73eb91ed25ebabfaa438bf12aff196c9d98a7ac9
+MISC metadata.xml 653 SHA256 6a1d1474c3cf1c05707fa94f9ae0abe415b8bd8041190cf56520f529fa2f9cc3 SHA512 f7cf08ba7352aa1336829107841b3d737bd01915a1dc708e02fea83bd6bf4e345d6dd1fae397bd510433c34edc9e1bb2d06d605b8a65fab29aa730d819680ce4 WHIRLPOOL b9f9961835e73b69bc57314185b22a5c749cc71b2d8838b95e813c408f7d9564774145c4ee86162bcba71fcbac7c9be07dc93ca946d56e9a29b54c25338ac632
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..947436189f92
--- /dev/null
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.26" # Fails with 0.24, but works with 0.26 and older versions
+WANT_AUTOMAKE=1.13
+
+inherit autotools eutils gnome2 vala versionator
+
+DESCRIPTION="GUI which lets you easily control what gets logged by Zeitgeist"
+HOMEPAGE="https://launchpad.net/activity-log-manager/"
+SRC_URI="https://launchpad.net/history-manager/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libgee:0
+	dev-libs/glib:2
+	gnome-extra/zeitgeist
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_prepare() {
+	DOCS="README NEWS INSTALL ChangeLog AUTHORS"
+
+	rm src/${PN}.c || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.0.1-gold.patch \
+		"${FILESDIR}"/${P}-gtk-icon_size.patch \
+		"${FILESDIR}"/${P}-ambiguous.patch
+	sed \
+		-e "/^almdocdir/s:=.*$:= \${prefix}/share/doc/${PF}:g" \
+		-i Makefile.am || die
+	vala_src_prepare
+	eautoreconf
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch
new file mode 100644
index 000000000000..cffaf594feb8
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch
@@ -0,0 +1,16 @@
+ src/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index eaf039f..05c1393 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -50,7 +50,7 @@ SHARED_LIBS = \
+ 	$(GEE_LIBS) \
+ 	$(GIO_UNIX_LIBS)
+ activity_log_manager_LDADD = \
+-	$(SHARED_LIBS)
++	$(SHARED_LIBS) -lm
+ libactivity_log_manager_la_LIBADD = \
+ 	$(SHARED_LIBS) \
+ 	$(CCPANEL_LIBS)
diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch
new file mode 100644
index 000000000000..ba582aef8978
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch
@@ -0,0 +1,139 @@
+ src/blacklist-dbus.vala               |  4 ++--
+ src/security-widget.vala              |  2 +-
+ src/unified-privacy-applications.vala | 16 ++++++++--------
+ src/unified-privacy.vala              |  4 ++--
+ 4 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/blacklist-dbus.vala b/src/blacklist-dbus.vala
+index 355a684..fd165e3 100644
+--- a/src/blacklist-dbus.vala
++++ b/src/blacklist-dbus.vala
+@@ -137,7 +137,7 @@ namespace Alm {
+ 			return false;
+ 		}
+ 
+-		public async void find_events (string id, TreeIter iter, ListStore store)
++		public async void find_events (string id, TreeIter iter, Gtk.ListStore store)
+ 		{
+ 	     	Event event = new Event();
+ 	    	event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
+@@ -165,7 +165,7 @@ namespace Alm {
+ 			store.set_value(iter, 5, counter);
+ 		}
+ 
+-		public void get_count_for_app (string app_id, TreeIter iter, ListStore store) {
++		public void get_count_for_app (string app_id, TreeIter iter, Gtk.ListStore store) {
+ 			find_events(app_id, iter, store);
+ 		}
+ 		
+diff --git a/src/security-widget.vala b/src/security-widget.vala
+index 4394924..e983c15 100644
+--- a/src/security-widget.vala
++++ b/src/security-widget.vala
+@@ -39,7 +39,7 @@ namespace Alm {
+ 
+ 		private void set_up_ui () {
+ 
+-			var liststore_delay = new ListStore (2, typeof (string), typeof (int));
++			var liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int));
+ 			TreeIter iter;
+ 			liststore_delay.append (out iter);
+ 			liststore_delay.set (iter, 0, "1 second", 1, 0);
+diff --git a/src/unified-privacy-applications.vala b/src/unified-privacy-applications.vala
+index 9b06f44..a4966d3 100644
+--- a/src/unified-privacy-applications.vala
++++ b/src/unified-privacy-applications.vala
+@@ -60,7 +60,7 @@ namespace Alm {
+ 			}
+ 		}
+ 
+-		public void get_count_for_app(string id, TreeIter iter, ListStore store) {
++		public void get_count_for_app(string id, TreeIter iter, Gtk.ListStore store) {
+ 			this.blacklist_interface.get_count_for_app(id, iter, store);
+ 		}
+ 
+@@ -131,7 +131,7 @@ namespace Alm {
+ 	private class ApplicationsTreeView : Gtk.Box {
+ 	
+ 		private ApplicationBlacklist app_blacklist;
+-		private ListStore store;
++		private Gtk.ListStore store;
+ 		private TreeView treeview;
+ 		
+ 		HashTable<string, AppChooseInfo> blocked_apps;
+@@ -145,7 +145,7 @@ namespace Alm {
+ 			N_COLS
+ 		}
+ 
+-		public ListStore liststore {
++		public Gtk.ListStore liststore {
+ 			get {
+ 				return this.store;
+ 			}
+@@ -160,7 +160,7 @@ namespace Alm {
+ 			this.blocked_apps = blocked;
+ 			this.unblocked_apps = unblocked;
+ 
+-			this.store = new ListStore (TreeViewCols.N_COLS,
++			this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
+ 										typeof (string),
+ 										typeof (Gdk.Pixbuf),
+ 										typeof (string));
+@@ -292,7 +292,7 @@ namespace Alm {
+ 	private class AppSelectionTreeView : Gtk.Box {
+ 
+ 		private ApplicationBlacklist app_blacklist;
+-		private ListStore store;
++		private Gtk.ListStore store;
+ 		private TreeView treeview;
+ 		
+ 		enum TreeViewCols
+@@ -312,7 +312,7 @@ namespace Alm {
+ 			}
+ 		}
+ 
+-		public ListStore liststore {
++		public Gtk.ListStore liststore {
+ 			get {
+ 				return store;
+ 			}
+@@ -323,7 +323,7 @@ namespace Alm {
+ 			
+ 			this.app_blacklist = app_blacklist;
+ 			
+-			this.store = new ListStore (TreeViewCols.N_COLS,
++			this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
+ 										typeof (string),
+ 										typeof (Gdk.Pixbuf),
+ 										typeof (string),
+@@ -426,7 +426,7 @@ namespace Alm {
+ 			}
+ 		}
+ 
+-		public ListStore liststore {
++		public Gtk.ListStore liststore {
+ 			get {
+ 				return treeview.liststore;
+ 			}
+diff --git a/src/unified-privacy.vala b/src/unified-privacy.vala
+index 0d46370..c64f78d 100644
+--- a/src/unified-privacy.vala
++++ b/src/unified-privacy.vala
+@@ -55,7 +55,7 @@ namespace Alm {
+ 		
+ 		//General stuffs
+ 		private TreeView exception_list;
+-		private ListStore exception_list_store;
++		private Gtk.ListStore exception_list_store;
+ 		
+ 		private Switch record_button;
+ 		
+@@ -262,7 +262,7 @@ namespace Alm {
+ 			exception_vbox.pack_start (al2, false, false, 5);
+ 
+ 			// Exception TreeView
+-			this.exception_list_store = new ListStore (4, 
++			this.exception_list_store = new Gtk.ListStore (4, 
+ 				typeof(string),      // Full file path of application desktop file.
+ 				typeof(Gdk.Pixbuf?), // Pixbuf
+ 				typeof(string),      // File basename or ApplicationName
diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch
new file mode 100644
index 000000000000..07e082e269da
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch
@@ -0,0 +1,13 @@
+=== modified file 'src/unified-privacy.vala'
+--- src/unified-privacy.vala	2014-11-10 06:31:32 +0000
++++ src/unified-privacy.vala	2014-11-10 19:34:43 +0000
+@@ -289,7 +289,7 @@
+ 			// Add/Remove buttons
+ 			var exception_toolbar = new Toolbar();
+ 			exception_toolbar.toolbar_style = ToolbarStyle.ICONS;
+-			exception_toolbar.icon_size = 1;
++			exception_toolbar.icon_size = Gtk.IconSize.MENU;
+ 			exception_toolbar.icon_size_set = true;
+ 			exception_toolbar.visible = true;
+ 			
+
diff --git a/gnome-extra/activity-log-manager/metadata.xml b/gnome-extra/activity-log-manager/metadata.xml
new file mode 100644
index 000000000000..b7f021043294
--- /dev/null
+++ b/gnome-extra/activity-log-manager/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription>
+Gnome Activity Journal (GAJ for friends) is your portal to the world of 
+Zeitgeist. It's a user interface written in PyGTK ideated for easily 
+browsing and finding files on your computer. It incorporates search, 
+file preview, tag, bookmark and other useful features.
+</longdescription>
+  <upstream>
+    <remote-id type="launchpad">history-manager</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/assogiate/Manifest b/gnome-extra/assogiate/Manifest
new file mode 100644
index 000000000000..6511bc4342f9
--- /dev/null
+++ b/gnome-extra/assogiate/Manifest
@@ -0,0 +1,9 @@
+AUX assogiate-0.2.1-desktop.patch 678 SHA256 baf39f7ade229633521927691d5f4017737667aabc3660868fd7437d499b4562 SHA512 db9c31c389e6b0b8f789891bab949a3b6cb0f0d2dbb15d61e4e2d4d66506f893dc788e66e6ceb484a3c41fa2f3e82d4f30a58f052c823398bde7ca2f8b8a5968 WHIRLPOOL c7b50e16118bf2255665d5b57c386653e6a5d072c9a9b71dfc2a8b047d0ea6f680acd91de8fff1168282fa225b5511c297fdbcfda951e3bfb86ff553b670cacd
+AUX assogiate-0.2.1-gcc-4.7.patch 729 SHA256 fdadacd8a3677e480c61a27609e6e228a8a1ad4b86d7cb9cdc09775e62d3a0a9 SHA512 30b6c0b4223467c5dc05e6ef9fcc111a1b2e7a6ba9d520e6d7d5cae4994dfdef0a4b4bb087e508e32593f6c8da2ff5c97a1cffd87ccc91d9c6a8f88fba936eb0 WHIRLPOOL 10a4268bb8b4362c3e9a8e1bb8163763cf3de3529003269f57fd10c2a415e2f357abe2a1d1ed0c9ec43acaf50d965ddb28aca5a0962a39a5d2801c5d3b79f2f4
+AUX assogiate-0.2.1-glib-2.32.patch 2108 SHA256 7f726f96456e5badbf019600b6c6ccc93a815acad34dad1e873fde55c9cfc7e5 SHA512 0f31eb8fabc13d898fbcf760d76de772f546a521b5a5a56d0728ced1d73d5ef98fbea96bec2075d8a392e641eee8e8729e1813f6a2caa9d2db14601de6988d47 WHIRLPOOL fb1d3bf00f4efff75f8ab33bb9f0a8b892dd058bfe470013fc350a6c14f0f8ebaa61da877e963b2ea6c2e3a9f2c6eb624850cb8b7bb1075eb3903e2b2893d0a8
+AUX assogiate-0.2.1-typedialog.patch 1037 SHA256 0bbecd8431ae2266ccc2472e40cc29bfc36c6951aa551b8b38fda32b9c681832 SHA512 d242b3933e287eb3d3e7b64ef5abe31e776307a974b9e40069ffabb19c414450cef2022ce4cc78cd28022ad8bec2c1e5e86eda50e3d94c9a23cdb352b5f6c7a1 WHIRLPOOL 76a460ff504c57433211cc4c200ab86654ec07be573de1f3b25c3807416119f427184c89db73308e5fefb23e874842da697d42dde4e9a83739e5da34a634167e
+DIST assogiate-0.2.1.tar.bz2 369446 SHA256 e5655af3a148f3446908ede69d47e005b2eadacbfe4e3d1a2b61d467ecac45ca SHA512 d54148a13c07e6d9526c67f6522ed450e4afa86074972ae195e2fab2080a68c25f7030be21fcc8aab67aaea9b4e2f70993a402bf91e513ca93b83955b9fba8ac WHIRLPOOL c4ff6c9ffff041166164882a9bacff79d5cc1febab8a599212c84585a589daa333504f93d05e7d21abd391ad0f285887612b85d717ee56eeb9461f857d7037f3
+EBUILD assogiate-0.2.1-r1.ebuild 1078 SHA256 c2d36d245c3a677f0fd7dd94e1b8907e46b281c2079b9b3ff22e12991d9b71be SHA512 2efb15d5150080f6f95c6ad72632d9b6262e11b84549a5a62f79191275a461a468c886101fa20f9e403d398f39cc970a2ce1fe13ce3a883d1e595024141b55f3 WHIRLPOOL 4b2245d55105d48f2428e889f385391f2a6859ead974ef1430d301bd049ec77116654c99eed00afd9086fa5b49833287ffc81b8b8255033a6ea4efceb4b1e2ef
+MISC ChangeLog 3421 SHA256 9bd1a65664cc354f2ee27ea442f7e088fcbbf07718f380de7ef1b2164db1c0d4 SHA512 f97e2fe597b298dac2063b768b44bd61574c11ad67449f34db81d249cb483b787fc82498cc51aa352f084a4507f617b3b4d851eda73bcc699d508b9872726097 WHIRLPOOL 52556a55c5cf81d4962ab1fc0902200b47e2c4018323a5feeef37b5a7f35b0f20c058fd43ddc6241cec3423db1ec0ca5772527a9291014dd1a4e20a20579e1ae
+MISC ChangeLog-2015 1997 SHA256 c0e204c6eb8d0a5ab9b56796ff425956a8645c14c54e345227fc956ece5a1cee SHA512 22032915c36f288fbb4ee6ecc4e516a319d4b07148c9cca646a56ade0aa0ca8c2a4d45db105035e4a0e80a74d439be949bba9b5c7e4cc2f0205d08d7adf1eb53 WHIRLPOOL 789daf67d887126473f4db3ec67ed014cf80319e456c3e212e9f3d6f70a9ea0c5455be3501a4eaf5badf3294e03fc6493d5e783b66408310fc2e13681f83e177
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..4737a2b52173
--- /dev/null
+++ b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils flag-o-matic gnome2
+
+DESCRIPTION="assoGiate is an editor of the file types database for GNOME"
+HOMEPAGE="http://www.kdau.com/projects/assogiate"
+SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.8:2
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-cpp/gtkmm-2.24.4-r3:2.4
+	>=dev-cpp/libxmlpp-2.40:2.6
+	>=dev-cpp/gnome-vfsmm-2.26.0-r1
+"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	# Fix desktop file
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	# Fix compilation, bug #374911
+	epatch "${FILESDIR}"/${P}-typedialog.patch
+
+	# Fix building with glib-2.32, bug #417765
+	epatch "${FILESDIR}"/${P}-glib-2.32.patch
+
+	# Fix building with gcc-4.7
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+
+	eautoreconf
+	gnome2_src_prepare
+
+	append-cxxflags -std=c++11
+}
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
new file mode 100644
index 000000000000..3944938611de
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
@@ -0,0 +1,19 @@
+Description: Update assogiate desktop file
+Author: Vincent Legout <vincent@legout.info>
+
+Index: assogiate/data/assogiate.desktop.in
+===================================================================
+--- assogiate.orig/data/assogiate.desktop.in	2011-05-02 20:46:29.322670186 +0200
++++ assogiate/data/assogiate.desktop.in	2011-05-02 20:46:47.835433235 +0200
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=File Types Editor
+ _Comment=Modify the detection and display of file types
+ Exec=assogiate
+ Icon=assogiate
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;System;FileTools;
++Categories=GNOME;GTK;System;FileTools;X-GNOME-PersonalSettings;
++OnlyShowIn=GNOME;
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
new file mode 100644
index 000000000000..33d13bd067d5
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
@@ -0,0 +1,17 @@
+Description: Fix ftbfs with gcc-4.7
+Author: Vincent Legout <vlegout@debian.org>
+Last-Update: 2012-04-04
+Bug-Debian: http://bugs.debian.org/667104
+
+Index: assogiate/libassogiate/mime-package.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-package.cc	2012-03-25 10:47:26.524889975 +0200
++++ assogiate/libassogiate/mime-package.cc	2012-04-04 18:54:11.675024484 +0200
+@@ -31,6 +31,7 @@
+ #include <libxml/tree.h>
+ #include <libxml++/parsers/domparser.h>
+ #include <libgnomevfsmm/init.h>
++#include <unistd.h>
+ 
+ /******************************************************************************/
+ /* Globals                                                                    */
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
new file mode 100644
index 000000000000..0bcecc31e5ab
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
@@ -0,0 +1,57 @@
+Description: Include glib.h instead of individual headers
+Author: Vincent Legout <vlegout@debian.org>
+Bug-Debian: http://bugs.debian.org/665507
+
+Index: assogiate/libassogiate/mime-database.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-database.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/mime-database.cc	2012-03-25 10:47:00.072890551 +0200
+@@ -23,7 +23,7 @@
+ #include "private.hh"
+ #include "mime-database.hh"
+ 
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/miscutils.h>
+ 
+ /******************************************************************************/
+Index: assogiate/libassogiate/mime-type.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-type.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/mime-type.cc	2012-03-25 10:47:00.072890551 +0200
+@@ -23,7 +23,7 @@
+ #include "private.hh"
+ #include "mime-type.hh"
+ 
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <gtkmm/icontheme.h>
+ #include <libxml++/nodes/element.h>
+ #include <libxml++/nodes/textnode.h>
+Index: assogiate/libassogiate/misc/extras.cc
+===================================================================
+--- assogiate.orig/libassogiate/misc/extras.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/misc/extras.cc	2012-03-25 10:47:00.092890549 +0200
+@@ -24,7 +24,7 @@
+ 
+ #include <algorithm>
+ #include <stdexcept>
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <glibmm/utility.h>
+ 
+ /******************************************************************************/
+Index: assogiate/src/main.cc
+===================================================================
+--- assogiate.orig/src/main.cc	2012-03-25 10:43:34.396895145 +0200
++++ assogiate/src/main.cc	2012-03-25 10:47:07.628890386 +0200
+@@ -28,8 +28,7 @@
+ #include <clocale>
+ #include <iostream>
+ #include <locale>
+-#include <glib/goption.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/optionentry.h>
+ #include <gtk/gtkaboutdialog.h>
+ #include <gtk/gtkversion.h>
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
new file mode 100644
index 000000000000..188c69be7cad
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
@@ -0,0 +1,26 @@
+Description: Fix ftbfs
+Author: Vincent Legout <vincent@legout.info>
+Bug-Debian: http://bugs.debian.org/624924
+
+Index: assogiate/src/type-dialog.cc
+===================================================================
+--- assogiate.orig/src/type-dialog.cc	2011-05-09 16:51:09.951622099 +0200
++++ assogiate/src/type-dialog.cc	2011-05-09 16:51:53.293459257 +0200
+@@ -144,7 +144,7 @@
+ 	general_upper->pack_start(*Gtk::manage(general_info), true, true);
+ 
+ 	if (renameable) {
+-		Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector());
++		Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector(), false);
+ 		cb->signal_changed().connect
+ 			(sigc::mem_fun(*this, &TypeDialog::on_category_changed));
+ 		m_category_widget = cb;
+@@ -622,7 +622,7 @@
+ 	} else {
+ 		AddItemDialog adder(this, _("Add File Contents Rule"));
+ 
+-		Gtk::ComboBox type(MagicTypesStore::get());
++		Gtk::ComboBox type(MagicTypesStore::get(), false);
+ 		type.pack_start(MagicTypesColumns::get().name);
+ 		adder.add_item(_("_Type:"), type, true);
+ 
diff --git a/gnome-extra/assogiate/metadata.xml b/gnome-extra/assogiate/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/assogiate/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/cameramonitor/Manifest b/gnome-extra/cameramonitor/Manifest
new file mode 100644
index 000000000000..edb65fbe6a02
--- /dev/null
+++ b/gnome-extra/cameramonitor/Manifest
@@ -0,0 +1,5 @@
+DIST cameramonitor-0.3.2.tar.bz2 216979 SHA256 04b120c8f3eb7f6c02976b0f3de21ecd13005c920e2acb294e3ffcad7fcd2058 SHA512 4e3d66f5829c111d524fe3cef5c9a330ee72e88c6c5dc3bbb528f10e81aa31682ab75a6fe7d4366ec63315341149d0472745917965bec2099590028327c75910 WHIRLPOOL 6ce61889e82aa0ad12f83ff99a8d497af83838fd1e206d7000cf2714793e0ed22ceeccf6b4089580f771db61a218be151640d0d7b46bbf7359d01a7f065cb7c7
+EBUILD cameramonitor-0.3.2-r2.ebuild 771 SHA256 c016fe6876ed91d9b972c30f5c8619f57be9fb6cbdd1ef63a00693318bdd3eb9 SHA512 8f61082e6052bf00858152c11136bac4b8b3012fbba9c4fb08589a6bfaa3c853c7acd2bebc7896694827a500aa8c783145cb5b439246f441a61298f2336ef567 WHIRLPOOL b4800be859ee57fa1ca5a23cde5f824e13c80b465e9a81f917afb778452df2e32d1ee97946bc88713cf02905351777c9666f0a97d92dada1dd461317d54d386e
+MISC ChangeLog 2448 SHA256 8071baf6064b01a79ad34c051b394806ae6f2c85aff4b06b9e8843ac5c02cc37 SHA512 febdb1407726a8ef1e5cac14204256b290259a04df3683f159320800403f9573d7fd073a50158cd841a03608d235913f6a859cc61e303b03012fea203a34317f WHIRLPOOL d5dbe692bb82833aa3d15ff99101d206a5ebbb1b0b0182a63a827eb6313a57e3888a1c4ff5a085b1f4359fdea55a8f6284561e7304bdc4e6cbe61db8f16f7ccc
+MISC ChangeLog-2015 578 SHA256 0f1629b84fbe93a601cfd849f5b448288aae4c3d95fc7f484cf803e7d054c687 SHA512 62ff6e7e779f0441728b9cd95f5dcafb30b7a02d9fb44127c1b71ab2ec104f871c87f07705b53051737e12d280d4f63f38a19ce1b44d356b216795edba22a0dc WHIRLPOOL c90ad1b577658e973f37f06dd0d284ee03496aa36efe34f44f71d049f70d6eb5b52c6879185a41a05dbec04e699d610862c52977336b4fbdb0ccf7634c2194cf
+MISC metadata.xml 445 SHA256 6fffcbe4afa446ea5e3a565bfc733be5098a1a9aaa53e8603f6c209094dedc34 SHA512 24b7a277d7eabe69b9e915629f75ce922cd88e1a30ecaed9288509fab617ba8108569fcbbd0587eef33d86c52055899106ff47df4d23348b5643c46f7376ebf7 WHIRLPOOL 28894a9b34f076854bc3f5f471ee2ff67fe0edad65cb1bad25d37acde2ad8d7dc2d22e02a96a6304ddef61248003be0bd363fae4aa748d2736ec27a87e6d3a37
diff --git a/gnome-extra/cameramonitor/cameramonitor-0.3.2-r2.ebuild b/gnome-extra/cameramonitor/cameramonitor-0.3.2-r2.ebuild
new file mode 100644
index 000000000000..0366a83c88af
--- /dev/null
+++ b/gnome-extra/cameramonitor/cameramonitor-0.3.2-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# eautoreconf needed to fix old Python m4 code
+GNOME2_EAUTORECONF=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Local Webcam monitoring in system tray"
+HOMEPAGE="https://launchpad.net/cameramonitor"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/gconf-python:2[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/gnome-extra/cameramonitor/metadata.xml b/gnome-extra/cameramonitor/metadata.xml
new file mode 100644
index 000000000000..58e32f19009c
--- /dev/null
+++ b/gnome-extra/cameramonitor/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+Camera Monitor is a little system tray icon that monitors your Webcam activity.
+It is designed for the GNOME desktop, but should work as well on KDE and Xfce.
+</longdescription>
+	<upstream>
+		<remote-id type="launchpad">cameramonitor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
new file mode 100644
index 000000000000..0c13a68fb6be
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -0,0 +1,11 @@
+AUX chrome-gnome-shell-8-enabled-extensions-array.patch 1231 SHA256 5c6db35133d91701619a3e3c46ba03719a3be3a7e1523fd52f0485cbc4faf66e SHA512 1c7423fcea6b258ae55fdc83658dab547b199b2b69e4f0fa54dc6b922718a23ebe6cf506a279eeff6c7c3a42bcc662e218bf5d4be9825c3558150495dc8a3bcf WHIRLPOOL d18d79f22298c6fa64fe2e35f826b8788bcd5d20551c594c3426a6b44071081b42c675f8fc3ddc5cbd71947a83dc7e7def4f346d3ba85e4b0d7b47af065f5c11
+AUX chrome-gnome-shell-8-get_dbus_connection.patch 2851 SHA256 0a5b9ffdc08d8836fb157883d04b0195d2c51ba9acea11448951b7b2264148fc SHA512 555674bf8b4077f466657ae101da344c17fbc8062012ab341943b48d3260fa83b9a0a3d7c7fdd11dd93e856cbbce5aaf6f7561b9d6457081cec3398d79ecbfc8 WHIRLPOOL 29dfac4608ff6fc4b2b37b9434ba065357ae3358f842b718e6777515a9d80a60417415eb2875f9347bb60cffed2ce5365ad17ef2dbf20cfc02e069f034adc8d4
+AUX chrome-gnome-shell-8-metadata-version.patch 1155 SHA256 9b66018a3bc565e6fb7591ae74958ecc2e4d8c90530a5309b3f163a390e9b667 SHA512 2d38dfd0fe30829053a7f3bcbee8a2afa6cda2cfe1b52d664338b95081b49d9974a5a976a75ebad7401c5dbeb4e76d0920e260e20f722c7af0f9f83b9bd224e8 WHIRLPOOL c416a7c1ef816c46ab8e9c88b3ff52b2049d5e44965f68d32cbf97f9c711482893c41c1fd5a48cae73c0e3eb48a31b58f7a05167b0be567551dfdd3bd5fdeaea
+DIST chrome-gnome-shell-8.1.tar.xz 145404 SHA256 27fa50a185aa1f4db5458d71fedfafba16a45498dc9cb619a2db9cd1dc8ae33e SHA512 90fc047aece51e8cee24d65033db1f32f6ddb90d24a63127248b0dc824f26dab3a5cb169e179a17c7b26aacb7d8417101f5a7695c979417e9f8464a9672b34d2 WHIRLPOOL 2ad77e3acbf760dab1547002e383cbf438b09931de3ea01c6302fe12ff5648a23e72cd32bdc6b431e8c1f6cd57a4b746ab071a67389e2de8f9ad0e826a17905b
+DIST chrome-gnome-shell-8.tar.xz 143224 SHA256 2621a1e0762ff39473180a0eed49414594ea3eae4812acd584d89374221b37c5 SHA512 61acd4b0564892667bd1468430ddfff4c0cfbe92b573d8b7e4c5448c25266bd0ee6e89e9bebe08553de4f9661ceeea46f5af38d980051491c40ed7deb24e3277 WHIRLPOOL 9e6de120bc84a4f431201753587864f6878eca0937624eccaea60e9f7c20a385ee0867107f823b131dc58e0bac121cdccda6e42861a5bc4ebbb45b7be7b374f8
+DIST chrome-gnome-shell-9.tar.xz 151984 SHA256 11fdfaa12208ec87ddbac27fc9652609c74e421d3e258de6b4776e392efdd448 SHA512 b9b5f913a74bdfa641ce35c62f15aa1ceff37e6e0fef43c127ff8ba31933ba2d9c93ee50809b013336ec63ae1020d4e1cacd56d9a86204e1ba4c0bd1d8ed50cf WHIRLPOOL 918a640f8da15b4ecb71870fb400f791c72ded75a3bfeaeb74a22c229afcde6f9497cc2c94ff2665f7d0cd7ea0dac83fe08870c3a3e590f3b425a44cb1b832a0
+EBUILD chrome-gnome-shell-8-r1.ebuild 2135 SHA256 058d4a9ccbe0e97a71cf85d30d7c21eab4d21a8f3ee655712bf5c385000266f9 SHA512 a53ddffc9b2a923fcbd3854963d1906166d43db8c5e6df026c006a6a898399d5cb8357df0ec2774e1572096d79fd79998ceeacd5b0d6d0b7adcbc8a00f81d2bf WHIRLPOOL 1cded745ca681d0aedfce057cbf422e66aa65d9d1941fb1db64f144b92b8cb942a7f78c1e909012ec471e84d0b7cd18c74d3f2219f1fc965cdcaecd4ae5c7446
+EBUILD chrome-gnome-shell-8.1.ebuild 1850 SHA256 4df66cf3c6810a648981dc99cd4351b3651b9a6f4e12552f375fa3e43d9f2fc9 SHA512 dac582a4e32e80e762c534421536926ddd299534aa6c72fe90986de1e2cb78467a9996162e17fa978382720b7d458a832c0e56db1615ca038e9d2458bf2c5c76 WHIRLPOOL b90677530eea66fea304d9f1a89dcadbf57420e080493bcf2028ea4b2d57d6f0c3cb9ddf4df5806e04735b627e56bb3e988d12339063ff78c7dbe2dd9c6cd777
+EBUILD chrome-gnome-shell-9.ebuild 1868 SHA256 cb1ee5df14c05614181e2b5fb81ff7abe85577ae9377d969e8358ccb7091a32e SHA512 84cbb17759a69935ddadf9386dfc649fa9b00bd6574ec5a346cfe5ead80a94fbda18d0de49b1ecc602c1e12526ff31d53494fa56280a88d36ec74ea7629b2bff WHIRLPOOL 97a3b4b3a050dc4faa22a00346d68121bcaf6c341bb110cbb32a28c1843fb6af33976618951522cb154d9a26a9cad608c28523402a7188c9ea73bb91ed525c8d
+MISC ChangeLog 2019 SHA256 d62eb78be27ea11a6f5cec0aa6ccbee1175f933e887f93207d6d0a020f4f5580 SHA512 8e22e279712742e1bfe5c31713894c45314b32fc88df80d2ed5a2a15407261a55642968295a25f7c268536895eb706e936c98e3ee1fff4c4f7de3fdd83ae34ef WHIRLPOOL 0d158f2c306c1df33dd4e3fb2bf9fcafe48457025f55320534a6abf97e2139ff74391b39f10933d0d85efc591cca0b6dbce8af52842fee529aa46725fd1f72c7
+MISC metadata.xml 573 SHA256 59cad2653050f7d4056b4ddd45b8778764cccf1cfdb611094d0124e6b1dc560d SHA512 aa570e3593e9652312853bfb1d6ce86e3a1f75c28f70bea9a2c551dc1bd067abccf7813c050978a1725b9a085517277913337b05ac833080b441168e93a5e27c WHIRLPOOL cb4f8ff5137d7ffb98bc0d83a52662d3886a4733c6f06f263d0d818490665d3aa8832427fe153518e657cade40d8a421a083f87a00301febc04ec64ceed68087
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
new file mode 100644
index 000000000000..0ddf6116f70a
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
+SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-misc/jq
+	sys-apps/coreutils
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	gnome-base/gnome-shell
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-enabled-extensions-array.patch
+	"${FILESDIR}/${P}"-metadata-version.patch
+	"${FILESDIR}/${P}"-get_dbus_connection.patch
+)
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Chrome policy files should be removed with package.
+	# Otherwise it will not be possible to uninstall web extension
+	# from browser.
+	echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
+	echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
+	echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
+	doenvd 50"${PN}"
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "If you are installing ${PN} for the first time then you should"
+	elog "restart or reload dbus service before starting your browser."
+	elog
+	elog "Please note that this package provides native messaging connector only."
+	elog
+	elog "Managed policy was installed to force web extension installation"
+	elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
+	elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
+	elog
+	elog "For Mozilla Firefox you should manualy install web extension from"
+	elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
+	elog
+	elog "For Opera you should manualy install web extension from"
+	elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
+}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.1.ebuild
new file mode 100644
index 000000000000..212495f9a51c
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
+SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-misc/jq
+	sys-apps/coreutils
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	gnome-base/gnome-shell
+"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Chrome policy files should be removed with package.
+	# Otherwise it will not be possible to uninstall web extension
+	# from browser.
+	echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
+	echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
+	echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
+	doenvd 50"${PN}"
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "Please note that this package provides native messaging connector only."
+	elog
+	elog "Managed policy was installed to force browser extension installation"
+	elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
+	elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
+	elog
+	elog "For Mozilla Firefox you should manualy install browser extension from"
+	elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
+	elog
+	elog "For Opera you should manualy install browser extension from"
+	elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
+}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
new file mode 100644
index 000000000000..599855c9cf5c
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
+SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-misc/jq
+	sys-apps/coreutils
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	gnome-base/gnome-shell
+"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Chrome policy files should be removed with package.
+	# Otherwise it will not be possible to uninstall web extension
+	# from browser.
+	echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
+	echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
+	echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
+	doenvd 50"${PN}"
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "Please note that this package provides native messaging connector only."
+	elog
+	elog "Managed policy was installed to force browser extension installation"
+	elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
+	elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
+	elog
+	elog "For Mozilla Firefox you should manualy install browser extension from"
+	elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
+	elog
+	elog "For Opera you should manualy install browser extension from"
+	elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
+}
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
new file mode 100644
index 000000000000..7a56ca0256be
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
@@ -0,0 +1,32 @@
+From 1de3c56c636adfdb74970bf9d7a5424af3830d92 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Mon, 23 Jan 2017 19:43:30 +0400
+Subject: [PATCH 3/6] connector: assume that "enabled-extensions" array can
+ contains duplicates
+
+See-Also: https://bugzilla.gnome.org/show_bug.cgi?id=777650
+Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/26
+---
+ connector/chrome-gnome-shell.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
+index 719a347..0b92d83 100755
+--- a/connector/chrome-gnome-shell.py
++++ b/connector/chrome-gnome-shell.py
+@@ -424,9 +424,10 @@ class ChromeGNOMEShell(Gio.Application):
+                     continue
+ 
+                 if extension['enable']:
+-                    uuids.append(extension['uuid'])
++                    if not extension['uuid'] in uuids:
++                        uuids.append(extension['uuid'])
+                 elif extension['uuid'] in uuids:
+-                    uuids.remove(extension['uuid'])
++                    uuids = [value for value in uuids if value != extension['uuid']]
+ 
+             settings.set_strv(ENABLED_EXTENSIONS_KEY, uuids)
+ 
+-- 
+2.10.2
+
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
new file mode 100644
index 000000000000..be5f6c4e51d0
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
@@ -0,0 +1,91 @@
+From dca4a3538f86d8e2e957945a691430573192716d Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Tue, 24 Jan 2017 19:42:19 +0400
+Subject: [PATCH 6/6] connector: do not use get_dbus_connection after
+ GApplication was released.
+
+Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
+---
+ connector/chrome-gnome-shell.py | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
+index 0f6e5f1..ac6740a 100755
+--- a/connector/chrome-gnome-shell.py
++++ b/connector/chrome-gnome-shell.py
+@@ -106,21 +106,26 @@ class ChromeGNOMEShell(Gio.Application):
+             self.hold()
+ 
+     # Is there any way to hook this to shutdown?
+-    def cleanup(self):
+-        debug('Cleanup')
++    def clean_release(self):
++        debug('Release')
+ 
+         if self.shellAppearedId:
+             Gio.bus_unwatch_name(self.shellAppearedId)
+ 
+         if self.shellSignalId:
+-            self.get_dbus_connection().signal_unsubscribe(self.shellSignalId)
++            dbus_connection = self.get_dbus_connection()
++
++            if dbus_connection is not None:
++                dbus_connection.signal_unsubscribe(self.shellSignalId)
++
++        self.release()
+ 
+     def default_exception_hook(self, exception_type, value, tb):
+         log_error("Uncaught exception of type %s occured" % exception_type)
+         traceback.print_tb(tb)
+         log_error("Exception: %s" % value)
+ 
+-        self.release()
++        self.clean_release()
+ 
+     def add_simple_action(self, name, callback, parameter_type):
+         action = Gio.SimpleAction.new(
+@@ -191,7 +196,7 @@ class ChromeGNOMEShell(Gio.Application):
+     # noinspection PyUnusedLocal
+     def on_service_timeout(self, data):
+         debug('On service timeout')
+-        self.release()
++        self.clean_release()
+ 
+         return False
+ 
+@@ -203,7 +208,7 @@ class ChromeGNOMEShell(Gio.Application):
+ 
+         if len(text_length_bytes) == 0:
+             debug('Release condition: %s' % str(condition))
+-            self.release()
++            self.clean_release()
+             return
+ 
+         # Unpack message length as 4 byte integer.
+@@ -255,14 +260,14 @@ class ChromeGNOMEShell(Gio.Application):
+     # noinspection PyUnusedLocal
+     def on_hup(self, source, condition, data):
+         debug('On hup: %s' % str(condition))
+-        self.release()
++        self.clean_release()
+ 
+         return False
+ 
+     # noinspection PyUnusedLocal
+     def on_sigint(self, data):
+         debug('On sigint')
+-        self.release()
++        self.clean_release()
+ 
+         return False
+ 
+@@ -545,6 +550,5 @@ if __name__ == '__main__':
+     app = ChromeGNOMEShell('--gapplication-service' in sys.argv)
+ 
+     app.run(sys.argv)
+-    app.cleanup()
+ 
+     debug('Quit')
+-- 
+2.10.2
+
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
new file mode 100644
index 000000000000..238d1fcd1df6
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
@@ -0,0 +1,28 @@
+From 48ded6911e60fb8415190b252ca420b994e6c525 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Mon, 23 Jan 2017 22:29:12 +0400
+Subject: [PATCH 4/6] connector: assume version 1 for extensions without
+ version in metadata
+
+Bug: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
+See-Also: https://git.gnome.org/browse/extensions-web/commit/?id=214f03ee90f0f391d3d4fdec23feedf45e3d0507
+---
+ connector/chrome-gnome-shell.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
+index 0b92d83..0f6e5f1 100755
+--- a/connector/chrome-gnome-shell.py
++++ b/connector/chrome-gnome-shell.py
+@@ -506,7 +506,7 @@ class ChromeGNOMEShell(Gio.Application):
+                         http_request['installed'][uuid] = {
+                             'version': int(extensions[uuid]['version'])
+                         }
+-                    except ValueError:
++                    except (ValueError, KeyError):
+                         http_request['installed'][uuid] = {
+                             'version': 1
+                         }
+-- 
+2.10.2
+
diff --git a/gnome-extra/chrome-gnome-shell/metadata.xml b/gnome-extra/chrome-gnome-shell/metadata.xml
new file mode 100644
index 000000000000..a24e5c1ae81a
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ykonotopov@gnome.org</email>
+		<name>Yuri Konotopov</name>
+	</maintainer>
+	<maintainer type="project">
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
+	<upstream>
+		<bugs-to>https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues</bugs-to>
+		<remote-id type="github">GNOME/chrome-gnome-shell</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
new file mode 100644
index 000000000000..38addd9c3bac
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -0,0 +1,12 @@
+AUX cinnamon-control-center-2.8.0-optional.patch 3453 SHA256 984e042f17acba7492b7e2c1097b3cd5791ccd9f83a6ced9a529fafce3ebc1e4 SHA512 b74e69516baf9df9870941ca6a463b6a7afa37cb4b333c0da6fd6e2e60c09762afabebe145f1efd8accb08ff5dd4e0e88698598a8ade8d3024e2613813c3d6d1 WHIRLPOOL 9c5b4b4b3d197f3b74aa5ac30fc140df5ba6d80eee7dd0c9ddd47a9ac40c490f1f2d9201c6a326c2d8646d79ede19247887bc936908b69752442e693329bdac5
+DIST cinnamon-control-center-2.8.1.tar.gz 4090162 SHA256 595076ef89949c31357cd45f41818df1f6b7350a2b810f107e0b88cd9870e273 SHA512 e0f21bc29128b56d2024ea5bd9dff70a917259437804f4aad0942ee1313090b70e6811d1b54513b4639c0bff0230efcb2847a42fcf9ad183b24a3cbfeda976de WHIRLPOOL 47d3255eeddd782fb5c87ff82ed5d8ab8588b8066b9da9344abcfa259d0b481e06f676cefa43563f28ddc75d2c8112b30712b4ae52f750e03f779b1a73108c7b
+DIST cinnamon-control-center-3.0.1.tar.gz 3834138 SHA256 3d9f0eb45168a91101f99452b38184dd6417dd89064be4523e565bd721a521fe SHA512 97f726cddb12afd697a542bf40b89c84e8256cc7e1bff31eaf3ed86ba9ffe23660085e4e4123f955f1aa4aa31930b209c2a26649f2dec55d10a4803d86942e46 WHIRLPOOL 68f0d2292d4fa43de31d9ed8cf4d15f1fc887e26ebc7c21cfec9c180ca01f6b7b11be0e88c5a4f2f84b35c2a6162565cb5b8eb647d563d8cd939e700dc76f4ff
+DIST cinnamon-control-center-3.2.0.tar.gz 3837279 SHA256 60696d6793e2e7de6746ee65b3dfd64948ad5eb8a46182abefb3c464e4a2ea2c SHA512 19a3481ba52784c733e5aae9603596a29fc12c78f21b8fe08492deda8c3eeac2bdbfc2da24f29dc5db6f6de02a26a43f67f3141dbfbd07c26f0e38a872c39216 WHIRLPOOL bcc9767b024a91a5cec947f95a1674e7abc25a8b29081a42fa4ec032ef1ee2b40f34bc369bfce1ed7418281b4da16012cc2f3a592987a4e6a7fcd457b7fa5d90
+DIST cinnamon-control-center-3.2.1.tar.gz 3838032 SHA256 12a29a3293cde58ae6fd6fdbab7eef4a2119ac8f515ca9218e75cccc3aacd15c SHA512 77f98aa47a10ef280ca7c3f8662e770d87a5427c91093382d3c289abcc0eac38317a31cd47a19a8ee67a4579375b84392f45d239b98fe494f7abfe10ef186554 WHIRLPOOL f6bb2c879877389673c72b5a8faa9974d5d67b4404776633f0954155d5fc1cdc483b8c900c13e680880d7ee6a02c4d876c0f4ad1facae2123ed5fb5a61a9ab62
+EBUILD cinnamon-control-center-2.8.1.ebuild 2673 SHA256 d3b3ed635872923eca792e450b369cac472c065a40e71f6b8abcca417a0e0b82 SHA512 5ad2c1910d15c6202751a1c5298d0e4c12cdff20ca03f826c4b3defa9acfe352de5b95363c020e25c4bffd2bbd70f768b86d3ef8b70d2b7ba39fc9002b31dd5a WHIRLPOOL 1ad97b36271719b11468bba830279a9e5e530524fda6f15384adb3ef48c4bc81631d7ab26561abca037522c07ef4a8baa172349719a4e9bfa3091a4c5bab4366
+EBUILD cinnamon-control-center-3.0.1.ebuild 2611 SHA256 0631e45190602e3cea2b7dd692d8b8642b06947f3c1c114bb1e81b28869505e3 SHA512 f4373e0845807fc3182a086ebbacee8e5a18c015c6ef2d1c2f00211cf8f3ea162f9c55daed64b5a1c100d3621d7446ca6bb8f4cdec86099a2ab51c911fb52fcd WHIRLPOOL 3fceb4cf2e3a9b2b83cdf94aed7fab7e0fba5c6a9ae3503087f8aa2ee23822ab5a3cb9ead4806aeb1f282237d446c4a4ec821d9ca0d4979680e33ab719a7f1b8
+EBUILD cinnamon-control-center-3.2.0.ebuild 2585 SHA256 e2b9728d3ffb7c1e29ab32a204333911322c444d84b1e1acac0576dc9e0378a6 SHA512 4dbb1a7f539a6a38e99472ada1703d0b27a6e761c62b266b500b9b66e59a955d698387431e9f8adfbf68511bc9a8ff4e5d36c416d5d0314406990b49a11e595a WHIRLPOOL 4d6d5aa1f0a0b61782e0709321fe3a4e5ed9cc85cd8fbdceabf4cd73a22d1ec9d7fd8766d0e26d3e08d7a17b33d6a71d463374142a15f0ec37a263d502f73870
+EBUILD cinnamon-control-center-3.2.1.ebuild 2561 SHA256 60adc5e8012975086a284c2ed89a5d2ce4c6d69e69ce8fc2e1783de553c63792 SHA512 423385581a6c1702d2064aca5a3e85eecbd0e43c4fa92368ff959e92891fac2aa1c411c7cf215e73900917844ce281bec3d4b37185cb148d172e7236bb0d968b WHIRLPOOL 7e55a6cf22befed2f7e76acafa5ac3f74e8adb75a0695c4035ff2a4e14b5c415b4291e2379a2f4aa9b199093f29c071ccb3bcd9951a4b92eed5a1c860a31905e
+MISC ChangeLog 7018 SHA256 cf8f75100a7e97725a832bba164b1b62fd23c68144ca4e5ebb8081b77b2c1e56 SHA512 4b54b52d8fda82af26a45ac0f5b18617c937988c42a38229a833bd50f1ac98bc0622def6dd7c0b98ebd9571fc9d78b4d5e92c3be560291d60d080ab4431a4b93 WHIRLPOOL 9874c04eec2fc34eff5b55ac3927ed362ed992d4d68b08a0df9e9b7e0fcbf12e7e25deda9891aa95bf47b2ade992dab1d1d87510998d0a3c6352b9874e44dc46
+MISC ChangeLog-2015 4487 SHA256 b335df0e1568ef3f209989d3da1a88130825f585f5d47ed585f0392d77cdf995 SHA512 4315e5aaaa4ffd269339818c1d14fd433e7113f43c04bca9898a275145e595dc648daa1e5982e9e2b5606b1f6d9b96064bee3b8bf2108f872c98b26f72419298 WHIRLPOOL 5683f89bd3c1f798f52b46715ed76a61b68e67edbcadfef4c33e07f287f3e17d267565f15bc2d8cd583f4f030fbed24d7465c5a8709bb7d42eb88f4072dadb1b
+MISC metadata.xml 467 SHA256 ede09de6deed9758b51638eb9e7bdf8ca8308145ab9d65f19c7eafd0a4839577 SHA512 7d0ac6b976cf87f9178808cc9b14c6901ab1ae66124fad8e398e9f06ca8a91c3de21da27636cd632f0deac707720ab21b879b6d68461a04db8685e7cd8bd768d WHIRLPOOL 9302b985f8630a81ea284a0d8438d1e1acc46051291b57b87917e9808327ca795e0732cc6acfedbd85f66b8528bc803c114d630b911da0bba1ef802b5086b117
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
new file mode 100644
index 000000000000..5979d2989764
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups input_devices_wacom"
+KEYWORDS="amd64 x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-1.1[glib]
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+
+	app-arch/xz-utils
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# make some panels optional
+	epatch "${FILESDIR}"/${PN}-2.8.0-optional.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--without-libsocialweb \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
new file mode 100644
index 000000000000..b1b173b37c18
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom systemd"
+KEYWORDS="amd64 x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8:=[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd sys-auth/consolekit )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+	sys-devel/autoconf-archive
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# make some panels optional
+	eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--without-libsocialweb \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
new file mode 100644
index 000000000000..ee1441423e0d
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom systemd"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8:=[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd sys-auth/consolekit )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# make some panels optional
+	eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--without-libsocialweb \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
new file mode 100644
index 000000000000..fc5ab9e8080f
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom systemd"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8:=[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd sys-auth/consolekit )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+	sys-devel/autoconf-archive
+"
+src_prepare() {
+	# make some panels optional
+	eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable systemd)
+}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch
new file mode 100644
index 000000000000..d5beadf7e0e5
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch
@@ -0,0 +1,107 @@
+diff --git a/configure.ac b/configure.ac
+index 144bf78..a83e1eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11)
+ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ 
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+@@ -197,15 +196,51 @@ if test x"$enable_cups" != x"no" ; then
+   AC_SUBST(CUPS_LIBS)
+ fi
+ 
++build_color=false
++AC_ARG_ENABLE(color,
++       AC_HELP_STRING([--disable-color],
++               [disable color management panel]),
++       [case "${enableval}" in
++               yes) WANT_COLOR=yes ;;
++               no) WANT_COLOR=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++       esac],
++       [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
++       build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++       AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ build_wacom=false
+-PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
++AC_ARG_ENABLE(wacom,
++       AC_HELP_STRING([--disable-wacom],
++               [disable wacom management panel]),
++       [case "${enableval}" in
++               yes) WANT_WACOM=yes ;;
++               no) WANT_WACOM=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++       esac],
++       [WANT_WACOM=yes]) dnl Default value
++
++if test x$WANT_WACOM = xyes; then
++        PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
+                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
+                   xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+                   cinnamon-desktop
+-                  gtk+-3.0 >= 3.8.0],
+-                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
+-
++                  gtk+-3.0 >= 3.8.0])
++        build_wacom="true"
++        AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
++fi
+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
++AC_SUBST(WACOM_PANEL_CFLAGS)
++AC_SUBST(WACOM_PANEL_LIBS)
+ 
+ # This is a hard-dependency for the region and user-accounts panels
+ PKG_CHECK_MODULES(ISOCODES, iso-codes)
+@@ -408,6 +443,13 @@ fi
+ #else
+ #	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
+ #fi
++
++if test "x$build_color" = "xtrue"; then
++	AC_MSG_NOTICE([** Colord support (Color management panel)])
++else
++	AC_MSG_NOTICE([   Colord support disabled])
++fi
++
+ if test "x$build_wacom" = "xtrue"; then
+ 	AC_MSG_NOTICE([** Wacom support (Wacom panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 76fbc88..c5c2d1a 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,7 +2,6 @@ NULL =
+ 
+ enabled_panels = \
+ 	common \
+-	color \
+ 	display \
+ 	region \
+ 	universal-access \
+@@ -18,6 +17,12 @@ else
+ disabled_panels += network
+ endif
+ 
++if BUILD_COLOR
++enabled_panels += color
++else
++disabled_panels += color
++endif
++
+ if BUILD_WACOM
+ enabled_panels += wacom
+ else
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
new file mode 100644
index 000000000000..2056a4559429
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<use>
+		<flag name="colord">Support color management using
+			<pkg>x11-misc/colord</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
new file mode 100644
index 000000000000..0706890238b9
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -0,0 +1,14 @@
+AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 SHA256 5c9ff202405adafdcd385fdb3e6a2b42c6f95c74d733912b62c8e081b3e06b4a SHA512 b8d72287707a1caad2dfe90a220973ea70b0c523ac14b79b21c11c87ca9a8e844698e9a33ec6f27f0dcd9c8e88d2117aab8b0064688917d7e1acbdc368e85f2e WHIRLPOOL 2b3c9a74a59d72a1578b483ff032b9130fed4f36a0940ed01656b8b0f92ba736f2cb47e2c3866e16c3f0ef92c2db53d8ff5fffad53bcadd184d9c92f973a0c92
+DIST cinnamon-desktop-2.8.1.tar.gz 529226 SHA256 e3eb7210013992db9de050bc6c26f405d66a6c4f0363812deaf191b1fbab595b SHA512 2f1447232ed11bca7507aa0af1de1f0843c5161665a42c9382b402695fa1f0b42972fb29d6d02cf8f951a7573f44fa9771e82f5bad6aa714419bf4a690e35dae WHIRLPOOL 729b191ecf237ae3bc0bfe68c63c650b596ff76347457ce15b267cb01e52dcd13f39b0d21ea1d5164ee841dc0065393587da1f51868338bd71af753891c24860
+DIST cinnamon-desktop-3.0.2.tar.gz 577776 SHA256 a8bbf148b9ee25f21fb2c196a54c95eeee7e35cd23b32f25919516f08e8f4dda SHA512 0adcc7bd9f9dace245a7d7528893f729947228e4c454e423cdb1d3ac2ae3c04d010226e340d5d9315cc45a84f96f7b0bb173ee1589169ddcfbfadba59e0787a6 WHIRLPOOL 039e080ae6e43d356d0c22fce2b18ba1f382d31273a51f1c07daa0e2d0572a3b14426ec44d5e402b987676f36e606a381816396c2f466da593faeabf27d87c12
+DIST cinnamon-desktop-3.2.0.tar.gz 572478 SHA256 84c29fd9256370b6789613292fd12ec7893c1b752487dc938b056a3d68607212 SHA512 e93ec4ee44152b800f75848bd9327b46f4ab0c6b2f4d0dc7f6d6f631eda0d486b995a5bb1537b2c85774fb3a48ae99332937fa8b6021aa08d98b98fc25a8429f WHIRLPOOL de9ab65cc297d8000ee9c74245080da95e12ac2e2c39a1a02316fb4d257693acee8414d98950790e9c880c6acaca0c6d535a236ab6605edbccd30d93008a9f2b
+DIST cinnamon-desktop-3.2.4.tar.gz 570814 SHA256 f9920082b299c85d11cfdb6747026f5f044eabf3a09c0164873fa2850561abad SHA512 d07dbc63df4b689cb1fdeb7032c9f19557de0849def929a9ffc99d5aa1bb49edd37899256152d1245e1d43690821ed61a10e63f82962f787f5e06d999dadaf76 WHIRLPOOL 0474c43c922b517ba0a227bff5b9a48b737621f3bdcf01628c37f9ed3b7ce8cf910dc5ae3ec990c0416cae1c9ac1c882b8637862fc4cebd92c9b9d82cfbce392
+DIST cinnamon-desktop-3.4.2.tar.gz 570232 SHA256 58d594a896f2ce843b8dbc4430e1e538caa5f795e0bca07e5429ba953523c2c9 SHA512 821b49aefa2c4fff54a2ebf4ed61d8bd8ccb193d5ba113b9e5e917d7abe6baf4e85f721bdaf9dc206b4d6b1ba3080eff0c7925ab4d1970e0a58895e8891b4f8a WHIRLPOOL 5588077eeadeafd8ce75452b5cb8501080c2dfed43dde873e7cabc3c9d62eea85ff4c49e30adac854798b5963b870a5bb27270020ca433ea198fd83008233329
+EBUILD cinnamon-desktop-2.8.1.ebuild 1667 SHA256 d9e8d6e3780071c656ba5f219a1144f4b799be873dcd5994467fa34bec7f75bc SHA512 e4204597edcf5e9a49174abe82ddd9ccdd65ff9785017328ac8323ce44090b68f58c36a98bebe07fa83d07b801dc8b0310f496e2026023a484421cd70ec5226f WHIRLPOOL 1171d7138bc5ded2687461513190d9d90d3e8518180d564979719f681558045680c10e8ba3decec010bad823bca64af0f180011698d3324ebdfce0eeeffb2b39
+EBUILD cinnamon-desktop-3.0.2.ebuild 1697 SHA256 12b88c651ba53b95c96554e08758ff7b81e3fa76eb015794874a19ddb4e7429a SHA512 bfe955ae7cff1c85b970ec9ad8bccebf491d5ff86b5019c3fb858bb9c1dd6a9aa0a25b6974885889064e1524b60579cc49443a562e90878ef83411edd27d3dcc WHIRLPOOL 2044ab843b87f06fd6245ffb0f72c3b57aa1756526834afaa537fe95a13c9027bc9f65279ecf8490d4abf59e250e6bdd37adc2b948cf09279dbd61250c9ef8b3
+EBUILD cinnamon-desktop-3.2.0.ebuild 1673 SHA256 1d0879e0481fc99743a428269db716e8b5a59234c80b49cab27a2af6fe979efc SHA512 82a24036ad9e62d4417e5b0d823d1afa414d3336e645dd24a0f248a683385f5c42cf73c6e64540d601ae9f1f258e4a4a9457d51e69d11984ae6c36e635be95c8 WHIRLPOOL 5e7f48ee78e243a119623b4d7b77b0758a14ee1fb8db80a92dca57668a1f8f165b2dba4c362aba0cfe9e2eb672923cb21983eb0b194bdba524849ad4e53abbbe
+EBUILD cinnamon-desktop-3.2.4.ebuild 1679 SHA256 873ba62c365d51055d6dadf17bd160f8e40c5ee3c3858e41557a627cdb01ef62 SHA512 3ffe482cbb3993b554832a377b0192a6bbe2c3b50f92b7e0ead48a99877b19aafae6b109c84167310b8d7cb19c7bbd98eb01f43302c15acf7399f8ae6f4fdeba WHIRLPOOL 87f01a37d786a9d71630a36689ed2f1338694cb5dea1b9ac3040265f4ba68bc38f97ae98d11f76ba2dea15040241c3fd5e130c85277e3899a2d5b0f1fa977b13
+EBUILD cinnamon-desktop-3.4.2.ebuild 1705 SHA256 78693018fab5c42c2e71b15e1e761e814f8a8f441874d3b7aa94079111f43667 SHA512 02fded4450d126d41528911207e6073c4e310bdfb2c2e786d73979b9a96cb59ff4ab4e28628bf11c9eda4a5453a3bbe96bd85c857cce5459f6235e0375dcef7e WHIRLPOOL f3dfad5c8f96067ea7180d756d1c156b77ffcca127b8e69b1bfe5682a1aa6fa180227732169684a8fa68999e0ddb2864b6978b51a8477a881969530d13714fa6
+MISC ChangeLog 5321 SHA256 9dd019ad59916da5b15f7e85303422d582ceae09bb63f074434788fd49ec6e74 SHA512 ce95ecd43a80d8c3ea5de5c4e5891006d383dab5188c8f7fcc0bab04c53915a03e5fe22c1328f79a0cd31a36c08cf029ffc6586ab7d407509edffe1819bdb200 WHIRLPOOL 57c6a94de5ad83c9614d966a21b322138f1b133188fb0f4850208426c20469a6ffb88a4a7d4311eb0eb0aea352901f27a11c0f7bbc0e7a69ee951093b8d2f9bc
+MISC ChangeLog-2015 1945 SHA256 03c6a92901ae3b7e3a6c0ab88f4976cdb477a10c3ee2f4e4513337a044c68313 SHA512 f5776b70cc2e907794a8f1cf169585f8dcc61fd2ee64399afbdb69b94eb0a4d5e0465c5b472ef0d9bea48037abb1007c2e8d19078a3d2eb1e535f294af90d912 WHIRLPOOL 3116dba75a51d984354bf563e663183a179f7ee69e2381bd31f53b44950873ec8adc092c4560a4381fab58886c21864fce2283795eb5921fe1f39fd4f170e501
+MISC metadata.xml 355 SHA256 ad17df99c9f42a63fc95abbf39a9f03520d6082d31506d08682efaec22516162 SHA512 0ba7baee0aa30973297f85b1b1e4ed37789cf9aa3fa3302ff86512be2829c6a3c797b14b27b822aff54639f7fb716debaf5bfad2e255ba0666157245a415022d WHIRLPOOL 8637943fde256268c6f85dd8a7e8157532e1f62c0b5684a4796bbf36922984e4c1dcb24ed826b712393b7290475ef710d583a98b357cb5d776601d2d8660cb04
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
new file mode 100644
index 000000000000..4fb86d3d0526
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="amd64 x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	python_fix_shebang files
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild
new file mode 100644
index 000000000000..300489c9c44b
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="amd64 x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	python_fix_shebang files
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild
new file mode 100644
index 000000000000..7aa1c85f8eea
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
new file mode 100644
index 000000000000..91b950b837fd
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild
new file mode 100644
index 000000000000..547abb541964
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	sys-apps/accountsservice
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override
new file mode 100644
index 000000000000..cf08f9ca2d2b
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override
@@ -0,0 +1,5 @@
+[org.cinnamon.desktop.session]
+
+screensaver-uses-logind=true
+session-manager-uses-logind=true
+settings-daemon-uses-logind=true
diff --git a/gnome-extra/cinnamon-desktop/metadata.xml b/gnome-extra/cinnamon-desktop/metadata.xml
new file mode 100644
index 000000000000..e05983511df8
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/cinnamon-desktop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
new file mode 100644
index 000000000000..08a0cd7993b0
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -0,0 +1,11 @@
+DIST cinnamon-menus-2.8.0.tar.gz 208853 SHA256 06a6e0a11644dfba8459b2b77fac61563184a3d734bd0e7c0f7a6654df1b3a1c SHA512 fe55e3f245a6848805c6b75e9e385e80958cc835560e5dfdd4e2286c9bc5f447696398ad67e341b917751e0a7a54d89e163fe0a04d38567c421ae1f2382cba09 WHIRLPOOL a90f4f3a9f52fec607c082d4c713d4c601a4646d57844f0c372140bb83f98017698f4fdd7bcf5d5e2c96f3e864c5717cfedea5fb4c02f5a10618aeede8fedfb6
+DIST cinnamon-menus-3.0.2.tar.gz 211077 SHA256 e17494e65edb6ca8b36e05ca21316db8ce6864d4f9bfa9312a661d5c39054ad7 SHA512 a309c10e21be1f5fe7e558017cc0573e7ae421ef860465411190bb071eb42caa8013f52ec71257322ec3dd37de998c78cd9014c4f4daca1edde413db6bed6b7f WHIRLPOOL 2bf6b26a40e45121c8adb40df0a3873aaf171beca14af8759adc725313b97fcce3ff150551bfe43d72e6caa835ebac9d1fe379852b280b967828486cd2951edf
+DIST cinnamon-menus-3.2.0.tar.gz 211237 SHA256 96eb3303151fabc18ccf2719849149d08f7391d22d0a6b72e82326009bb243b5 SHA512 5cec12ce4bf64880283064e3d5d169dc22ce692974b40a0f7eeebbb820780c941d9a2116eb6a2eb2bf3a3165262d23da47743390f56bfca6e74b298cf4be0aac WHIRLPOOL f988a4b90be60d9689e50f38fb192ce67de808f59f97d9a77f78a112277021517d917be7c2027623fb5094d819ee2ce8149a5ed7c9a371c1edec6ffe143ddcb5
+DIST cinnamon-menus-3.4.0.tar.gz 181649 SHA256 c0d60a612ab67ce76021b22821aff548e9779a6c3b2cc9ef393aca80c0044aad SHA512 77ec3f608323b263b70aefb633ecef83e68b82224e64d2cf3c6dc95c12537f81b41de08ab400596e2af0ecec1effa731ab66a83bddaffdb3bb6c8a7ef835f5b7 WHIRLPOOL be491935d33df5e56e688eca577836e4da6e66805a91fb2260b533751328607881d318f9d751e9b7928b8e7d7bf78aa1b2741b264285fb80c12f8c44a31e3b6b
+EBUILD cinnamon-menus-2.8.0.ebuild 911 SHA256 64848b685dbff9e51eb8117f7ecab7412e4fcf84ce93a0182161373d42df8d03 SHA512 23252a7163487b8f5952155e6628d3f9c4cc2208c2b7023346007493913cba0a0439b5dc8c4967b4f410a7f184085b64e54f717d441a55a6d46f06300828a7a7 WHIRLPOOL 89133c7978be05309144747a8da7eee7ae039ca38679a367169bfa2e14751a3f04d15c01a961fbf72504fb9a6c845779648f9fb1a3d3cd615b2a6827762bc236
+EBUILD cinnamon-menus-3.0.2.ebuild 869 SHA256 0267f0adc6b6e1184127ed3de694660866335117f7b5731c04b65c4f2a4a8d86 SHA512 2723bc1745a7ae044ac58e71e6b3968e1544690640bef0aeb6e2c292805c0961a57dcc6e2cdd1cf1941aae613e4079ed563bf01824bbbfb2ae0dc7bea9b6ed94 WHIRLPOOL 23405a5cf158f478a64c284ac3da57de5bb8f4d14eb125766105b65389cf91f3a2d77006e4832e9edd42124c54fcc219605c4bb41e691dafeca538df950915fc
+EBUILD cinnamon-menus-3.2.0.ebuild 871 SHA256 be810d70b7fb69362abbf352752503ba2ed729707acb519c142eb78a5bee9260 SHA512 23270c9b4ba89e41481690bfe62bd3a87908836cbe7beffbb3d99a4e23a13d27c348b8806053b78b9461d1b601981806700e5415d42556e9f5fc6198db607d3b WHIRLPOOL 9c33b81e5b58fd9e7d882591aca7a25350687ad033bc840c8a8af9cee3613214428e7039c0607c41100e88ab10cb1dd1510abc388a042ec10e72160067f8ca29
+EBUILD cinnamon-menus-3.4.0.ebuild 871 SHA256 38afaca84bd18241bfc96622bf9cfe593825068e2b6698ee50d79c59e0f73209 SHA512 7f2ba0cee5846fc29184a5e0c85f622828f4a1b40b57b75a856028e8b7ed1b221fe69587c9db8eb55f88869fc4beed59f84ba740b506db3b4fb427adc20845a1 WHIRLPOOL 5f45aada4f8342f4bc3e541137868aad2aa590da43c42845abc8c4f58158bb955d3ab35ed9e217bc61224163a27d523d6b63ca5384e13a48a2942070e7fcdd0c
+MISC ChangeLog 4544 SHA256 5a34ac61b05dfa526c50d2059012dd8ab62d2a924c08a484ac27dcce1e2c2706 SHA512 63312876ca079fd76875abb8b0c0fe94c81ce16a498906f31bfbb898bcadb0679aaf994ca722298a502d0997647b18a172dbbba6bac42cd68d55c52728f747c9 WHIRLPOOL 6a579a42b8c765f3e15729c7fb1c7245527dfd932d85babfd054f677b8fd01330a666f6ec1149faa7671e3132cf363dea304ab7816624dadb0cc04d5f262d816
+MISC ChangeLog-2015 1743 SHA256 34273b8ba8d44b45d82bdd0f78aabf01e8a1d367d51d75b3665c317bc61c03a6 SHA512 8e61bcafbaaea6f38eb7d1a57517c810855df5d646c7f45ea4ccd503ae3c19178c1ddda1ce92b54d23143b0ce2374e8091c4b3ba4b153b0f1ab0b3942fd9d42d WHIRLPOOL 731deefc74a18c0ecc7efbd84bc4012120fcdfef305bdda7fc1b7c096c59d1a4551493b2f56ca4cfea385299c26152fab4a73b2b0ab1e6aff556f9daf7f5f911
+MISC metadata.xml 353 SHA256 b201812d8a46650c9633883f8e5fe3bfa4b39b2845dc144379e6e4c0d438a5c8 SHA512 6e0125dcde66da81f020e5af9b733a823cc5763d2a565b8b4fbed0d5f484868dba4e6848f691faa50272a1cbb276f778c7b2d1864261798677a237959e4f77d5 WHIRLPOOL 43a3c7f866c35c3fd81f23227ff97265e0d2a3454cf1ed54acc3ed143da68f2979800043ae84a6e7da240451db4da24f605835e6188ca984823028c82887116d
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
new file mode 100644
index 000000000000..ea6a61ac2d92
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.0.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.0.2.ebuild
new file mode 100644
index 000000000000..4231dacb3fbb
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.2.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.2.0.ebuild
new file mode 100644
index 000000000000..e6a59a9bbe77
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.4.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.4.0.ebuild
new file mode 100644
index 000000000000..2dece04e2b33
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
new file mode 100644
index 000000000000..9725f06bf81f
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/cinnamon-menus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
new file mode 100644
index 000000000000..90bc71f0e0d3
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -0,0 +1,22 @@
+AUX cinnamon-screensaver-2.6.3-automagic-logind.patch 1124 SHA256 99d43c908427f15c8ab103e6b4d7e8e4a1a887b00173de89b0bee6ba68d685e7 SHA512 56c6a2ec1ed5b98583912935f3bcd7d7143d3d2a86bbe48809d39e29d2f451210b83155ec3fbdd1c05c720ec18c458b9be21e948d22db1f546409030889b36cc WHIRLPOOL cb05b9c526d7dcd6731cefa22f2af3274727c9ed8b30fb70a78a4059e86cc0ad28f7d30e5f63c87c6123d8239134a92e8e601a7fe9cf970c8dbf592291250de3
+AUX cinnamon-screensaver-2.8.0-webkit4.patch 506 SHA256 e0663d7bc7aaf3443ee7d49d7de7645f482637dfc89732be3d4de2bf63def903 SHA512 4c843a8d64c6ff770ff9215e5232826e6e39c5626b29d7c89434569bd676eb49150f30e17ba43e7f24a689013036c164134f4c044a8be654a4aafca1e42f7faa WHIRLPOOL 465cc3acd758d0d784a05d209a66c970488cc3921909cc44ce7b59a2731a65e82387f4d8c72aa192dc1bb03d487f70beaaaeb483245f658eac7abd3066ab2d0b
+AUX cinnamon-screensaver-3.0.1-automagic-logind.patch 766 SHA256 165fd99fc34f0efac1e94750a567ec39f24f87cd4a0616f9c1cba76b68776b37 SHA512 5a6701ca90cfea396c75eb5cc9bed3a3c162e786547f743be8dd9b3e132d01711b28e480df67b651af0b9d965ee4e1e2ea8de054bdc9a223b3c49824a111583b WHIRLPOOL 57843e4f59a431144918d665b69538bb7d64412d5c5027d3039dfb38c502a598c45b6f647b90a412d09d7310faeea88718617b166cb4a892dff2f0a2f6052fa1
+DIST cinnamon-screensaver-2.8.0.tar.gz 146275 SHA256 595c787bdc9d3a7189d603fe065475e39ac09f957de2da8423b685ade1441036 SHA512 438ce35145d29b2cee8bb2f07191e0aeb5803e21a67ddd0a4bb13e113ac12e2e1be6b8780c657a67e9c27f8cb09aaec1e261f478432aa9fdbd1f21229294df6d WHIRLPOOL 61a2af9bdfcc4be850ff4455782f00048d12ee1d1f36cd35acdc498e4054d450946a064db8b09b6c6000b897af21cfa0a3acc699eefdef437a699e454e252dcc
+DIST cinnamon-screensaver-3.0.1.tar.gz 147036 SHA256 de32ab1852b605835ea0ca41f248d18b32d7805d479eb6fd5877d4de92dbb784 SHA512 d9ad3f5c09d35388811387e3a7d1a8637d59390c4f797dedc4f6ff97cff631deb009d1cd1288317ca119f5db6456c05fd99c87c135595b2b1f07882892447427 WHIRLPOOL 6b4094cff650234933d82248fc671e399956bc435d1c47aa3b6869f2ba7c3eaaf9d973e05d29f1c274b269b6be62beca0ff0b3babc3804a73d62b9329be568f2
+DIST cinnamon-screensaver-3.2.13.tar.gz 143389 SHA256 7b1a0c156cc0e1983d6ed4370426eac372a5cc3d5f6b8203ddc6913a58d972e9 SHA512 f0c8b533416d5ec9e80f1220a54a8f87839dfd24ac6c00b1b4166c893f0c75519b14f19e9fa91b7c1d71864002d256787d66926042efa9e19b18b7f9f270e8c4 WHIRLPOOL 78067fa402bc83b3013b70e03a476346e2abb6f744cb89a97906bb866cc4075697e7c91a158354d2e9dc7834e2b4aa2443bf8d63547c4c4dced2ffa5ab3b8f50
+DIST cinnamon-screensaver-3.2.2.tar.gz 120816 SHA256 d8ec85d3b984f527790d68d61156adea84f84f35bc956d32923d5116d4937df2 SHA512 0ebc5da00973b6b7972e3f7a2ee671d204cadf25ae99af8a53fd176a5070598aaec9a0def86dca47538e6334c2b6d19db09bc0ac1ec226c85b439c0762a40d18 WHIRLPOOL dfd8ba669cd5732b5ff9e32fd9a1f5076da6da333d6a0822060340948b85aba34f043bd39a24797a7cef5ea0eb2f2e5acd931e3a76883da388bd5179f9df9c33
+DIST cinnamon-screensaver-3.2.6.tar.gz 124287 SHA256 5e0795d46f5f6f93e79139e87449c8a20438bc94af67f002b1b6ba3726db4741 SHA512 78b0347e5d6ae7970d070410d0a4aac08b2dbd69442d278f4869aa636f13de19c1d03118dce2f540739c37cbeebd5fa53ebf31270033fa8393220d6c35672d00 WHIRLPOOL e52657d656a5ee3b2290270c9a3f0c54c462338f35dd6c0edf4611b91c2fb0e0693587b1d63a4a2b7cf36882c655a2a4508601d45a7f6333af98b0648861afbc
+DIST cinnamon-screensaver-3.4.1.tar.gz 153389 SHA256 e25b68c74d7307eb0db30cf31d2f819981e25cf7371b339a08895c0506d55341 SHA512 3b5b35bfac37d220a260917633a2f0ed79bcc4d479cc9924a86eb73e864b2893d037eabf6c70b0ba68d93008b649399e29dd42b8490e58662db4840ee470e137 WHIRLPOOL 8704947ef29a9782dcfd82ed0da24d2d487a4b4a5b181886c1f5934e401a70a8c29aee4f10aab4ee193c7657a0da8e1ed626f302fd5a175113e2014c306a04b3
+DIST cinnamon-screensaver-3.4.2.tar.gz 154119 SHA256 9a86449eb6b2c1c2c31e3e18a336106c2fbfd0d6b68647ada1eff22867605335 SHA512 1d226f72c1f7d8e264bee8b1c175cf32866dfdbf7738383552c4d218dc6ca1f04ef37f56c91793ff42358dcf6b832ba1962b8e39129683b5bf9cd3c3c2b1a764 WHIRLPOOL ad147532cf461def895678f5be71b3807979bc0b16b232a21b94b2d61a52513044ba66601ffe622df97bb4cccf92734551d1d5631966fcefa7e350365d926ca8
+EBUILD cinnamon-screensaver-2.8.0-r1.ebuild 2639 SHA256 d7f65d3f98ccd9f10c9bd70598f8b1d01020a7ac1e4224c32c40530bbe164ee4 SHA512 b3ecddf3dd1a38cbc805458ce3f2f2aa529ed7e5bff934882ebdc9c4b28ea0982e9368b88876f69ccf800d0cd9a738f4b605c40c5d5c0b45ca26a276ff26ba90 WHIRLPOOL 16c3f5748242cf0f282d434337dce093e3dec2d478d26e0c2dd11a0093c90a44b19c51a01650e0f3e4449bda0b717d568649045051f0c5322702ed25e18dca11
+EBUILD cinnamon-screensaver-3.0.1.ebuild 2596 SHA256 d15f7a6d211f42dc872461b2357356f94cac66213e3eb2e5048ec6cf1f8b1577 SHA512 8a335ff13abf3ec0bfad3d697a424e3bc088867e9aefa782c34b4a117ebf20b8443be330bf8d9524f3f119b314fa65d0a4cbe9b784becb8ecf7c743d6601b734 WHIRLPOOL ba15ae37b31515ddaf4fe6142d02c3c6159120cff8a15221bc93a1e9dddd32b72e9da7a1456d0d46d5b4cf7f56f60243d6c37de84bfa4dd77b5259c9548415eb
+EBUILD cinnamon-screensaver-3.2.13-r1.ebuild 2153 SHA256 31ed2fcda2e1c9c74effdd217764347ceb16c7200e63c12e35f3899c1385d4cd SHA512 0ed55eaece836ebb60fad02932d8e985921a80a0c477ce1928f246f5d04c845e2c4c0ed1f2f88c8995197a546e95a57562eea0f29e138ca4363c733804d8bb38 WHIRLPOOL a38cf6f5ec907e1da94b92e636d57a2d395b570206294e7b9adf10278847bf84badbec90dbc928653a2f4d3a935e9cda1f0d34f71c7a501aa3ae01fb1db60b03
+EBUILD cinnamon-screensaver-3.2.13-r2.ebuild 2174 SHA256 72db174c3aee3a81ae3cf7329b7017d5f2c960e76cd5dd92da19f4a9c4cc5b67 SHA512 0b191a565717f18ad76ee80f218da9bfe8a30d036a4843a34ffdcfa8f1fc53afbbcd35b41d052cdd38c1d990efcda0dfa2095632876095e2f70308994f4cfa8d WHIRLPOOL c564b2ec11ab2eccf7494927167176e1d2d92ab874aa88e1930af6df21d5d20af09818f08c9190321f05c240a927cef3db633db713a140e5d3c2daaf6514e268
+EBUILD cinnamon-screensaver-3.2.2-r1.ebuild 2110 SHA256 d674b8ba7b7cfc3934e4635eb146c84725561bdf0f57e071fbf6dbb8eba81284 SHA512 e904f7c14ae0f7274f3350ffb84e6f4cf83d8e81ce0abc95d947c4f5dab17d49570b8ff7ad04962998f5296055d13c17056ab35e45b6bfed39fac14bf0219aa5 WHIRLPOOL 239ed873c07fef8662ad5c6ee7d4a823de8d22c29b2d5f6f53fa9aaa9abf6cd8f9a4856b449dff5ef92b6413af57eb117ef0062513e4caee03abce94919b6ff6
+EBUILD cinnamon-screensaver-3.2.2.ebuild 2094 SHA256 e9257067cfacf3d8fd5a745774ab303ba515a901437cedbd3c0cad10055db196 SHA512 0547e01b7f37ff9acc7b1b46adc4eb92dc98a85d57b75ec615704d3776f68d0d0e0264c4e50c0c6a24dacb52126de93c5e728641946a959407199dd01ab40dde WHIRLPOOL ca8019452dc1939ba5b67849c1a444acaa41c5ee140d4e2402d4af9a7fdd1170cf0fe9d88b788fedc941e9bf40baed80428c75ba434059f31dfa549a539f635f
+EBUILD cinnamon-screensaver-3.2.6.ebuild 2159 SHA256 b1e47e997d88fea7e7ba4897ce421c5ac04f466e37f0caeb2aab52764f278b1e SHA512 47ea8d306639cd452ce2bcaccc041a83cc52016ae3dfbdc670c2843c2753ae6ece01d1b3ca83d9252a2859935aca93c69800826404955b2503e43a5d17043aaf WHIRLPOOL b5164542b87ace044257d256cee72ac5c9f3c876dc281d6c74973da2937fb7d2282a6fa5a97fed44f467a143fdb91d1d9f65878961378e2085022c52c79910c8
+EBUILD cinnamon-screensaver-3.4.1.ebuild 2248 SHA256 1fc1afa89201f309675f93aff3597c31e7c04ebcf0c0389fa6cfadad34343426 SHA512 d5972271196e6a35911d79f4929fa55c3daf169fa8fedaa03af59b158aad05d60ec6545b48fe900384154d193b3fbc5fced2b2dce319c577278231e0b3e8cfa4 WHIRLPOOL d29241320f671fbe6936b41484c0d1d5a813db450e43d82e72c90ea877fb1257e29d119d987306529ecd4da2332048d3696fa9a3e5657e9912ad37e8d82e04c9
+EBUILD cinnamon-screensaver-3.4.2.ebuild 2248 SHA256 1fc1afa89201f309675f93aff3597c31e7c04ebcf0c0389fa6cfadad34343426 SHA512 d5972271196e6a35911d79f4929fa55c3daf169fa8fedaa03af59b158aad05d60ec6545b48fe900384154d193b3fbc5fced2b2dce319c577278231e0b3e8cfa4 WHIRLPOOL d29241320f671fbe6936b41484c0d1d5a813db450e43d82e72c90ea877fb1257e29d119d987306529ecd4da2332048d3696fa9a3e5657e9912ad37e8d82e04c9
+MISC ChangeLog 5393 SHA256 06d9f1247c30aec9523d4117c5302f140eb169d57357cc2869ed68b30c4cba22 SHA512 476dbe10494eb3ce1296d4079b902e44187f3a5e77749f7072f44ff17064ab6298f8ceae03c2d5d9242512db7668658fb8d278e9a35bf7d29be5293ec392a25e WHIRLPOOL fd428d7f30eb3487a69351ae3221fe7188946c0b0db122113bb803afaa82390dad2e8f3b50e18270a5f32630da9980d41ae11663a1a25b1e2b9196b954075bd1
+MISC ChangeLog-2015 2987 SHA256 e6537bc9a8f1a5ae4655a8c77a5d35217017ec38b96c862321b17223ee5881ae SHA512 637e0ca04029f8de0754e97c4d5617faf96ac81a89a2f6b770f32d11f5f6a60dd9f6d4f082a3777deea30b067c8e472869d79673bb2015088c7ca178c7e1affe WHIRLPOOL 268bf8ee7fe9f535f4cb1a925e853362f9ba5ff52fd72424f9bd81954bc154500703e438d7b41a150e3e25fabcfd8027d35fc93026ee5982ec2729557cbec4ce
+MISC metadata.xml 359 SHA256 80b4eb05ab8f45503256382953adceeb5f117f389b746dcf47b43c5a4b17a60d SHA512 b14f874ee8905b318561a312337a65ca2d6dfae3cb2cdedc5466c0e22ffc7f851530e509732d38a9676f27b8623a18f7a49dd2aff6f624803f72d0a54582a75b WHIRLPOOL 40106c03f2c8464d7a434d10434c2b06051b11fd8cd665a8eeb9fa72eb92af46ecf2794ed3905ae59903d0d8f6e5d0f296e27893b9c7fbadc69c610f3f81e651
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..87130ef96d5c
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
+	epatch "${FILESDIR}"/${PN}-2.8.0-webkit4.patch #566572
+
+	# Fix xscreensaver paths for gentoo
+	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \
+		-i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+	python_fix_shebang data/screensavers
+
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_configure \
+		$(use_enable doc docbook-docs) \
+		$(use_enable pam locking) \
+		$(use_enable systemd logind) \
+		--with-mit-ext \
+		--with-pam-prefix=/etc \
+		--with-xf86gamma-ext \
+		--with-kbd-layout-indicator
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
new file mode 100644
index 000000000000..69108cbe65c8
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-3.0.1-automagic-logind.patch
+	eapply "${FILESDIR}"/${PN}-2.8.0-webkit4.patch #566572
+
+	# Fix xscreensaver paths for gentoo
+	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \
+		-i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+	python_fix_shebang data/screensavers
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+		$(use_enable doc docbook-docs) \
+		$(use_enable pam locking) \
+		$(use_enable systemd logind) \
+		--with-mit-ext \
+		--with-pam-prefix=/etc \
+		--with-xf86gamma-ext \
+		--with-kbd-layout-indicator
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
new file mode 100644
index 000000000000..7f9d0a8f6e6d
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-3.2.2:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+	x11-libs/xapps
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
new file mode 100644
index 000000000000..f0b8bd8fd34e
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-3.2.2:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+	x11-libs/xapps[introspection]
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..163a5fbf28b7
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+	x11-libs/xapps
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
new file mode 100644
index 000000000000..2c25f8005f72
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
new file mode 100644
index 000000000000..0f8f1d48b79e
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+	x11-libs/xapps
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild
new file mode 100644
index 000000000000..cf81203bff73
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	!systemd? ( sys-auth/elogind )
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/xapp[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild
new file mode 100644
index 000000000000..cf81203bff73
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	!systemd? ( sys-auth/elogind )
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/xapp[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
new file mode 100644
index 000000000000..cc12685296cd
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
@@ -0,0 +1,33 @@
+From b382066324d2c42c3d5d04fbb21cf144c79daff0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 17:16:34 -0400
+Subject: [PATCH] Make logind check non-automagic
+
+---
+ configure.ac | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6c424c..0eae195 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -581,7 +581,15 @@ dnl ---------------------------------------------------------------------------
+ dnl logind support
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
++AC_ARG_ENABLE([logind],
++              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++              [enable_logind=$enableval],
++              [enable_logind=auto])
++
++have_logind=no
++if test x$enable_logind != xno ; then
++    PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes ; then
+         AC_DEFINE(HAVE_LOGIND, 1, [logind support])
+-- 
+2.4.3
+
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
new file mode 100644
index 000000000000..cbf74270214a
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac~	2015-10-16 17:06:50.000000000 +0200
++++ b/configure.ac	2016-01-30 13:33:07.595401835 +0100
+@@ -58,7 +58,7 @@
+         gtk+-3.0 >= $GTK_REQUIRED_VERSION
+         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+         cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)
+-PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0],, [PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])])
++PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])
+ AC_SUBST(CINNAMON_SCREENSAVER_CFLAGS)
+ AC_SUBST(CINNAMON_SCREENSAVER_LIBS)
+ 
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch
new file mode 100644
index 000000000000..06048d59ad70
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac~	2016-05-30 17:09:04.000000000 +0200
++++ b/configure.ac	2016-06-25 17:26:08.614205626 +0200
+@@ -580,9 +580,15 @@
+ dnl logind support
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
+-	PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
+-])
++AC_ARG_ENABLE([logind],
++  AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++  [enable_logind=$enableval],
++  [enable_logind=auto])
++
++have_logind=no
++if test x$enable_logind != xno ; then
++  PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes ; then
+         AC_DEFINE(HAVE_LOGIND, 1, [logind support])
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
new file mode 100644
index 000000000000..0c72d1717c58
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/cinnamon-screensaver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
new file mode 100644
index 000000000000..e909a4cf54e1
--- /dev/null
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -0,0 +1,17 @@
+AUX cinnamon-session-2.6.2-automagic.patch 1913 SHA256 0ed5f9e80c50bcd9f296caae8beb27b71ac4ff0a74050801d764d77d22ec91e8 SHA512 fbeb1a7a5d05e3a7f2f4b65dcda39f78cd5168975b7ade9cc379a51f4c05d12ab97161b68dffef4f37e598199d71a4c7f4c2321cf826b02761ecf72d37ae3a45 WHIRLPOOL 1739a0c6ce72e5811e656fe98713e9cc61f40d546f046d62202f17989d5c5f1ffc710620c719bccd908c8634a2d7ca4c168aad8332ee32c21b9c3ca0a65e3070
+AUX cinnamon-session-3.0.1-automagic.patch 1470 SHA256 771d35b8f38446f3ea10a03397d0f556bdbff69a72f2f3a64bd274bc2ef661d3 SHA512 571cdc733a66821abd927a7132bc27ebbc214023eb6c2985213409272d11baad1f734350d2a0853c27ebc35a059ca9d3766c4db658b558e013d5850a13f5e971 WHIRLPOOL 91fa63692f91023f12ebdc5aaeaddf126895284a6dc1997c0ccc3c5056bf0f3f604df4b83e1c35202fd2d38af40be2a1ec0de506dcaa9853371195647949c346
+DIST cinnamon-session-2.8.2.tar.gz 591438 SHA256 0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79 SHA512 4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc WHIRLPOOL 6f202a79a27cdf6a8bbe1ed62d5b4a6c6edd5746b8b50a448fc8874cb5de4b45c4201e1bce25760072ee2874438e87505405810b45c7e10019fdbfc4c7cc9b6b
+DIST cinnamon-session-2.8.3.tar.gz 591500 SHA256 306eb9448500b15b0d06826b66f438d767d001b706fd345c53b4a91d308ae4a9 SHA512 a581af6a00a5273ab4cf7b91ac4770b78d8ab670cf238c396e2087113795de059b4eaa3abcc8440b5eaa5cf0c4edc9696b183f9ce81803af36b9a3a37b5d5977 WHIRLPOOL d3c9d0f6791522c2c24801faacb0a5be34d658cceeaed2459d5f006c24e683d1ea39876045c505dd526ec972912e6c8bde8fffe703da6fa0f69a43f2e579ab61
+DIST cinnamon-session-3.0.1.tar.gz 592265 SHA256 d8935747bc8aa70518e70a7d338eaf9109b5307d8a44d49dc57e0f15d69e9c89 SHA512 cdbf9f910954976854aa1b90033781269dc9d521b86edd3e97ae936b59a9ac4ffa956ba37a51ba11beac73e38a732913ce147557e999484bd68529677eed21e8 WHIRLPOOL 9af4cf92685e6a07220779ed8ef73c7435dff08e3771bbc87994d5294f998129b0d114a3092987b8fc59b49f936616d135ca59327d9979c70d9aec55238a0332
+DIST cinnamon-session-3.2.0.tar.gz 595530 SHA256 d7c3d951ae0dddef96941c9f08f028a099443888db41981524f618a92624e0ca SHA512 00475069849c7bb1d874c65200128128068e6500475c61053f07deabacb98046bf344ab5d3b4537487c48103dd6c6a8316d1326396e606a0d44bc486db9267d6 WHIRLPOOL 1753d5f99a98b718e0db8b945e94ade2c316bb7965943f2b1605b10dcc08a5e74661b4b7edcf8afdceb167c0ceffd57a0f97612c2638b13278240f695fae344e
+DIST cinnamon-session-3.4.1.tar.gz 595567 SHA256 20426fe91347193b13ede47d2b2f14af4321f95274267304dc9844e2a5178948 SHA512 caac3b445e2dca8e040bdb215e8aca833cbcdb77611e435aab5ebcd4b0f9b6bddb117d97763d26e99d42bbacb7ec51171e6927d87dbdd7d6ed0f5287648dee0e WHIRLPOOL aaf997cc1c6b62484be5e466b5d80f221e62b80a4d65e8ec91f5bd51e429df71154ceb5be742a5a3fdb8affebe5407339b4a8eb1593f1ec70909c3e7dabb4e50
+DIST cinnamon-session-3.4.2.tar.gz 595721 SHA256 bfeb8a73cc8c7d9dfd728d34df0f578bd2ad8ed88f7de9d7cd5d3ae08f454530 SHA512 4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d WHIRLPOOL 7b4cc7c37b7ea02de59923752064edede742a9619a9dee86776475149cf3aa602d358b50cefa94601c8343119651792644f86f50ed27dacfb324b94fefab70ad
+EBUILD cinnamon-session-2.8.2.ebuild 1582 SHA256 db7dbcd0bd44a073592f2fa05475c27ea22c3e5774d9790c890f97f7329fa7a6 SHA512 80076e1274b641acfdce833baf0bab4d6bb07a2736cef07d9654c5c300f186680b4fba99663d7a398365e625dbfa03ed49355db00b917bb42cb8411e1b3c6acd WHIRLPOOL 782a0f7eb123ac62e1021bf6a0d7af1c0b0659e7c6992eb77c8be5fdcb6b41b3d6801a44f67cbd9dce7782e6a4488aefe7d79b8a9ead060b728ea7bed4fe8298
+EBUILD cinnamon-session-2.8.3.ebuild 1514 SHA256 f2157d931b90901a78836010cb86db29476a2b4759086d2e82402a2ae2926d8c SHA512 b98dd92afdb560fc56cf3a2c099107f5db639cd417f9b235bcd4671a95ecbbad76439e6bf2f97aa0e2db62a542f60a060c8c7769cad99d359387b4665291a4dd WHIRLPOOL 07ba1e3fe8a5b5a0e641542d652e4f4c828a4b064e68bbe625a9dad47c6b1e6df92fd0ec72cea43bb8a24905ec95da6a690244331e26f770112eae21df073633
+EBUILD cinnamon-session-3.0.1.ebuild 1514 SHA256 49ace1c243575e97c226afa76dd22d9e4f2b99434d141089a262c6316223b267 SHA512 fc351c3e943a366a4f21c08c046c6f0e3d44e11064c233f8c9465973aabde43f96369478f5cf46700d7fbf39315197f73601baa1a1fad42d9be12ecfe08a0d11 WHIRLPOOL 93774f86c8f2a0068aac48dba08ca3a2225f5c981edc076e2761f180df584df164db01c7d87224768ac7a9f2cf8742b777990eb1460e834cfbaf5400cefd4796
+EBUILD cinnamon-session-3.2.0.ebuild 1516 SHA256 80b16e706434330d32e2afda8c596e6cfbf960f9bafa2dacb668d7f05fe4ea64 SHA512 5bcf426ccfea1d07cd8679a52e4c9bbb45301459f425e549b4fc700c8a9fd47aa0025390dd3025ee6ac48692467cabc2591ac817e4a7d229e9ea64a140a1d7e2 WHIRLPOOL 5b7de3651f026528dea9167fc3497de767434b02aa6e6563922bc3d329dd804131bf2a3679629e0b8f9c5893207fdb960ace8fd11195b8ff381c618ec4402b23
+EBUILD cinnamon-session-3.4.1.ebuild 1516 SHA256 261fc237863bdb7c743a7ff79f0c2776869bad19a74e3389cccf2b2332f66781 SHA512 9d0aec5ac77901ba904bbe8f7fde160b5d4d993b779f5708dbbf7c2e783e873052b6470ed4099a7ca516c55fc0cd9d11a396d7c2f8b32fc5d0a5bd08abadf740 WHIRLPOOL 3aca6c1fc2e992bb56994d751e65b46f320ce8109ee506afed0ba7c733aae03e861d71c12ea2ce8ec700912bdb32036faba3f6340138d32ec17216d138fc4607
+EBUILD cinnamon-session-3.4.2.ebuild 1516 SHA256 261fc237863bdb7c743a7ff79f0c2776869bad19a74e3389cccf2b2332f66781 SHA512 9d0aec5ac77901ba904bbe8f7fde160b5d4d993b779f5708dbbf7c2e783e873052b6470ed4099a7ca516c55fc0cd9d11a396d7c2f8b32fc5d0a5bd08abadf740 WHIRLPOOL 3aca6c1fc2e992bb56994d751e65b46f320ce8109ee506afed0ba7c733aae03e861d71c12ea2ce8ec700912bdb32036faba3f6340138d32ec17216d138fc4607
+MISC ChangeLog 5345 SHA256 fa82fd4d7eef73bac5aa7d69ed6bb1b66d3d18698337700d463cae6e66819573 SHA512 8d38613f5344ba8162724e7ec2483261fbe18305ec1e7ecf503c05c6422b02bd3689d6db05d744757da072b02d6f1b307a7a39fbd36074335eb44b425a11e816 WHIRLPOOL 3db493974ff0942bf748f8c899aef05b4e22a6f7d3dc1be664d62680b606ba09fac9e31616667f00c4c492599940e7011efebfe742f8f84c4fd7da25d6f3d707
+MISC ChangeLog-2015 2745 SHA256 f9c96bbea8294c32978e9b36e6f3b98df38c141beab32120aeb83f43bbcf4793 SHA512 83ad867c3dc51cd46aff8a28840d3019fb7c3645f5dd457def2fe964ab122b7e9a4845c48ea02def2ba72b9793319511333aec9049d8ac78dfa35ae3df25929d WHIRLPOOL 6010fdd5c33a0e8dacc1fc868ed6f3a795bd93b8a6d3f92b0a469237ff79950fcbc1ffa475c154df67262cc66eee1346f800d6ea0e4fbf09377f5e5091483af4
+MISC metadata.xml 355 SHA256 725ce75cd04a320122f237e229dfeec0cf195dd9f718b643cfe0a0a1fdf6a1a8 SHA512 5ab00ed770845599d3afc384ab32fc886c4626cb1492ef0db65d9202c15c17d09e759e646a05a00f825b4c47c906e4d185cbff2b8a2fa8ba63d739b69d9faccb WHIRLPOOL 005773634ce95d60370cad3b1d5cddfd9b8285a207f094bbd0ca9aa2c55c6de9935641fa00ca88d1986f3a6113df60516266a1832c6cea557e9fb29216fc6fb1
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
new file mode 100644
index 000000000000..7fabffaee06f
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	epatch "${FILESDIR}/${PN}-2.6.2-automagic.patch"
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS README README.md"
+
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd logind) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild
new file mode 100644
index 000000000000..2451a7ce34b3
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	eapply "${FILESDIR}/${PN}-2.6.2-automagic.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd logind) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
new file mode 100644
index 000000000000..04d79cfb51f2
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd logind) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild
new file mode 100644
index 000000000000..fb4f3cf0ef9d
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd logind) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.4.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.4.1.ebuild
new file mode 100644
index 000000000000..db8b6d35c973
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd logind) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.4.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.4.2.ebuild
new file mode 100644
index 000000000000..db8b6d35c973
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd logind) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch
new file mode 100644
index 000000000000..48843728f4ae
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch
@@ -0,0 +1,50 @@
+From 586c07b431e9b0e1f11a9017ee0b84dc9b8ec08a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 5 May 2014 22:34:14 -0400
+Subject: [PATCH] Make logind and old upower check non-automagic
+
+---
+ configure.ac | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f6fa7a..6e908cc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION,
+ 
+ dnl We can only support old upower
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
+-PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
++AC_ARG_ENABLE([old-upower],
++              AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
++              [enable_old_upower=$enableval],
++              [enable_old_upower=auto])
++
++have_old_upower=no
++if test x$enable_old_upower != xno ; then
++  PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
++fi
+ AS_IF([test x$have_old_upower = xyes], [
+   AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
+ ])
+@@ -96,7 +104,15 @@ dnl ====================================================================
+ dnl Check for logind
+ dnl ====================================================================
+ 
+-PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [have_logind=yes], [have_logind=no])
++AC_ARG_ENABLE([logind],
++              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++              [enable_logind=$enableval],
++              [enable_logind=auto])
++
++have_logind=no
++if test x$enable_logind != xno ; then
++    PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes; then
+     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+-- 
+2.4.3
+
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
new file mode 100644
index 000000000000..9ca31379a60e
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
@@ -0,0 +1,38 @@
+--- a/configure.ac~	2016-05-20 13:03:13.000000000 +0200
++++ b/configure.ac	2016-06-25 17:36:55.389583194 +0200
+@@ -56,7 +56,15 @@
+ 
+ dnl We can only support old upower
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
+-PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
++AC_ARG_ENABLE([old-upower],
++  AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
++  [enable_old_upower=$enableval],
++  [enable_old_upower=auto])
++
++have_old_upower=no
++if test x$enable_old_upower != xno ; then
++  PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
++fi
+ AS_IF([test x$have_old_upower = xyes], [
+   AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
+ ])
+@@ -96,9 +104,15 @@
+ dnl Check for logind
+ dnl ====================================================================
+ 
+-PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [
+- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
+-])
++AC_ARG_ENABLE([logind],
++  AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++  [enable_logind=$enableval],
++  [enable_logind=auto])
++
++have_logind=no
++if test x$enable_logind != xno ; then
++  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes; then
+     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
new file mode 100644
index 000000000000..01596926d67b
--- /dev/null
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/cinnamon-session</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
new file mode 100644
index 000000000000..dcd4684fb5b5
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -0,0 +1,17 @@
+AUX cinnamon-settings-daemon-2.6.2-optional.patch 3775 SHA256 ab913f4b50ea03d7a9a458c79bfffc7539606758d6e8dddd02b4b3a7733e96f5 SHA512 f572ac63e951e5b47ec06af26da78c21812f1b44ae11b531be6878c9b80f968790c1af3abb8445ba0ddc379001143dd3ce4cfa19e0b87339854e594ec714bd8c WHIRLPOOL f474cbb0a4bf7e1dcaf41b287bdaa51e46f0f467cd8719498250d563110d164d02dbf424a7d83dfc48ab6f67cac6b1ae410998eded2e042abe23ed7ec10d3d21
+AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 SHA256 7cbbfb4b114b5fd418f7e61f2e6e17a6d350de61da8718458a6123dd0f252151 SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8 WHIRLPOOL 600943e82eea7612574a062b549615fad9644f337dcacec2b7782b201bc0248f5f534d096f6d383a18eb2d48df26bf7d648c287dc01a67b4bb2af72180d8986b
+DIST cinnamon-settings-daemon-2.8.3.tar.gz 2935149 SHA256 bc04333674ee10886b6c2644bd74c21ce6d3f6f1e005ebce63693cb14bb1a298 SHA512 a66ab0943f4a370fb203ba73dfa9f938ab2fc418c7876b7a048fc438ed8eaef3f5f7789ce86c0c2039ed61473c1b3fb9c60205571140291448854c03cba36f76 WHIRLPOOL 93ecc021ffa76a493d65fcd001253da6ebbd2c8f92be716f4d0de0df53867fb24177a6f31027611586e965d1e378a8b53662dd3c5a73df026d13d3a7fd5ae080
+DIST cinnamon-settings-daemon-2.8.4.tar.gz 2935478 SHA256 2f7e8764a842d9b4f21c1e6d5321e4101720f1600462b5452d14a061b608c584 SHA512 fab449efdfe4f12d17d61299b9c264d0bd70d88811406da68eab48943dbcd75ef3a87551eba653660efc4006c45f7eaa59d9ac3616a6da6808d35e59dd0a6d7f WHIRLPOOL bcdd93d53352d649f81a43730f4116508ad24379ba5e5c46a1dc9b867a653b9172b50b78b06450159f4e785bab8e2a604f172d2553dd949d693c358695ba4f17
+DIST cinnamon-settings-daemon-3.0.1.tar.gz 2912459 SHA256 0abe839e04a36a052bb486f90e84c25ae6ccc92b74223813d9666eaac257677b SHA512 848f1bc38e84edf9a8af48e55b7581881fbc9920dce9a4fc38627456dea7cbfe330bebba4bb46d1c231dd85bd3445d365b5e415485ac202e72335fe337a800e8 WHIRLPOOL 91b5b0455c2dcde8868eb8e1adf52229e3dd94fb4c4842d537b89e1c72cd8f8f54af854765c62eb382015b8f3299400f21a9034974440ce9b7d305be4ffb82fb
+DIST cinnamon-settings-daemon-3.2.0.tar.gz 2915197 SHA256 0726e8ce4b1008229fe157ba0888a2effa1d9efa4e60735faf67af1fde8586f1 SHA512 1977402fddf62cf29c0285fd2be8c951dcf5f1d914e3ce53e2e738cfdb211096653b9256028fcb887e403d11dc2105e976eda05cf97c95afe6101c84c72abb12 WHIRLPOOL f051d50a41c22035ef1ffc48fe557d791966aacea2a81f76598868d6d79afe3d02ef56d17d7a67bd3802beb2d287f882c152021e2495ab4dae5af18f3a9d5959
+DIST cinnamon-settings-daemon-3.4.2.tar.gz 3102793 SHA256 b30a3b64e4263e4dbe2678c0cff5cef97944282fabb8f4b6fa3ca6c65c8f1522 SHA512 597f3a08e5c2168d0fc3da4b83c85f4c1f4451573cccc79bcb2a3debaab7f4714244e0300dce8ddc62de40b2f4c1c44ff282d280a1437d14041b44d4541c83e0 WHIRLPOOL 85922de3b93e07565adeda762e4d5278e75038db7ab7ae372494a8050fc11302eed8b0a53c19a691b8b4f93e35f8182d58b88d56809103671dcf97308b3b5b5d
+DIST cinnamon-settings-daemon-3.4.4.tar.gz 3102951 SHA256 b883879a13f9120d2e17ad22fa2cf3ebe50a87d814c82e2f067b2bc32e7273f1 SHA512 93a7609a5c1b9c34061f9ba7836ace58cfa5549d9be811a1a5ca50e2cb9fc9e9462d9f356f50c9115cca93fa42f29ff9d130c184e19cccf9c0ee814fb39bc6d6 WHIRLPOOL 6fc3edb6697be3f24c7a6321f7a315620ef040b7cc2bb557b5e0f4f3bac2210fcac2e7127fd89629066024d6f862b0c79463fefc0ebb9734a2c387b7036cc964
+EBUILD cinnamon-settings-daemon-2.8.3.ebuild 2741 SHA256 e6649037a91bc3a24b2601c606a54c66927ecf6d9280a9030f3572b75ed0067d SHA512 b9b353976b6308f881462ab71ce815e2a61c78c2721de69592395411ccb28718db3c647ff0f0f98bc2c44bb884ca4076502effff0a06356c23ef7bb82a27afb2 WHIRLPOOL 9f644b015ea34734fc3f49094694abe2da508c7ed5976cbeb72b164abc1a8de9f898bcb1574cebfb1d1348d10453933bc3cce998e0a27b8efb6925826497126c
+EBUILD cinnamon-settings-daemon-2.8.4.ebuild 2651 SHA256 8f9dd7bb575dcacc348141cffd005f0cc93a2f330912b3124d0de476167658b5 SHA512 bae8ac3e239db5780b3a700af5766f82e591e2e7caf834e19521e6b3b47fa061e01c15eb96af4bc87fd646d753f39d9f1657da74a6870bac1d298de8ad74c622 WHIRLPOOL 6095b571a7fc09780a2db619da873f9959ab8b0fe3a2b79ac4041a04a35f6fb9f48107a57386acf3362eef4a7b2684bc0b845940c7a0daf48531ffab3074ebbb
+EBUILD cinnamon-settings-daemon-3.0.1.ebuild 2127 SHA256 d4229f8dd001dc2f1a9461894e8d53be02911e4b188e9eb46b4f367e42148c8c SHA512 2cd23b7c5fb8b974e8bdf199f6baec37f6a51e872c4851d30d137bacde4055178b3f509e21a82814bf5fef4a2c249af3c32dc34fa9d21471a802476ce4341e98 WHIRLPOOL 366d3ad8929118cae2807beed1debcf38ffab26aeda9d908c1907e5389ec2520f3dbec099516ab46840f5895055b62406ebd9c1b9a335932e804d4f6000378ad
+EBUILD cinnamon-settings-daemon-3.2.0.ebuild 2129 SHA256 ee885120870152172b71e70aa971daf5949998b3abd60f272ce48c91b3bcd85b SHA512 df00468ad86b1d7327c53257f6157ea771ee419a02c9c088477886acd5d362aeb9aa3126c8f30d3d4c59aff2f34176d00f0f9a575947e4be935bfc36ac4dad99 WHIRLPOOL 327707fe266e954696949369aa23dc5b5096c7ab5eabc7164ae57cb84b3dde5083f80238b84f681592c1cf7c898e975f23501803a1287c035dfcfebea4de7bb8
+EBUILD cinnamon-settings-daemon-3.4.2.ebuild 2129 SHA256 57afadc96d0ee588567be9e8abbee932cea874e07f1ade7c286d858d84e9f10e SHA512 18e49014871be8347a777fdc0d1833360173815280552bd88f1b547b798d33714718113b93ae8f8ee5ca80061c1f1e63073e29d45f1723b66b6951d02f8f96da WHIRLPOOL 4b9c22790d4a997d0d86e97d6cf1100fb623f03dc064646fd3c2c20d7862936094d700495287a06fb101e4494c9ee78e075f267980792b240828e714cf4f9e48
+EBUILD cinnamon-settings-daemon-3.4.4.ebuild 2129 SHA256 57afadc96d0ee588567be9e8abbee932cea874e07f1ade7c286d858d84e9f10e SHA512 18e49014871be8347a777fdc0d1833360173815280552bd88f1b547b798d33714718113b93ae8f8ee5ca80061c1f1e63073e29d45f1723b66b6951d02f8f96da WHIRLPOOL 4b9c22790d4a997d0d86e97d6cf1100fb623f03dc064646fd3c2c20d7862936094d700495287a06fb101e4494c9ee78e075f267980792b240828e714cf4f9e48
+MISC ChangeLog 6746 SHA256 df17b8f2b4921e76ad787634204fa211b1d0208f317c22ed6f6e36a90e5ce7da SHA512 5c16a6c4d1b83cb1a086762b6f453fc370bf2578414d0369f5352003114c84c12f375e156477bcc136cae7a2f92f909d9babbce51047aee806a60eae19fad519 WHIRLPOOL aef921a19224f32eb16d886ee6f58a54e5eece0d10ad6904195606b60f832258933c4700a3e42e4ceff9e43d4c11e864f85c965448ca19cb044b2fe22166efcb
+MISC ChangeLog-2015 3380 SHA256 8d403b058f09570f19021ec289e0cfe163cc23e54f2c84d693525c65de8ee7f6 SHA512 8a8191ec891d310c28c1d025b8ec5e7f4d0a1156c34238bba6813939b0cd0bd42f4b1157a1bb2e85d07c16f1b2f7b3a8ad6ffbae11685638dce8698ea3e66c40 WHIRLPOOL ba78c2d4a6e4fd75344bcb61a89db3d1f08d6d34727934bbb7eec759a85fd36c5df8ae7aa17e5300814e66746235114fbb95d5699aa92994c43a55ecb53fe018
+MISC metadata.xml 465 SHA256 73f1b53740c9d60e071537cdd7e594fdc6736d3825a27885a85a5d8a28da9fb5 SHA512 c6b88abc595c2514ea1abfd440839811ae3479064eb85bab92f08bd9564f406aea382f130e92ed38c9cd9573d6050dd6b054ee900f1151822ac6b6fe13673a96 WHIRLPOOL add1e2b2e77cf001382b2037f0e529e66a7022bb37ac07f83a4a801d5962ae7514ca063e72a931eb0921366e49c8052b93ca8c4d14179795271683b51d62c928
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
new file mode 100644
index 000000000000..88f1e7a56f1e
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	>=media-sound/pulseaudio-0.9.16:0=
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxklavier
+	virtual/libgudev:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
+	systemd? ( sys-apps/systemd:0= )
+	!systemd? ( sys-auth/consolekit:0= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	# Fix intltool unittest
+	cat >>"${S}"/po/POTFILES.in <<EOF
+data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
+plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
+plugins/keyboard/csd-keyboard-xkb.c
+plugins/wacom/csd-wacom-device.c
+plugins/wacom/csd-wacom-osd-window.c
+plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
+EOF
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS README"
+
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gudev \
+		--enable-man \
+		--enable-polkit \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd logind) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	unset DISPLAY
+	Xemake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
new file mode 100644
index 000000000000..0c265d4540ec
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	>=media-sound/pulseaudio-0.9.16:0=
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxklavier
+	virtual/libgudev:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
+	systemd? ( sys-apps/systemd:0= )
+	!systemd? ( sys-auth/consolekit:0= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	eapply "${FILESDIR}"/${PN}-2.6.2-optional.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	# Fix intltool unittest
+	cat >>"${S}"/po/POTFILES.in <<EOF
+data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
+plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
+plugins/keyboard/csd-keyboard-xkb.c
+plugins/wacom/csd-wacom-device.c
+plugins/wacom/csd-wacom-osd-window.c
+plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
+EOF
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gudev \
+		--enable-man \
+		--enable-polkit \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd logind) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
new file mode 100644
index 000000000000..49d57f84de36
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.8.0:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxklavier
+	virtual/libgudev:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? (
+		sys-apps/systemd:0=
+		>=sys-power/upower-0.9.11:= )
+	!systemd? (
+		sys-auth/consolekit:0=
+		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gudev \
+		--enable-man \
+		--enable-polkit \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd logind) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
new file mode 100644
index 000000000000..8dc7f204f0a0
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.8.0:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxklavier
+	virtual/libgudev:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? (
+		sys-apps/systemd:0=
+		>=sys-power/upower-0.9.11:= )
+	!systemd? (
+		sys-auth/consolekit:0=
+		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gudev \
+		--enable-man \
+		--enable-polkit \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd logind) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild
new file mode 100644
index 000000000000..5e1ec395b16a
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.8.0:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxklavier
+	virtual/libgudev:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? (
+		sys-apps/systemd:0=
+		>=sys-power/upower-0.9.11:= )
+	!systemd? (
+		sys-auth/consolekit:0=
+		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gudev \
+		--enable-man \
+		--enable-polkit \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd logind) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild
new file mode 100644
index 000000000000..5e1ec395b16a
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.8.0:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxklavier
+	virtual/libgudev:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? (
+		sys-apps/systemd:0=
+		>=sys-power/upower-0.9.11:= )
+	!systemd? (
+		sys-auth/consolekit:0=
+		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gudev \
+		--enable-man \
+		--enable-polkit \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd logind) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch
new file mode 100644
index 000000000000..e5abe075f5e9
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch
@@ -0,0 +1,99 @@
+From 884ce49f5bcdca37a30fef94d6649af012c88fee Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 18:03:09 -0400
+Subject: [PATCH] Make logind, colord, wacom optional and non-automagic
+
+---
+ configure.ac        | 31 +++++++++++++++++++++++++++----
+ plugins/Makefile.am |  7 ++++++-
+ 2 files changed, 33 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ce79a6d..095a7a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,14 +260,28 @@ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE(color,
++              AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
++              enable_color=yes)
++build_color=false
++if test x"$enable_color" != x"no" ; then
++  PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++  build_color=true
++fi
++
++AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom
+ dnl ---------------------------------------------------------------------------
++AC_ARG_ENABLE(wacom,
++              AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
++              enable_wacom=auto)
+ build_wacom=false
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
+-                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
++if test x"$enable_wacom" != x"no" ; then
++  PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
++                    [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
++fi
+ 
+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
+ 
+@@ -373,7 +387,15 @@ dnl ====================================================================
+ dnl Check for logind
+ dnl ====================================================================
+ 
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
++AC_ARG_ENABLE([logind],
++              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++              [enable_logind=$enableval],
++              [enable_logind=auto])
++
++have_logind=no
++if test x$enable_logind != xno ; then
++    PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes; then
+     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+@@ -595,6 +617,7 @@ echo "
+         LCMS DICT support:        ${have_new_lcms}
+         Libnotify support:        ${have_libnotify}
+ 
++        Colord support:           ${build_color}
+         Wacom support:            ${build_wacom}
+ 
+         Smartcard support:        ${have_smartcard_support}
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index b9cb3a6..f37eec0 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -6,7 +6,6 @@ enabled_plugins =	\
+ 	automount	\
+ 	background  \
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+     datetime    \
+@@ -23,6 +22,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if BUILD_WACOM
+ enabled_plugins += wacom
+ else
+-- 
+2.4.3
+
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
new file mode 100644
index 000000000000..c12d7636f967
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
@@ -0,0 +1,84 @@
+--- a/configure.ac~	2016-05-10 17:30:40.000000000 +0200
++++ b/configure.ac	2016-06-25 17:43:46.554279197 +0200
+@@ -259,14 +259,28 @@
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE(color,
++              AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
++              enable_color=yes)
++build_color=false
++if test x"$enable_color" != x"no" ; then
++  PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++  build_color=true
++fi
++
++AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom
+ dnl ---------------------------------------------------------------------------
++AC_ARG_ENABLE(wacom,
++              AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
++              enable_wacom=auto)
+ build_wacom=false
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
+-                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
++if test x"$enable_wacom" != x"no" ; then
++  PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
++                    [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
++fi
+ 
+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
+ 
+@@ -372,9 +386,15 @@
+ dnl Check for logind
+ dnl ====================================================================
+ 
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
+- PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
+-])
++AC_ARG_ENABLE([logind],
++              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++              [enable_logind=$enableval],
++              [enable_logind=auto])
++
++have_logind=no
++if test x$enable_logind != xno ; then
++    PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes; then
+     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+@@ -595,6 +615,7 @@
+         LCMS DICT support:        ${have_new_lcms}
+         Libnotify support:        ${have_libnotify}
+ 
++        Colord support:           ${build_color}
+         Wacom support:            ${build_wacom}
+ 
+         Smartcard support:        ${have_smartcard_support}
+--- a/plugins/Makefile.am~	2016-05-10 17:30:40.000000000 +0200
++++ b/plugins/Makefile.am	2016-06-25 17:44:30.021307677 +0200
+@@ -6,7 +6,6 @@
+ 	automount	\
+ 	background  \
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+     datetime    \
+@@ -23,6 +22,12 @@
+ 
+ disabled_plugins = $(NULL)
+ 
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if BUILD_WACOM
+ enabled_plugins += wacom
+ else
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
new file mode 100644
index 000000000000..9738f243081c
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<use>
+		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">linuxmint/cinnamon-settings-daemon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
new file mode 100644
index 000000000000..709e399ca977
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -0,0 +1,9 @@
+DIST cinnamon-translations-2.8.3.tar.gz 7701375 SHA256 8585670a2765ac6580b98477b2eb02ed3afe64be0ba09f8c3e61613c0a987cad SHA512 9902d79439624e4fb445cb41f6ff55076875fd9080abaf6c3debc7dfad0ea94d0d611bb6631717e4e15cb2b817d0e454df680d8c55d3a678acc87c04bf443b22 WHIRLPOOL 6984aef96d872a3e2cbe3b912ca2555ab44853d306a37c6e55d368438848fbef4aac01dd73d513cf386ffd6909fd64b448cfe98df18de7d371021f7a45d8a200
+DIST cinnamon-translations-3.0.3.tar.gz 7938822 SHA256 5f8eeb3c2d4af9ecd6a42cdf79cea6e6c92194aad6d37cf0a37724505da971a8 SHA512 f639f310a954a3b310117d324cdc627554b82833ad66b76395e8ead26cf8337998b665bea92c4263c20275440e6fc529a4b770e85d12d84b8b74529154c29b0c WHIRLPOOL ff9f0cdbdad0a01f64a851547bb3451b7b89e65b89816e113abbea42d48c672615445794e8e242367701a93c80daccb1af1028841039866ea55b2a7371787212
+DIST cinnamon-translations-3.2.0.tar.gz 7938813 SHA256 18cfe229900979b35686c638ba00530e88be33aeb473364067daf28b22aa9ca8 SHA512 3bdb2b50afac2d2b1d730c86168294d5e32b24f3eda38722d019c912805d2238559b31260e496debcb84e872d65dc5f7e12d4223e3b1006067616c5b83ed934c WHIRLPOOL 8de63a42fa0d408dc7c57108ea9457b5e0790dce66808b79071a4bc988ba4f31f39988f2247e9be51898654a8929e692d86f32e52a85408f9a9c0b549e566723
+EBUILD cinnamon-translations-2.8.3.ebuild 1332 SHA256 7fe3a5f67e7962c37881ecfd47bab8a11e74285fa53320507860a0d0cfd97730 SHA512 c67ca8b9b34a5325bc3270e63361a6d88abeb9bbf74e221864a5c5a78498dc65d8c59263ba349b2bd112d375cec0164c2fc9c511f32bf671e44fa644c9e3df90 WHIRLPOOL ffb3ddc5f14e6d9ad795b74d68811bde3053f4a277e0708e39dc479cd71b66fb77910d9c20ec089a062532b4a08df84fe4ac5a3937339168255a5e50603f9d9b
+EBUILD cinnamon-translations-3.0.3.ebuild 1309 SHA256 cfd8fc794f47927dd6a7cdfc2d26befe7daf7bdf971fbe39597c609347d90b6e SHA512 ba36f43ca6821aec047aefd7f974ead3691aac0f9c2cee1c38bab8b0ebc9ee9dff2d023f2c9e6358ab5138279900711ae0d80993630f82b5907ddd1fc55d91c8 WHIRLPOOL 12f002aba4f43fe8dd896d7ebb2d3e6d67fd4137328e086eb5aeed8b13574bb1bb6c51b9ccecb48088d90045770aa07c615afde0d58ee766876a75ce619f5a42
+EBUILD cinnamon-translations-3.2.0.ebuild 1311 SHA256 8fdbf50f1b394ddd0c43c61bcf6af25d0ac3ff7913dcd94244e8ae0676325042 SHA512 b30dae34a0203b22459f57a58dd0a97ec0b69ce64ef1447a2d5db1cc7cbe314a4e2da1570989ffb73cc495b647818f87d244a0f0e009b4243d2bb562b86bc908 WHIRLPOOL 0d7bc01407cc1fb81baf61af136b98de179ff056ad3c3f719761ccc810e39eb5af48b6a55e987907f01cc9b787f91136a16d472aae4c6cd908ce2cc60d8a1f12
+MISC ChangeLog 5852 SHA256 93cf188edfc7fd2f51f57140d309bd6b0d287619d946551bb771ad8887020ac7 SHA512 5546f57e947eb7763016aba71e62b3e568c79032395e658ea45dc0eda5288442f9534f66985beaa507f7fa08e00f4a864a132c5ed68bb8a5c8f1151715aec8ad WHIRLPOOL b0e4b2caafc7fc87e56a26e0051b3a536657b1993406a3aeba914e2d79c66bd80bc5c6c6f53aebe972812653b6a8a4b08f428c6e7f6d9fe2c502b1056ecab5ec
+MISC ChangeLog-2015 2749 SHA256 ac65f31044f17dccc6e5bcb8cfad3b742a2bbcc75ed35f453dae959027258497 SHA512 2b89eb9039152e4f998be5b7d79c71d626a4069d936c8c3adc34ac367208172e26b910b92f75096b202ff04f3b3f66f990994240dead5d7f4a934f54f1a00c0a WHIRLPOOL fde39f2f3f939b5c91c6618b68eb0eba8b2ada6ad06481fe1be88824b2b0a3b7afdcd37f2cd98ae7255819582096b39a1023922ef810a9241cbb92e03a395aac
+MISC metadata.xml 360 SHA256 ed3aec9b491456c66803af19759f06a01b21e8b706261f56800f320f964e1dbe SHA512 67ed344e9ed1fa6fe0aa85938b73ee6e7f831d260b3de3c23f7a06d1fc30cdb7a2770e40ea083d187794af7c08adbafee3679c7731bfc29a0e5995586f1817bc WHIRLPOOL 27352cc5e1e58376eb31d5b0fd65639ebb1abba1f29bdfc602e7b33bf08994c7e8798cad1e99b45b969273da5367dc6a5eb894ec0e14c644c59729bda2ba0e37
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
new file mode 100644
index 000000000000..71139b82da91
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="test" # tests are for upstream translators and need network access
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		dodir /usr/share/locale
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	l10n_for_each_locale_do install_locale
+}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.0.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.0.3.ebuild
new file mode 100644
index 000000000000..a86fa1472542
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="test" # tests are for upstream translators and need network access
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		dodir /usr/share/locale
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	l10n_for_each_locale_do install_locale
+}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.2.0.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.2.0.ebuild
new file mode 100644
index 000000000000..af749589b261
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="test" # tests are for upstream translators and need network access
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		dodir /usr/share/locale
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	l10n_for_each_locale_do install_locale
+}
diff --git a/gnome-extra/cinnamon-translations/metadata.xml b/gnome-extra/cinnamon-translations/metadata.xml
new file mode 100644
index 000000000000..6f03e8fdd7ef
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/cinnamon-translations</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
new file mode 100644
index 000000000000..8dc43827de25
--- /dev/null
+++ b/gnome-extra/cinnamon/Manifest
@@ -0,0 +1,20 @@
+AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 SHA256 094c4d22e6eb53558aeeeec7eb12a3d35e9921daf2c851655d6463e550a0db96 SHA512 a4344afe29799dbd4e6d88907c2906702c861e1409fb95d29fcc52f9b75be379ffd5a4682dde4a82fe40c898bb2468590d1241adb1a2415c473a3d75459e3460 WHIRLPOOL eb1df3d101c9085a9f1ec3c0eeb64cb66175471a99688ffdfb309ed8d6da53057370ed546ab31259086013c3096ab9103f649145c3fce56ae4ccb1a63b8c81db
+AUX cinnamon-2.6.7-optional-networkmanager.patch 3508 SHA256 f2f78dc683fcd096ae922dfa849686037047b78de51fd513fa1667aebdcfb94b SHA512 3798c0e616297390db3a5006ca7616546979796b0665496536c58745c97b05bed6fb363e73c0ac0ef83d024cd8d5f3faa309df1c5acc8f5efd481b8bc9b43a5c WHIRLPOOL d8efac762368adfa71676674c016de80bf5c01818ff85f2d73f6bba9c9eebd6a5e8a2da7313185de8568a1e1c3da42d4ebb6affd4124dc1969fbcf24d113c256
+AUX cinnamon-2.8.0-background.patch 1106 SHA256 e3d916f20af951ad7cff435cb5da431ebc07273dd7a431af19000e6cdf3a560c SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995 WHIRLPOOL 505af91f4e8705764c8682e17f68ff2dae8c719e1a2f2a94a71f103734bdf6555c3e01fddf4aa54df66b8971e4701209fb1e25da15ccdc92b3692572d7cb74b1
+AUX cinnamon-2.8.3-set-wheel.patch 2637 SHA256 97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc SHA512 cff8fb42a81d71b929327df5d56a68b68a96e79d4b85125ea7de0ed2dca53c6b45d08deccafa4453a7471f52aa6bf7d39ed979d2a085906997969a63e7dd7a8c WHIRLPOOL c29898067bddeaa6a01ff0699ee27041df7484edbffa17b85e33322215adf8e212929a7c0ba6a454f88c816790807d761abf0a79886544d288e124b23ef9587a
+AUX polkit-cinnamon-authentication-agent-1.desktop 213 SHA256 9bc4aa73d429ed0563390fa1abdb4512b664c60ef5043f01db7bda9a0635d645 SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db WHIRLPOOL dacb03daf730732ea9b8f9a7bd694e212152e2f2129ce300302bad5f4ae3d49c6be3c3adca38523d301c7469558faebe100ff605e7e3931766d95e9108f203b0
+DIST cinnamon-3.0.7.tar.gz 3065791 SHA256 0aa0ce174a4638f54ddb2f0dc1f93a847678fa225c7a4fae718ffd14f1c8694f SHA512 db3f2532525c71b0841ce22245518502f8e905fd353c22e41dc57551cf68422ab6b53a57e4089664e8db9035a7723214756de78d2b5d5a92e11515216b15afbf WHIRLPOOL 7f7e0f3841d8790f332342e9d0696c8f70e81657ea02e1374871505be1c5ecdb7e9d4fc4fd0d600bf69fcd856123a58d5b272b4de03f9dd7d4c7d3d8278154b0
+DIST cinnamon-3.2.0.tar.gz 2216495 SHA256 c1473aabb01329c07bf1e28148cb410255700f4dd237195b7790e9bcdb69b89d SHA512 340530d77e68a5680cfa44afa3efc157552a7319f9badb251456d43e4e0a4e8c7cecf8e273c6cedec05e8248d68bbbdca2f8bb9d1766c418a6bc10d386e38302 WHIRLPOOL 58c749c9679f582a7ef088f4a8026d7027c84368be5d2c07ba9dd29c9a0781ad962fdbb4342538bb3b801f2fce60c483a0b806008e6fecb2698b367969aefc52
+DIST cinnamon-3.2.6.tar.gz 2225445 SHA256 ab2e5681e4780e065ebf4aebf4b909e9b723a69d7d437ea490c7a9a39ffce8a5 SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb WHIRLPOOL 2d1c8c7662a3e76dae733300a86057962a159ad4fd7946f73b84bfdf624d6c6fb23b863847786879233d7dd2f3a8bc037c64fb065977732259f0c3b60857039f
+DIST cinnamon-3.2.7.tar.gz 2226152 SHA256 69ab4510e4239f577a7acc7ea987d0522caa9796bfaa4a062a5009009ebc5a80 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df WHIRLPOOL fd3a0bbed451ca26844b9063d2a82aef7151a554a33522d5d765c4c871871d7a73ea9f4f5768f6d6135d45fd626fd871dc1cff4bcc5ff2f028694bc792207942
+DIST cinnamon-3.4.2.tar.gz 2213346 SHA256 182ed619f92831b83e9bfd89803bbd750c6cb0ee9d097120cdd40eb19d41e302 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 WHIRLPOOL 27a508e693d32c1c297df545028ca3737a15e91de197f52fbb41854b3b1f7aa813e20d6062fb1ece432166004651c4cf17d38551a1e79bc2ea1c1f652d96b76f
+DIST cinnamon-3.4.6.tar.gz 2217209 SHA256 857cd68ca4744332e9b20456ae3a0d63ee8a3eacd108ec82dd26b124765a45b4 SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd WHIRLPOOL fcc2d2ea60099e021e6a761d7a519bc773430d128506d38f0d7653d586d79c3019af8c739b2b013dc3faadfbecae8643f5aa87c4137e9da5098e337623620f4f
+EBUILD cinnamon-3.0.7-r2.ebuild 7951 SHA256 3b1f42ed645403c67e04e227e8adf80f879856e550873ba4ea58e66314765e54 SHA512 3a838d7a9ba30a4d6bd55be5be0ef1ac86f25607ac13c274eccd7154fb5a87feb0526c4d9ab5b306db404181dfb4414211b30ca9bc6a07d5a63c43317ef95c4b WHIRLPOOL 784d22840b452b1b98cd60ef4567e5c0b8cad7007d611e28dd011b0065245dfb178a7b6a4e8046c50ffaaa1c6e8b2085a9089d9c09261e7920d24431e42581fc
+EBUILD cinnamon-3.2.0-r2.ebuild 7913 SHA256 6213ba2e5a0ae0b193814693edcc9eda02184b54159e198ab453c04dc06caa28 SHA512 8f2f6b7bb9de2e6ae58f2f3135f26e75768463497faa0f8623bd807d0a25a8ce29d216e27db6ff9b71b7f17b2c0c64b7ccdd71e19ef78dba9c265be2a37238f6 WHIRLPOOL ac0275d2b7aa176e6401d90492029f8d9b4d6ede2a02cb1f884c146ba0e59ea623f3dbd0e5bacb7ec8b18ed186a49cc4632829eeb5d363dd3fdf4c2944e01720
+EBUILD cinnamon-3.2.6-r1.ebuild 7914 SHA256 8e4a62d79d2f5532da3cd375a9c1a145dbb737947ee55e2cb9c66b121a808dc9 SHA512 48b49241719827b0e283d65d9164a1e4f780de70ebb3f8d82dc3e74b9572552506c1e5f6df43553bc446f33d45802889b1f8828f753ddd19955d99cfdb1bf3a0 WHIRLPOOL 0ad6db95e488ce8c50fc9002b31592f776b69339fe05acafcc3e83e3e8d2ecda519ff4140e584dddc8361c19ecb50203c0954938a140ac8c3198b2340fc1f511
+EBUILD cinnamon-3.2.7-r1.ebuild 7914 SHA256 8e4a62d79d2f5532da3cd375a9c1a145dbb737947ee55e2cb9c66b121a808dc9 SHA512 48b49241719827b0e283d65d9164a1e4f780de70ebb3f8d82dc3e74b9572552506c1e5f6df43553bc446f33d45802889b1f8828f753ddd19955d99cfdb1bf3a0 WHIRLPOOL 0ad6db95e488ce8c50fc9002b31592f776b69339fe05acafcc3e83e3e8d2ecda519ff4140e584dddc8361c19ecb50203c0954938a140ac8c3198b2340fc1f511
+EBUILD cinnamon-3.4.2-r1.ebuild 7784 SHA256 0b73ec566879e62ab2a00255ed0d4bc8bf74b519139e29e1bdd11239944fc225 SHA512 1aea09dced11566564f1ed15b450f320bda11dcd3673530989b242093e08a8e1d42cba47fafe3e226240d0173b2a725fe2ae8e1a4826a5b5c772a7f302241c45 WHIRLPOOL 60db2e32c6db0ec66f5b84b659869b430b652f01dc4c9c2a990b9c4c5d0c7c443b4e98e8c6979f03992bd378fe6030a0fe11962924d30c8d99b741a47cbea70f
+EBUILD cinnamon-3.4.6.ebuild 7784 SHA256 0b73ec566879e62ab2a00255ed0d4bc8bf74b519139e29e1bdd11239944fc225 SHA512 1aea09dced11566564f1ed15b450f320bda11dcd3673530989b242093e08a8e1d42cba47fafe3e226240d0173b2a725fe2ae8e1a4826a5b5c772a7f302241c45 WHIRLPOOL 60db2e32c6db0ec66f5b84b659869b430b652f01dc4c9c2a990b9c4c5d0c7c443b4e98e8c6979f03992bd378fe6030a0fe11962924d30c8d99b741a47cbea70f
+MISC ChangeLog 9668 SHA256 53bef3a5782fcfafc37cd7e45813036dca95e2826a759e6287cbd72f8ae3e53a SHA512 8e7e981ceda298181ce2e50ca4119830d78cacbe3992eef12e596eccc1a7af1009d4cdd41bdfb403dbfae4c17b531424c23510adbe7da15098d53bf7563c0a9f WHIRLPOOL fd756543b5f0dcff4660e57f2d75dd57abc0e63109b1883e1ab1c89e3d8c9c2b79d99c4bb6653a8a6a80bd68660374c7deaa038bba61be61f55cb9cdedee5778
+MISC ChangeLog-2015 14977 SHA256 d772ee862f38fa3cfc7ff1f46fae923f80732d381cfeb9d933baf029db28ee0a SHA512 3c77146c5e22a877a0038d834ff68552d45faaa8182757ab5503bbd4e95e817937fe697c8a7f4583be06162e48221743917d9cd0065fb842e880bdfadc0dd392 WHIRLPOOL c21b8878e0ed9e61a184511232ef9280c59eeaf439414a6c8430627b84066f57e5e8f14ce90d47f878972a846a5354babf182e7eaa7c8b23854d4b3bc80fe358
+MISC metadata.xml 335 SHA256 dd5115a01da6642547f2609b4398d624929e646f600c778b0ea7e4eb455415b6 SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb WHIRLPOOL 6c71e07452e2558ca44c8e0af52f5ce1b1deedc3e7895419e3c01c0db1d581aa68eaa2ac2edc5e6007c18a138260d4db8420e6eb49963637711d93f5deec3c58
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
new file mode 100644
index 000000000000..17231388f287
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due to bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.8.0
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-3.0.0[introspection]
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999:=[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-rpath \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild
new file mode 100644
index 000000000000..ccb09ba13318
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due to bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.8.0
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-3.0.0[introspection]
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999:=[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild
new file mode 100644
index 000000000000..198a26d014d1
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due to bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.8.0
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-3.0.0[introspection]
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999:=[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild
new file mode 100644
index 000000000000..198a26d014d1
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due to bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.8.0
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-3.0.0[introspection]
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999:=[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..7a62d8ff83f3
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due to bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	>=gnome-extra/cinnamon-menus-3.0[introspection]
+	>=gnome-extra/cjs-3.2.0
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-3.2.0[introspection]
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999:=[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild
new file mode 100644
index 000000000000..7a62d8ff83f3
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due to bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	>=gnome-extra/cinnamon-menus-3.0[introspection]
+	>=gnome-extra/cjs-3.2.0
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-3.2.0[introspection]
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999:=[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
new file mode 100644
index 000000000000..aa2e82bd13fa
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
@@ -0,0 +1,44 @@
+From 40750fc87b7a1cad60d0e605732b9df50dd16c11 Mon Sep 17 00:00:00 2001
+From: root <admin@catmur.co.uk>
+Date: Sun, 8 Jan 2012 13:55:05 +0000
+Subject: [PATCH] Fix automagic gnome-bluetooth dependency
+
+https://bugs.gentoo.org/show_bug.cgi?id=398145
+
+Ed Catmur 2012-01-08 13:46:22 UTC
+libgnome-bluetooth-applet is a private library so they shouldn't be linking
+against it anyway.  I tried to work out how to tell libtool to add it to rpath
+but got totally lost.
+
+I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
+so I can at least merge USE=-bluetooth.
+---
+ configure.ac | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index c0e43e1..bc764e1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -111,6 +111,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0)
+ 
+ AC_MSG_CHECKING([for bluetooth support])
++AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
++AS_IF([test "x$with_bluetooth" != "xno"], [
+ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
+ 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
+@@ -123,6 +125,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+ 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
+ 	 AC_SUBST([HAVE_BLUETOOTH],[0])
+ 	 AC_MSG_RESULT([no])])
++], [AC_DEFINE([HAVE_BLUETOOTH],[0])
++	 AC_SUBST([HAVE_BLUETOOTH],[0])
++	 AC_MSG_RESULT([no])])
+ 
+ MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin`
+ MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin`
+-- 
+1.9.2
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch
new file mode 100644
index 000000000000..6af4f8642f73
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch
@@ -0,0 +1,88 @@
+From 3dbb6dc0b3dd08e6d5ae24fa079d9443c1b66ab9 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 10 May 2014 15:14:05 -0400
+Subject: [PATCH] Make networkmanager dependency optional for Gentoo
+
+---
+ configure.ac         | 35 ++++++++++++++++++++++++++++++++++-
+ js/misc/config.js.in |  2 ++
+ src/Makefile.am      |  5 ++++-
+ 3 files changed, 40 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b5668f4..5f600dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,7 +82,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
+                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+-                               libnm-glib libnm-util gnome-keyring-1 atk-bridge-2.0)
++                               atk-bridge-2.0)
++
++##########################
++# Check for NetworkManager
++##########################
++NM_MIN_VERSION=0.9
++AC_ARG_ENABLE(networkmanager,
++              AS_HELP_STRING([--disable-networkmanager],
++                             [disable NetworkManager support @<:@default=auto@:>@]),,
++              [enable_networkmanager=auto])
++
++if test "x$enable_networkmanager" != "xno"; then
++   PKG_CHECK_MODULES(NETWORKMANAGER,
++                     [libnm-glib libnm-util gnome-keyring-1],
++                     [have_networkmanager=yes],
++                     [have_networkmanager=no])
++
++   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
++   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
++else
++   have_networkmanager="no  (disabled)"
++fi
++
++if test "x$have_networkmanager" = "xyes"; then
++   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
++   AC_SUBST([HAVE_NETWORKMANAGER], [1])
++else
++   if test "x$enable_networkmanager" = "xyes"; then
++      AC_MSG_ERROR([Couldn't find NetworkManager.])
++   fi
++   AC_SUBST([HAVE_NETWORKMANAGER], [0])
++fi
++
++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+ 
+ PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION)
+ 
+diff --git a/js/misc/config.js.in b/js/misc/config.js.in
+index 704989b..df7e014 100644
+--- a/js/misc/config.js.in
++++ b/js/misc/config.js.in
+@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+ const GJS_VERSION = '@GJS_VERSION@';
+ /* 1 if gnome-bluetooth is available, 0 otherwise */
+ const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
++/* 1 if networkmanager is available, 0 otherwise */
++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
+ /* The system TLS CA list */
+ const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0b0a4a9..cf3a606 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -290,7 +290,10 @@ libcinnamon_la_LIBADD =		\
+ libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
+ 
+ Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
++if HAVE_NETWORKMANAGER
++Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
++endif
+ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
+ Cinnamon_0_1_gir_LIBS = libcinnamon.la
+ Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
+-- 
+2.4.3
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
new file mode 100644
index 000000000000..d9c14144cb52
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
@@ -0,0 +1,26 @@
+From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 11 Jan 2015 20:33:37 +0100
+Subject: [PATCH 1/5] Use gnome backgrounds since Cinnamon isn't providing any
+
+https://github.com/linuxmint/Cinnamon/issues/3575
+---
+ files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+index bf6dc39..83a8b04 100644
+--- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
++++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+@@ -198,7 +198,7 @@ class Module:
+     def get_system_backgrounds(self):
+         picture_list = []
+         folder_list = []
+-        properties_dir = "/usr/share/cinnamon-background-properties"
++        properties_dir = "/usr/share/gnome-background-properties"
+         backgrounds = []
+         if os.path.exists(properties_dir):
+             for i in os.listdir(properties_dir):
+-- 
+2.2.1
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch
new file mode 100644
index 000000000000..a018013e60d6
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch
@@ -0,0 +1,56 @@
+--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -147,12 +147,11 @@
+ 
+ class PasswordDialog(Gtk.Dialog):
+ 
+-    def __init__ (self, user, password_mask, group_mask):
++    def __init__ (self, user, password_mask):
+         super(PasswordDialog, self).__init__()
+ 
+         self.user = user
+         self.password_mask = password_mask
+-        self.group_mask = group_mask
+ 
+         self.set_modal(True)
+         self.set_skip_taskbar_hint(True)
+@@ -218,14 +217,7 @@
+     def change_password(self):
+         newpass = self.new_password.get_text()
+         self.user.set_password(newpass, "")
+-        mask = self.group_mask.get_text()
+-        if "nopasswdlogin" in mask:
+-            subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
+-            mask = mask.split(", ")
+-            mask.remove("nopasswdlogin")
+-            mask = ", ".join(mask)
+-            self.group_mask.set_text(mask)
+-            self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
++        self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+         self.destroy()
+ 
+     def set_passwords_visibility(self):
+@@ -563,7 +555,7 @@
+         model, treeiter = self.users_treeview.get_selection().get_selected()
+         if treeiter != None:
+             user = model[treeiter][INDEX_USER_OBJECT]
+-            dialog = PasswordDialog(user, self.password_mask, self.groups_label)
++            dialog = PasswordDialog(user, self.password_mask)
+             response = dialog.run()
+ 
+     def _on_groups_button_clicked(self, widget):
+@@ -807,11 +799,11 @@
+             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
+             description = "<b>%s</b>\n%s" % (fullname, username)
+             piter = self.users.append(None, [new_user, pixbuf, description])
+-            # Add the user to his/her own group and sudo if Administrator was selected
++            # Add the user to his/her own group and wheel if Administrator was selected
+             if dialog.account_type_combo.get_active() == 1:
+-                subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
++                subprocess.call(["usermod", username, "-G", "%s,wheel" % username])
+             else:
+-                subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++                subprocess.call(["usermod", username, "-G", "%s" % username])
+             self.load_groups()
+         dialog.destroy()
+ 
diff --git a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
new file mode 100644
index 000000000000..24e14f267e23
--- /dev/null
+++ b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+OnlyShowIn=X-Cinnamon;
+X-GNOME-AutoRestart=true
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
new file mode 100644
index 000000000000..216784b94f4d
--- /dev/null
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/Cinnamon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
new file mode 100644
index 000000000000..05b33d2ed934
--- /dev/null
+++ b/gnome-extra/cjs/Manifest
@@ -0,0 +1,12 @@
+AUX cjs-2.4.0-disable-unittest-1.patch 1702 SHA256 9e24eb201ed8dc4aae9d5a3178321c38af47b47b493ed8a233822db97609fff3 SHA512 c19b4738a1b99a916ed8a1be5817c39b3436718655d38b748c00b68d94a033f0eac2a91f4c1b3604272d23175f93839aead446ae594789b5b7938e3f27411078 WHIRLPOOL 3fd6d4cfe4cf0b458413f2994480819f59d06eb752c6e95e32d773061ff10b4a14247ddb718d6500f308f278f803ee825c438fa392b71d4d9597a15241b9dc8f
+AUX cjs-2.4.0-disable-unittest-2.patch 2128 SHA256 e0635d70b826154ba8cbf90b689aa6fc2647d64d5bce6f95f7270600aab5a837 SHA512 69c40eae62f9bb5a4944d8e8d63b0ba43346d0c0547df58c4693eddf149d735d7288b2857cb1c0a652be92e8c74142f15415ff1afe17445fdc63074d5335638a WHIRLPOOL 66ee22c0fd9ac19917ed9542011da55d921676ae145a3c8f509530b7479a7520b428b26b8d780269f72459c1b9df83ba53c471e139492dce295db1b2b5bb54b0
+AUX cjs-2.4.0-disable-unittest-3.patch 1119 SHA256 4f4eefee8e623bfd1a9fe38f790b6481b2abaae1fa5e3eb12716941b4ae27002 SHA512 c94e7248c5d9623a15fa8ff4c629029a2ca976300381ae03462ae53ce9c55dcb7ec2ce9b669dfc3ab9ccc03a56f58114c9eb43cbfb22fb40b937a4e08b3569a0 WHIRLPOOL 8be04902c0b5900ed088c26fccbfd226564c014d862d9ccb62a01b486551ef0b009b3489441dcf806eff7ffcf316dc118f9757646f2fd3bc53987a2a19674026
+DIST cjs-3.0.1.tar.gz 325349 SHA256 cafda5a8a21421e93720732debeea08c59e63c058d240ab0f7b3a6969654864f SHA512 3980e60ca005e616be264ec5bf6cb920452eec538da266dc0645ec1c340506b864886007b371b96830efa379e8ed9dd9127dc205b45e004705fd5c181d82e538 WHIRLPOOL 9368a53f9284d0f234d6e816f27dd6893338b4c6807f7fa0f44403ec0fbcaea3cc6908f86ad1e528f12351e008e93942f0769779f3c271e46e994d6ea7139b5f
+DIST cjs-3.4.1.tar.gz 425003 SHA256 83254b01984452cc234891768e746f688924fe2904b6c1c76e214528ff44c060 SHA512 aab752aa03862979374bfe883d62968efab6b9137914b7ab9fcca2025bab6a6ae536db59aaee6deeeba06d2ff8c433d7f769ae0a4c0e2542e7c9a58f723d8690 WHIRLPOOL f6206a56b6e5b5984c567e3b8c4f48d3e0305c76da5c4d4320757248566975bddbf4b376118246beb6c447485e03b8a1a836598d215d6ba13a468ae91d6c7901
+DIST cjs-3.4.4.tar.gz 426665 SHA256 e2497bb3eb53a919776a2f4b869dcc2ba3deb09e955433272a8905e7f6ef9bee SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33 WHIRLPOOL 8e774188cf6722075e019c8cac255fcae55ba6fc67c24a974ba033002d6faa8f12aad70c789666d14ed3bdcd63965bf60fe5782fa5b537f2b5e16e482f24664a
+EBUILD cjs-3.0.1.ebuild 1664 SHA256 76df8a5cfc963a5257410e4a18f91c35a96d71c9414d5e0b5ae5edcc81474f71 SHA512 59de06e7315032403e0a831168ae45e5cd0da3026bd8ff583dc48d325ee4faa47951f30aa18eeb15cbcae501ab51faa7b4df81f263ad2fbb3f44ac159418fa7c WHIRLPOOL 1809d8cd330a4462cadf18087621ccfce973e36c2a0eb7579451737d2bfe89f60eff7e6100879a1526052e340fb2fc32ff2a794a421bac42ace8f34884e7be7e
+EBUILD cjs-3.4.1.ebuild 1511 SHA256 950b7094b2df4480e1aa13c7c2ccf6513e5b166c0ce7218b144cd2e57e5a0133 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e WHIRLPOOL 4dec6bc928e23d8db2c154b100728aacce83d804f307bd4c279d292aebfb6754f4c2d6618a5a34e641cea97475e043605b9f2a30f810f5badbdaefbc6566e935
+EBUILD cjs-3.4.4.ebuild 1511 SHA256 950b7094b2df4480e1aa13c7c2ccf6513e5b166c0ce7218b144cd2e57e5a0133 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e WHIRLPOOL 4dec6bc928e23d8db2c154b100728aacce83d804f307bd4c279d292aebfb6754f4c2d6618a5a34e641cea97475e043605b9f2a30f810f5badbdaefbc6566e935
+MISC ChangeLog 4845 SHA256 76288dae5b50d6958f070c24aa1fad0340fa9a75cd652ec345e10c1c5ece1998 SHA512 1db4fe990fa0bf0cf596a9fed1aa612d52200d7842bca64610ac82c25a9440298dda151907d9b903138eea519d413c4f25c868ce8df576d2d83ba7a5178e659a WHIRLPOOL 08d284dffbcd75f5dc69841034cfb147df0e7db80eb4c9c09a6967694b3fcc2ecdc997e6b1611cf9509fa25997997be60fc965fae2c773d52f9e026076676542
+MISC ChangeLog-2015 2529 SHA256 03daf3b210223d5b374aa3b52b22a843fd70750dfa63135667943fa9f4d8c262 SHA512 c38190c33f6bf6e4417b127267c8ed015ca2b7426e7c3a1a2d63b753f9900d0e11b5ce9c8441aadc0873499675d8e82258b1df706f557d9b823ea494c05e7921 WHIRLPOOL ce6606b6f8d62fe2601b9a81b5b095d53f7cc6eadfd8e06dfa48220d8977b95eeec580e19dfb72a1aa1375b456f22a72ca85c079824c19c416f2872059799e7e
+MISC metadata.xml 342 SHA256 9e57e7c177f8691635f91f93b802c8fb6afa216561c75f9a4c3f73af4ffa4275 SHA512 0f3a872b9a8255f708e81aad825a17dfe580ef7a5613b408406e3751f0aea0ca6e952b015451b1681efdc5b88cd1874d8d116481a128dd05a42cf21c7d168bce WHIRLPOOL 9f4e87ca759f95d74d54f0c960abb1cabdd2cd9cb84fa792b9b8784afeda76199dab5db8e5fd7a55efff4d98b61c2789a8c387470e706cbed3fcedcf3f6f02d6
diff --git a/gnome-extra/cjs/cjs-3.0.1.ebuild b/gnome-extra/cjs/cjs-3.0.1.ebuild
new file mode 100644
index 000000000000..b56d402ca7ad
--- /dev/null
+++ b/gnome-extra/cjs/cjs-3.0.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:24
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/gobject-introspection-1.38:=
+	sys-libs/readline:0
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+	!<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+	# Disable broken unittests
+	eapply "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/cjs/cjs-3.4.1.ebuild b/gnome-extra/cjs/cjs-3.4.1.ebuild
new file mode 100644
index 000000000000..23afc9055f7d
--- /dev/null
+++ b/gnome-extra/cjs/cjs-3.4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:38
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/gobject-introspection-1.38:=
+	sys-libs/readline:0
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	sys-devel/autoconf-archive
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+	!<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/cjs/cjs-3.4.4.ebuild b/gnome-extra/cjs/cjs-3.4.4.ebuild
new file mode 100644
index 000000000000..23afc9055f7d
--- /dev/null
+++ b/gnome-extra/cjs/cjs-3.4.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:38
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/gobject-introspection-1.38:=
+	sys-libs/readline:0
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	sys-devel/autoconf-archive
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+	!<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch
new file mode 100644
index 000000000000..5afd89293695
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch
@@ -0,0 +1,48 @@
+From 554c220e78172213e9637f9a901009b4bc964e3a Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Wed, 15 Jan 2014 17:00:22 -0500
+Subject: [PATCH] gjs-tests: Remove dumpstack test
+
+OK, I lied. This is the most useless test ever.
+---
+ test/gjs-tests.cpp | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
+index b79b616..6cade7b 100644
+--- a/test/gs-tests.cpp
++++ b/test/gjs-tests.cpp
+@@ -163,22 +163,6 @@ gjstest_test_func_gjs_jsapi_util_string_js_string_utf8(void)
+ }
+ 
+ static void
+-gjstest_test_func_gjs_stack_dump(void)
+-{
+-  GjsContext *context;
+-
+-  /* TODO this test could be better - maybe expose dumpstack as a JS API
+-   * so that we have a JS stack to dump?  At least here we're getting some
+-   * coverage.
+-   */
+-  context = gjs_context_new();
+-
+-  gjs_dumpstack();
+-  g_object_unref(context);
+-  gjs_dumpstack();
+-}
+-
+-static void
+ gjstest_test_func_gjs_jsapi_util_error_throw(void)
+ {
+     GjsUnitTestFixture fixture;
+@@ -348,7 +332,6 @@ main(int    argc,
+     g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
+     g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
+     g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
+-    g_test_add_func("/gjs/stack/dump", gjstest_test_func_gjs_stack_dump);
+     g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
+     g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
+ 
+-- 
+2.1.2
+
diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch
new file mode 100644
index 000000000000..2490a63fea90
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch
@@ -0,0 +1,40 @@
+From 4ea9fda3f323355d10e946d19d817fe8c4e6b533 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 12 Oct 2014 21:57:11 +0200
+Subject: [PATCH 1/2] Comment broken unittests
+
+---
+ test/gjs-tests.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
+index 6cade7b..4d6c61e 100644
+--- a/test/gjs-tests.cpp
++++ b/test/gjs-tests.cpp
+@@ -324,18 +324,18 @@ main(int    argc,
+ 
+     g_test_init(&argc, &argv, NULL);
+ 
+-    g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy);
++    /* g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); */
+     g_test_add_func("/gjs/context/construct/eval", gjstest_test_func_gjs_context_construct_eval);
+-    g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array);
+-    g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw);
+-    g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8);
++    /* g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); */
++    /* g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); */
++    /* g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); */
+     g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
+     g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
+     g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
+     g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
+     g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
+ 
+-    gjs_test_add_tests_for_coverage ();
++    /* gjs_test_add_tests_for_coverage (); */
+ 
+     g_test_run();
+ 
+-- 
+2.1.2
+
diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch
new file mode 100644
index 000000000000..7b2898b75cf5
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch
@@ -0,0 +1,35 @@
+From da18a2676477138693e893d3245316f987d74497 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 12 Oct 2014 21:57:45 +0200
+Subject: [PATCH 2/2] Comment broken JS unittest
+
+---
+ installed-tests/js/testLocale.js | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js
+index b086a66..0c5abb1 100644
+--- a/installed-tests/js/testLocale.js
++++ b/installed-tests/js/testLocale.js
+@@ -1,14 +1,14 @@
+ // tests for JS_SetLocaleCallbacks().
+ const JSUnit = imports.jsUnit;
+ 
+-function testToLocaleDateString() {
+-    let date = new Date();
++//function testToLocaleDateString() {
++    //let date = new Date();
+     // %A is the weekday name, this tests locale_to_unicode
+     // we're basically just testing for a non-crash, since
+     // we'd have to run in a specific locale to have any
+     // idea about the result.
+-    date.toLocaleDateString("%A");
+-}
++    //date.toLocaleDateString("%A");
++//}
+ 
+ function testToLocaleLowerCase() {
+     JSUnit.assertEquals("aaa", "AAA".toLocaleLowerCase());
+-- 
+2.1.2
+
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
new file mode 100644
index 000000000000..1f87fb620863
--- /dev/null
+++ b/gnome-extra/cjs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/cjs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/docky/Manifest b/gnome-extra/docky/Manifest
new file mode 100644
index 000000000000..d732a82eaac4
--- /dev/null
+++ b/gnome-extra/docky/Manifest
@@ -0,0 +1,5 @@
+DIST docky-2.2.1.1.tar.xz 587780 SHA256 3759c052a375dea4ab462669896d92acc6eb497197dd5a73ff30527d668dfbc6 SHA512 614117a0523e3d5b0cab069cb8b2dd0d69a80d318a7d4c583716a5690da6e99f5c376bf85472a6dd36b3578ba1711c036c2712892494f5115c9270d79c2d996f WHIRLPOOL 438fea2b3aeedce51b09b452a29495f3e4dce6bca97f2a4b88eb82503a7c6127d9b0cf31c511ab1d3340f6ae7dffe7a8e5e424cf694a3b4d1beb7ab933e0328d
+EBUILD docky-2.2.1.1-r1.ebuild 1148 SHA256 a9bd6d650191fc61c32f104340419a68b33d05c79e6c9cd1b55d76b1b51fece1 SHA512 81237ec275e3b6e456f9e0e444ca7609f5aee22f6c3f1355055c97b98f013b2d32b2e35349ca0b6d81bd22498c461d31d0424dc1de836e721074eff879e0ce74 WHIRLPOOL 61cc3262a7b0e8eb81ed25e3f2a31d6f17f9f44d5b25df6f8e0a883c5a054a9f73ccc844da6b33d27168d6101c1fc69b109c789730529a8bb3c13f197e9ca1bb
+MISC ChangeLog 4167 SHA256 28818bc3621110ee19c8d141aecc772b9e18632549afafc0f9ee80fae77f7515 SHA512 de9590a726e9bdeb34a865e8201a742efd8769e172f6d67e47237b1c31a88edd06ed4d603aebed66dc65eedf3e86f4e447551d59609450a7441dbe40f1ddc453 WHIRLPOOL f74817a240d990edb87e08b76aa6adb87ba76f650cb7d03ec716b2cb91bd417c402700577c14bec18c738f18edbd7f058c5d2371beacb17f2d38b5a88be63709
+MISC ChangeLog-2015 2202 SHA256 4bcf010af18bc00db8786d0121eb8b7b068d004d8943e752bd4ad20827b91d5e SHA512 07afafbdfebe0938bc6de14158c27f4ac645a9e65f4b5ea3fd64cad2b239a10a9c44f2b9700690dcf178c2797f6014ec2294378568a1c5c127d21aee12140f51 WHIRLPOOL c4df9832bfc6e51bf357e6fe6cfd01c6a4b3782aa2373836a0bda1c373b56cc4937c99ad5c986e1b01b65ec1310c25250b366663fc06518a592f4a1bfffa515f
+MISC metadata.xml 338 SHA256 7955f490fdf03deb4181ce190d202e56ba688e5e0b3b162c89c04ed1ad414186 SHA512 91555d822d8abbbeafe6e64aaa476f2dffcc06bd0b99e4de286534484f4ee0af676fcc7d7f36371b9f064de96831e783597edae747246d044a008228d98f1f68 WHIRLPOOL 463082fea420ffeebcd282557b760070a490f5325134a2916d3269dc5e8f4d65afeb6a53b19246c49b5a9e50fac573f5b338a08bdb1dfe3c99e4db962d98b831
diff --git a/gnome-extra/docky/docky-2.2.1.1-r1.ebuild b/gnome-extra/docky/docky-2.2.1.1-r1.ebuild
new file mode 100644
index 000000000000..ecb0ae1c5a2d
--- /dev/null
+++ b/gnome-extra/docky/docky-2.2.1.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2 mono-env
+
+DESCRIPTION="Elegant, powerful, clean dock"
+HOMEPAGE="https://wiki.go-docky.com"
+SRC_URI="https://launchpad.net/${PN}/2.2/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND="
+	>=dev-dotnet/dbus-sharp-0.8.0:2.0
+	>=dev-dotnet/dbus-sharp-glib-0.6.0:2.0
+	|| ( >=dev-dotnet/gtk-sharp-2.12.21:2 ( >=dev-dotnet/gnome-sharp-2.24.2:2 dev-dotnet/gconf-sharp:2 dev-dotnet/glib-sharp:2 ) )
+	>=dev-dotnet/gio-sharp-0.2-r1
+	dev-dotnet/gkeyfile-sharp
+	dev-dotnet/gnome-desktop-sharp:2
+	dev-dotnet/gnome-keyring-sharp
+	dev-dotnet/gtk-sharp:2
+	dev-dotnet/mono-addins[gtk]
+	dev-dotnet/notify-sharp
+	dev-dotnet/rsvg-sharp:2
+	dev-dotnet/wnck-sharp:2
+"
+DEPEND="${RDEPEND}
+	|| ( >=dev-dotnet/gtk-sharp-2.12.21:2 dev-dotnet/gtk-sharp-gapi:2 )
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e "/warnaserror/d" configure.ac || die
+	gnome2_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-release \
+		$(use_enable nls)
+}
diff --git a/gnome-extra/docky/metadata.xml b/gnome-extra/docky/metadata.xml
new file mode 100644
index 000000000000..1162bdd37fba
--- /dev/null
+++ b/gnome-extra/docky/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">docky</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
new file mode 100644
index 000000000000..89ca5f687ef9
--- /dev/null
+++ b/gnome-extra/eiciel/Manifest
@@ -0,0 +1,6 @@
+DIST eiciel-0.9.11.tar.bz2 680384 SHA256 13f9025e449d1b7f3a21fdb9454e8ba03849cb03d6390943c00a21dc3a0aebf2 SHA512 914b8b888e502a31f6c70bcc7d391ea8b79dde07e13b9a6ebb3b52a20b793fafd7a7a7f8ff7177c0150a223a74cae1b06fca0a274bc27545bb89223b4b8fd2aa WHIRLPOOL 140dfdb1c6e9308a5eced321775a0e337b78fa3798535f86be9f4dbade5c690c5fce9109d00f762439c4b893a6f19f48a3097f0cee7db8d6b3b8ee4a20f6cd01
+EBUILD eiciel-0.9.11-r1.ebuild 730 SHA256 0c16b62064eb892e5f50ddac47a581f20ba4d6a94191d2c5214f989595496b41 SHA512 b5c6c15b6dff67cb53cb7a65c62055b01cc58d4311f4436c742ef8ccd5b76720e5c1fc8a38697b0ea4a990beb5c2ff50a7f0003e9a5173ff23af8fb322da08f9 WHIRLPOOL 898119d46824d71e89be2557e18cf6922ee3babae55bda7311a5c086c71497f17a1902efe97540bd138c6ee4f8995a6b1051de6814c25f97068da25cc9d1faf5
+EBUILD eiciel-0.9.11.ebuild 689 SHA256 e86d74ff1f44ed5c2f68340f0aecf89366ebcdcde2ad940cd6dfe244feacbde5 SHA512 1d12e3d4ba528bf565b8c1595162144e9765f89277307fce4fbb677c82711bc90aff18cc153673b7f0afeef854112fa8eb59235801f7e5b11875d42ae70977c3 WHIRLPOOL d3fae908edcc4d2dd15ed6d298eea3c56e83ca65c4c3c487ca2235233b0a8861cf6b585468930b83ac5811c087086b6c0bd8f714e955c074a6e0fc6f2f287236
+MISC ChangeLog 4228 SHA256 4bc0085fafb461d4281832499d798caa3963dc5d9280c5061efba2f44dc1d77d SHA512 7dc06256d0b30b0f52aee763eeba1f86a1cd4ef354325b5c9428c08838551494e5a2ef1acfd9c292d35f1ab41775b41e8540c592954bd5c410d6a87db8f09fd3 WHIRLPOOL cb2fa5a5004b8bb649274bfb1bc4e7625cb8914703e004a6e935802a80ce3ee1f075563415ea03fe57a4f2147a95b918a86d89c640f92bff307c9ab5a80c8255
+MISC ChangeLog-2015 2205 SHA256 0e208dc4afa17f2afb044867c61d32d236d1c244aebbcd2721e05cccb90dcab5 SHA512 ecdd9687e3abddff13c8e4929f1304151537006897055aac7e53b5362f2de69908f2f564efbf6b2b94dc1dad5f9b9d480c51d12a2b66f407201f8a0dc55a4f96 WHIRLPOOL 2053cf50133d49851554eaeaedbee42bdfddfc8cb7c8c9d89494fa25cbff3aee05633f0c517849c00cba08e13b4191d28901eab25d0c803c23563a795d162169
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
new file mode 100644
index 000000000000..fa509d7fbe6f
--- /dev/null
+++ b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
+HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
+SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="xattr"
+
+RDEPEND="
+	>=sys-apps/acl-2.2.32
+	>=dev-cpp/gtkmm-3:3.0
+	>=gnome-base/nautilus-3
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.18.1
+"
+
+src_configure() {
+	append-cxxflags -std=c++11
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-version=3 \
+		$(use_enable xattr user-attributes)
+}
diff --git a/gnome-extra/eiciel/eiciel-0.9.11.ebuild b/gnome-extra/eiciel/eiciel-0.9.11.ebuild
new file mode 100644
index 000000000000..b24a03ddc18c
--- /dev/null
+++ b/gnome-extra/eiciel/eiciel-0.9.11.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
+HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
+SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="xattr"
+
+RDEPEND="
+	>=sys-apps/acl-2.2.32
+	>=dev-cpp/gtkmm-3:3.0
+	>=gnome-base/nautilus-3
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.18.1
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-version=3 \
+		$(use_enable xattr user-attributes)
+}
diff --git a/gnome-extra/eiciel/metadata.xml b/gnome-extra/eiciel/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/eiciel/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
new file mode 100644
index 000000000000..0439b1e9a4f3
--- /dev/null
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -0,0 +1,10 @@
+AUX calentry.schema 3661 SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431 SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 WHIRLPOOL 2255a4b0b98f55476388bb97ac5bf1bf2b7107b56c2a93f55142e7ae0892c8f93874fd0731663362bacb4ad85302a6cb8a22a7228bba0724fb45d1eb37f406a1
+DIST evolution-data-server-3.22.7.tar.xz 5564924 SHA256 43127fe1f190873c73e13a4cada6cfe47870f1cc962e540a682cca123d959203 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44 WHIRLPOOL 83b3e667048bda6373c8002a506ea796f8813fd95f88006f634e054038693bbc69f8c436d0310820f1548107a102ccd5a354828691cebf270e6f743c65aa4115
+DIST evolution-data-server-3.24.5.tar.xz 4254720 SHA256 6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1 SHA512 ebe77bb8b1025b07378a32df5a822add11a2ef1e3daf57d8eae14ea05ba479cfe5e8ebf1d8dda585a6f3232d270f212dcfa9cd580fa1488b06a96204775a1c21 WHIRLPOOL dcd9a18cf52b82b087e16e821e32c1274261b619a591dbb9d818e81c104d808801551488d15162f6f7fca4277c24b4e562309520933efedf379daf652c96fc45
+DIST evolution-data-server-3.24.6.tar.xz 4252940 SHA256 058040214c9362e5e0f7592455418813da28b533b9ff2d6e2d868c39e580189e SHA512 01eece83217e66ce7e08e333ceaf38bae226800dd8a015dda29583b0155b9f1fbef4f18d95a7127d08421cd27b3203d2b7cc6a3bc0b5adba1b06197c85be96e6 WHIRLPOOL 02dd5fee09134b08f2e3544a914d9b215b268117bb9a96c982f294f41c2eb889825b7e97f50caa4beae717408142a01d8767ae7587516ac784be859985b3cd91
+EBUILD evolution-data-server-3.22.7.ebuild 3689 SHA256 bc28f3e72600bf07dd8756f76d42300cd6374c997b96703ae49584736ff1e721 SHA512 ec236fda93b156d8ee5ada17f83ba66fee61807c44979d6f9301711e088bca1135abc367f2959cbc95c2e7be5c2976844418decb82e8eda362bb2af059adf1cb WHIRLPOOL d690f950479cedbeabf399591d5474c5631ee659a2d96f8403aead84277a20b7a6a60efe752f25f1d176d67a4c4e3897fa222db2585d162dda44f0f945553742
+EBUILD evolution-data-server-3.24.5.ebuild 4037 SHA256 8705bd55bdd46b80811b436e89709d6ba58c0afb7738a7f80c88f120bcebf432 SHA512 cd3ed4085ad06adfb814d5543160bee8d7e1cc5f93273c7d5ab82422dffe2bcc2c73b0cbd0e53a5ed38ad5700e112cbed9947ba0592a9858ba18352f30a08d6e WHIRLPOOL b9d0e25b00365e9621e59cfd8d64940306001d44f0dc7de821f88382e9091246e27ea8b01165038eb75b00f79cbf1f3cefa9c43334934fc3b739dbc49ce6b114
+EBUILD evolution-data-server-3.24.6.ebuild 4045 SHA256 ad2255c91892c30be31b898b84708fa18d24da79c94f798dc0035682feb61b35 SHA512 ced28406aa340a31bc7c4a9f2cc4067268f0d6828f20e85c187c82f28d5572d68ced92bf1d07fcda0624cdc3bab580b805e366825e24c8c0903d93c700c0e3c4 WHIRLPOOL b5b234dab906aba94f0817a29d0a2e32bf897e6c8d04e1bce93c6b381bbb2d50f87b64842990f5d4dd79ae0139359ce33700b2c53e0551cfc83ccd5095376768
+MISC ChangeLog 8473 SHA256 d47e1fc874d0e41507538277ef685eb3f6f655d3014eb2564552a341c9725c9c SHA512 e0806f94d60efd858a539ecf2b3c5015f4d447082eba5efba7e8631b16e0065a1f1c4811c877c03a0b9914ccd276aea73e7b27ae3111ef953e8ff5e9b6429dd2 WHIRLPOOL 6ce6d1c6c2d896b3195f690893c82216f2637df5cdc2aff4a03792db108ff4d42663be8d0ce6641338413837635c8af7e5b2b14ecdf5b03347bba00964e00784
+MISC ChangeLog-2015 81764 SHA256 9687b8acf481d27b5b640661e20ad656537c795b3ff8a95a35ecc1e514e1adb2 SHA512 e8fae69b7f50373eec38360d693d29e78d87db3cc27a89fb16cb9d104c6a6f9267ea6ab3349c8b40863bb76c75b180f02a67eedce45782495486d823a3b9ed03 WHIRLPOOL a3bb775f6dbdba627c27aca0f2cf0d81310be325b87e702233ab16266a80d9ca82163bede32e8006935f77e23ee69e2d0fca743c438249fe0e405226fb13048a
+MISC metadata.xml 894 SHA256 14ee8050bc05dc664d8676f03811265a88aa0f996877a322d681c962d58ae2ef SHA512 26ebc7b28f82f5d0d048bb699ad3663f8cb26cecccff86bb77543412a8faaf54c9cfbf3f526a6d3e113ec5b573fb97cc60eb56343d3a79d9d6162922cfddab52 WHIRLPOOL 653519e430432e6997c7b0a15d65c1a908670fea82a4abe2953ebc28bc81ea3e920bf4022e616893e647961fd6e7c6999947d63f62a367fa8236c881760714ea
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild
new file mode 100644
index 000000000000..5d597fe7d157
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/59" # subslot = libcamel-1.2 soname version
+
+IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old calendar data, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-0.43:=
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.42:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10:3
+	)
+	google? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.11.91:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-2
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+	local gdata_flag
+	if use google || use gnome-online-accounts; then
+		gdata_flag="--enable-google"
+	else
+		gdata_flag="--disable-google"
+	fi
+
+	# phonenumber does not exist in tree
+	gnome2_src_configure \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gtk) \
+		$(use_enable google google-auth) \
+		${gdata_flag} \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_with ldap openldap) \
+		$(use_enable vala vala-bindings) \
+		$(use_enable weather) \
+		--enable-largefile \
+		--enable-smime \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		--without-phonenumber \
+		--disable-examples \
+		--disable-uoa
+}
+
+src_test() {
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.5.ebuild
new file mode 100644
index 000000000000..116009e996b9
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/60" # subslot = libcamel-1.2 soname version
+
+IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old calendar data, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-0.43:=
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.42:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10:3
+	)
+	google? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.11.91:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+	    -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_auth_enable
+	if use google || use gnome-online-accounts; then
+		google_auth_enable="ON"
+	else
+		google_auth_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DENABLE_GTK_DOC=$(usex api-doc-extras)
+		-DWITH_PRIVATE_DOCS=$(usex api-doc-extras)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_GOOGLE_AUTH=${google_auth_enable}
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DENABLE_UOA=OFF
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=$(usex google)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild
new file mode 100644
index 000000000000..3b2821871335
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/60" # subslot = libcamel-1.2 soname version
+
+IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old calendar data, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-0.43:=
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.42:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10:3
+	)
+	google? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.11.91:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+	    -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_auth_enable
+	if use google || use gnome-online-accounts; then
+		google_auth_enable="ON"
+	else
+		google_auth_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DENABLE_GTK_DOC=$(usex api-doc-extras)
+		-DWITH_PRIVATE_DOCS=$(usex api-doc-extras)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_GOOGLE_AUTH=${google_auth_enable}
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DENABLE_UOA=OFF
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=$(usex google)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/files/calentry.schema b/gnome-extra/evolution-data-server/files/calentry.schema
new file mode 100644
index 000000000000..bc79da273cc2
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/calentry.schema
@@ -0,0 +1,108 @@
+# RFC2739 calEntry schema for OpenLDAP 2.x 
+
+#
+# From https://bugs.gentoo.org/show_bug.cgi?id=83988
+# Please notify us of updated revisions by submitting a bug report at bugs.gentoo.org
+#
+
+# Version of RFC 2739 schema translated by Terrelle Shaw 
+# (xytek@xytek.org) # Nov. 7, 2002 # Modifications by Peter Marschall
+# <peter.marschall@adpm.de> # Nov. 9, 2002
+
+# Notes:
+# * RFC2739 seems to be a bit sloppy about attribute type and
+#   objectclass definitions syntax and also about attribute syntax
+#   and matching rules.
+#   (It even counts the attributes in the calEntry objectclass wrong ;-)
+# * The following changes have been applied to correct the schema
+#   - added description to each attributetype definition
+#   - changed SYNTAX from 'IA5String' to corresponding OID
+#     to make matching rules and syntax consistent
+#   - replaced illegal keyword SUBSTRING by SUBSTR
+#   - changed SUBSTR from caseIgnoreIA5Match to caseIgnoreIA5SubstringsMatch
+#   - removed illegal keyword MULTI-VALUE
+#   - added keyword SINGLE-VALUE where appropriate
+#   - removed USAGE since cwuserApplications is the default 
+#   - added description to the objectclass defintion
+#   - corrected typo in objectclass definition
+#   - added the attributetypes defined but not used to the objectclass
+
+
+# 2.4.4.1 calCalURI
+attributetype ( 1.2.840.113556.1.4.478 
+	NAME 'calCalURI' 
+	DESC 'URI to a snapshot of the users entire default calendar'
+	EQUALITY caseIgnoreIA5Match 
+	SUBSTR caseIgnoreIA5SubstringsMatch 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.2 calFBURL
+attributetype ( 1.2.840.113556.1.4.479
+	NAME 'calFBURL'
+	DESC 'URI to the users default free/busy time data'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.3 calCAPURI
+attributetype ( 1.2.840.113556.1.4.480
+	NAME 'calCAPURI'
+	DESC 'URI used to communicate with the users calendar'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.4 calCalAdrURI
+attributetype ( 1.2.840.113556.1.4.481
+	NAME 'calCalAdrURI'
+	DESC 'URI to which event requests should be sent for the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.5 calOtherCalURIs
+attributetype ( 1.2.840.113556.1.4.482
+	NAME 'calOtherCalURIs'
+	DESC 'URIs to snapshots of non-default calendars belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.6 calOtherFBURLs
+attributetype ( 1.2.840.113556.1.4.483
+	NAME 'calOtherFBURLs'
+	DESC 'URIs to non-default free/busy data belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.7 calOtherCAPURIs
+attributetype ( 1.2.840.113556.1.4.484
+	NAME 'calOtherCAPURIs'
+	DESC 'URIs to non-default calendars belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.8 calOtherCalAdrURIs
+attributetype ( 1.2.840.113556.1.4.485
+	NAME 'calOtherCalAdrURIs'
+	DESC 'URIs of destinations for event requests to non-default calendars'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.3.1 calEntry
+objectclass ( 1.2.840.113556.1.5.87
+	NAME 'calEntry'
+	DESC 'Calendering and free/busy information'
+	SUP top AUXILIARY
+	MAY ( calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
+		calOtherCAPURIs $ calOtherCalURIs $ calOtherFBURLs $ 
+		calOtherCalAdrURIs ) )
+
+# EOF
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
new file mode 100644
index 000000000000..5c891ea46d4d
--- /dev/null
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="api-doc-extras">Build documentation for private APIs</flag>
+		<flag name="berkdb"><pkg>sys-libs/db</pkg> support needed to migrate old (pre-3.12 evolution versions) addressbook data</flag>
+		<flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> based Google authentication support</flag>
+		<flag name="google">Enable internal Google authentication support. If gnome-online-accounts is enabled and used, this is not necessary,
+			but both can be supported at the same time with different setup at runtime</flag>
+		<flag name="weather">Enable optional weather calendar support</flag>
+	</use>
+</pkgmetadata>
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
new file mode 100644
index 000000000000..625dd3f971dd
--- /dev/null
+++ b/gnome-extra/evolution-ews/Manifest
@@ -0,0 +1,7 @@
+DIST evolution-ews-3.22.6.tar.xz 715320 SHA256 eddc94d9a7f759a20dc35a8635318a425f8687bb3af5b72b94c996101c8fb0e5 SHA512 6b93faa67a6f546142b023086bf54ac34d6c7c4320ee136f58cc0ea5a018811af2080d5945c4dc68c89555a35a4194b2f92bd839b2142ae63690e94ed895b40e WHIRLPOOL b242c15acbeefc7f6010d106a7e6b9d5dd3d3bab94069cca95a2d722403dbe284ed633b818120f3a47d2d9056e2cfa160ac0984f71c24fc271debbe93aeb319d
+DIST evolution-ews-3.24.5.tar.xz 488116 SHA256 db77200f139b2e37ad7d881eedeb5a9e9c84ae5a6194fde8d4d80099559943d1 SHA512 eaa5096c09686dade6f1efddea2b706a73c292b06b473b0f2ef1ba15eb5a3d685678416a0f1de40296beaa893d5dc91b944a440440dba489df67a944342f2f17 WHIRLPOOL 1a43e9f12b596a76974a3c1755a6ee6a6e760039d636d32ec2de166e082d8fdabaae4f37919507d54ef7a9ee86c98a3876755e7a36bc446fd1fc619698642505
+EBUILD evolution-ews-3.22.6.ebuild 797 SHA256 f3381fe4c05b5ca908d54098d79c8d3e62876e565d2105c05f26aee1bc1e6f0d SHA512 0baa303346cd26bfc417cf8ee7fd2bdcaeb62980d6cda234b131b55cf7d3fb7638a9b127684bb2762453b37e1938ace02dabfa5bdb82027e99a7d8c30ceead93 WHIRLPOOL 9de297bb068c1ee44d2122d9f0744ba9b2fe60bb1a86524391b05030a1bcc0ec398eee56efcbbb90507694ab9f44bd4f9e91e1eff13a7504c16dc4aa2aeaea2f
+EBUILD evolution-ews-3.24.5.ebuild 1076 SHA256 c13faa2299dd37a2eec2b29609f3a72c4578bf04f3292edca11dbaca5a3a8b88 SHA512 9343a952f6c3d9b58a8b9bf6522107311de6c01f16715cb548cfff63d316873db07f05d1e61d4719dea6bad034b4998a8d65ed71ac1cf46a2e076d2c810c0be8 WHIRLPOOL 45af2626ed1a1ba321077a8b2249098ad632679ece854f2324a3f7c2d622b27744d144caf6bb2cfaa375cd56b2b3c94d6a74b6dbe5447ab5e4d3e43a74840075
+MISC ChangeLog 6607 SHA256 18cbf75ef8cf39b2001bb405a16d91138b164196d08e185925fbe3e7749fb644 SHA512 ad97f2be87becb097bc63326877afd717c221cb20ba6f7f1fdb1f6d2f5e831c89a96c3944a5ecae5f63a4ae14010b8a250b34f1a0ea8683d61ded1889ec6e352 WHIRLPOOL 4bdd1789502eae9aee9e16a366a47503b2a808c68771bd67d63c194f1270a7f9981b3e9b0621e88c93264bd068975a885fc779f1ce0355326cd54a83c262a01e
+MISC ChangeLog-2015 7070 SHA256 aaede0224ef76dc29d2c3d6efa03c724dcb1a5dbb46c07d7f99b07319baa67e8 SHA512 e6ea1c713a37271f280183494d60d85a9cfb837b05c13e08795a23c4fdd9a8b8a6e12c7c149724ac7b6700f9f6701cde58feef1cf48071184a1f8edb8e340494 WHIRLPOOL 2d5b08502271f1d0c103ac0fd3ab66e644ccfa7a61fac134adc89e56adec25c15f57e0cd9d020f0aa42ce0b9360494ae90196e30f2c4003e0b7c46b7fa4df825
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild
new file mode 100644
index 000000000000..27b947f59e1e
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.40:2
+	dev-libs/libical:0=
+	>=dev-libs/libmspack-0.4
+	>=dev-libs/libxml2-2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test tests)
+}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild
new file mode 100644
index 000000000000..87e553e77c4e
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit cmake-utils gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.46:2
+	dev-libs/libical:0=
+	>=dev-libs/libmspack-0.4
+	>=dev-libs/libxml2-2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/gnome-extra/evolution-ews/metadata.xml b/gnome-extra/evolution-ews/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/evolution-ews/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
new file mode 100644
index 000000000000..b20e0c1eb0e7
--- /dev/null
+++ b/gnome-extra/gconf-editor/Manifest
@@ -0,0 +1,7 @@
+AUX gconf-editor-3.0.1-assertion-crash.patch 1194 SHA256 395e2cee14e0246c0da88c19fc0dcf4a0684c519905be34dbcebb97c3fb577ef SHA512 5fbe8a51d4f678f7444cfd8683ce171280031c8870a18efea709a5f0667f7701893f6d0d65df72cc6267b01f7a34c925529c5b814ab47a9a270568b3391b6bfc WHIRLPOOL c00a21a4d5af2703a681b2d61223ca64499b8c30e24c43e24cb13e08138bdbc3c0dac73e083863886475b2f775b294e14138f4b1e35d3412792676e1dc7fb33c
+AUX gconf-editor-3.0.1-drop-accel.patch 1383 SHA256 c37e88038127dee1372a32b16160c5ecb0ea829293defe24c5b5859778b75b9f SHA512 c50c4fbbd25170ca7a7261f590862927e5f68eb5d1529ac5252175caa28ea916484d284e307580297f23e2ee8df7822f12e75c2912f8ab808946997d032fedff WHIRLPOOL cb2f3fe9f0f21acf802242eb55e0d663729612707b7886c7fc8f0def102b7c61e408016112a5c64190be71fa8adf93129734434e37b9ad2b4fe3c4170aff2816
+DIST gconf-editor-3.0.1.tar.xz 1452468 SHA256 3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944 SHA512 faaf237233d94730902d7c8e231545841862451f5998ef06bc3d51f6cdf0bc16bd1cecfc6b6a9e0ccc5197a06bb4f89068bfb478f900f3272ba03a2d94ec2f49 WHIRLPOOL 991a5b7d6b02b3472a9207bb5750d18552ba5da15570f7f884950b838177431a42b1ebb0131bbf3f76abe8f6098a2af88e542ec88d22135f9c8684da0543703f
+EBUILD gconf-editor-3.0.1-r1.ebuild 801 SHA256 65c49ba3078b66adbc3cc72d7ebfedafaac7050f423eadd2318ff417c42f4f63 SHA512 97ebb68c595795556438669de55ab6807d0004658bdca72448075c434d0ef6984c0259fc756da84edd13e96ea75a591c182c3684081d8b4c2c858d17f21d4616 WHIRLPOOL bb5c4481135fc85cf08e9dd3e880357f2bdf3462e54e478386cda3a77bebe2c65fddd191b5c47f9afacca0f532cd64760d737c6fecd068ba29d4ddaa622002d5
+MISC ChangeLog 2695 SHA256 9c0496d29c0ee92b7be619171c9871fecef3326a8d0b00c53811619ec670caf5 SHA512 7ec677ef291aa5d00ac68e33527b46c915ef4983931c79aaccdd2c2f802317809894d53046c7a4e6b93013954dae96fb712470e82f23d2e192d73c2816f37749 WHIRLPOOL e6f07ea395d590cc689ef5841b5930a39ad8f82cfdb1e38a7c2dfb8263dab413edf1db599b04ba37abe911bd52262f8186d4941aee6df24b2f27550c2364ac5d
+MISC ChangeLog-2015 22747 SHA256 e3781859973a9aea599762507cab88cf5e8a13dad1b2cdd1d93d36fc51cda901 SHA512 fad760ffc8c3a0816c97b70bf7046d5b01bc8ac3c55a57ad803c45fa4697ab3f19a472dd6f2cce37c9f47abb3295539c919e43fd0471ff3423a1a565f4eebfdd WHIRLPOOL b7af497154d3a16b96f301c9de76b725d657632ba96f982045d399d39e2a78b547923922d97b8be66b4f4fff7be96f28baf2bd35b8eacc44f8e77a0031c1e391
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
new file mode 100644
index 000000000000..b7df8f51007d
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
@@ -0,0 +1,34 @@
+From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001
+From: Edward Sheldrake <ejsheldrake@gmail.com>
+Date: Wed, 11 Apr 2012 07:27:16 +0000
+Subject: Fix assertion failed crash
+
+Fix "assertion failed: (last_slash != NULL)" crash while navigating the
+left tree view, fixed by having the model for the right list view emit
+all the row deleted signals before deleting any of its data.
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=670586
+---
+diff --git a/src/gconf-list-model.c b/src/gconf-list-model.c
+index 27e1af6..4fc60f8 100644
+--- a/src/gconf-list-model.c
++++ b/src/gconf-list-model.c
+@@ -133,11 +133,14 @@ gconf_list_model_set_root_path (GConfListModel *model, const gchar *root_path)
+ 
+ 	if (model->root_path != NULL) {
+ 		for (list = model->values; list; list = list->next) {
++			model->stamp++;
++			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
++		}
++
++		for (list = model->values; list; list = list->next) {
+ 			GConfEntry *entry = list->data;
+ 
+ 			g_hash_table_remove (model->key_hash, gconf_entry_get_key (entry));
+-			model->stamp++;
+-			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
+ 
+ 			gconf_entry_unref (entry);
+ 		}
+--
+cgit v0.9.2
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
new file mode 100644
index 000000000000..0d79ec56c396
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
@@ -0,0 +1,66 @@
+From 62e68d8e2f6e2c473820113fbf46ced9f77111d4 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann@redhat.com>
+Date: Thu, 03 May 2012 18:10:53 +0000
+Subject: Drop use GTK accel maps
+
+They are confusing, weird, and stored in an obsolete location.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675392
+---
+diff --git a/src/main.c b/src/main.c
+index 8da5ccc..9bce4b8 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -26,34 +26,6 @@
+ #include "gconf-stock-icons.h"
+ #include "gconf-editor-window.h"
+ 
+-static char *
+-build_accel_filename (void)
+-{
+-	return g_build_filename (g_get_home_dir (), ".gnome2", "accels", PACKAGE, NULL);
+-}
+-
+-static void
+-load_accel_map (void)
+-{
+-	char *map;
+-
+-	map = build_accel_filename ();
+-	gtk_accel_map_load (map);
+-
+-	g_free (map);
+-}
+-
+-static void
+-save_accel_map (void)
+-{
+-	char *map;
+-
+-	map = build_accel_filename ();
+-	gtk_accel_map_save (map);
+-
+-	g_free (map);
+-}
+-
+ gint
+ main (gint argc, gchar **argv)
+ {
+@@ -92,7 +64,6 @@ main (gint argc, gchar **argv)
+ 	/* Register our stock icons */
+         gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ICONDIR);
+ 	gconf_stock_icons_register ();
+-	load_accel_map ();
+ 
+         gtk_window_set_default_icon_name ("gconf-editor");
+ 
+@@ -107,7 +78,6 @@ main (gint argc, gchar **argv)
+ 	
+ 	gtk_main ();
+ 
+-	save_accel_map ();
+ 	g_strfreev (remaining_args);
+ 
+ 	return 0;
+--
+cgit v0.9.2
diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..46fca22ad7ea
--- /dev/null
+++ b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="An editor to the GNOME config system"
+HOMEPAGE="https://git.gnome.org/browse/gconf-editor"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/gtk+-3.0.0:3
+	>=gnome-base/gconf-2.12:2
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	~app-text/docbook-xml-dtd-4.1.2
+"
+# gnome-common for eautoreconf
+
+PATCHES=(
+	# Fix assertion failed crash (from 'master')
+	"${FILESDIR}/${PN}-3.0.1-assertion-crash.patch"
+
+	# Drop use GTK accel maps (from 'master')
+	"${FILESDIR}/${PN}-3.0.1-drop-accel.patch"
+)
diff --git a/gnome-extra/gconf-editor/metadata.xml b/gnome-extra/gconf-editor/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gconf-editor/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-activity-journal/Manifest b/gnome-extra/gnome-activity-journal/Manifest
new file mode 100644
index 000000000000..a512a434a5f3
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/Manifest
@@ -0,0 +1,7 @@
+AUX gnome-activity-journal-0.8.0-zg-0.9.patch 506 SHA256 d4432ef650e8155c8534482d5b836e877f48bd026c933dc523838db6cb072c44 SHA512 df1e81dacfe6579136be4ace206ba50badcc3ac5fae1c6b3c5ee12d943e8221113c989b4a6755d049e9c5b062c3b917531af887c8c215294d86cb3349e554492 WHIRLPOOL c5da0ffc3b98f2e78005ebc65611fed3c3bb35256aecf453efdbc90e0c97f92278f38a2ac42093682d5adc996c98b4f9cadd80860c7887f2076ab5f5873f08e7
+DIST gnome-activity-journal-0.8.0.tar.gz 334159 SHA256 c1be611ecfc433df038c71857c7ca80cc0f40c8943cfb6a7be91ef0022cd4f7e SHA512 5d92bb032328c9eb7c230015675c379b9cb9f3c31362128b8b25ede070df11120beadbf1766ba5d250006f1da523fc8a45f760119706a977de6e0124321375a7 WHIRLPOOL 30578bd247822c02e9459e9b7c2beb6a497a47b23d9dc5dc8876829110828d164f5d30203429cbc8ac22ab1246cc8340410d9ae13e0ce300eda6551a3460924b
+EBUILD gnome-activity-journal-0.8.0-r4.ebuild 1132 SHA256 e7bf91790e57b4e2972a1faeea8892f76a5f68114471275059ffd9357981a937 SHA512 3694c0737549064d4a33ac528aae058a8f1728b4670f98488bcd5d06ba8eea3160dcb0fa06a0c968498ee738a6b714b8a3ad2828e1a2f335cbe11f2c64da65f7 WHIRLPOOL 5fb1f752204a1a80608fe26c1835c1f8e6043ba356a6c9a351591578ada1b75bdec6812e29a4d0f7f29a855eca4f34801f418dafa8f428f5b078c6ab7586e012
+EBUILD gnome-activity-journal-0.8.0-r5.ebuild 1126 SHA256 0a260fa1686380956aafa853de791951e3d0f4548d80287749e4f7bcd6e462b9 SHA512 7a0521ef15628cc6daa88aa0cf84ce8deea1bf7a8c489e7c275e58d9d17f25addf6e8d9a40730f9869a942687941f378c2551baeba3e32b8a271dac7bc7dd605 WHIRLPOOL 1e3eeac13020f758ce33cc3df0befee86e83caed6193f7c4358feefc30433af4602b1c09520f3045912aec34b844e089305a3455713f8e908488abb2180672a4
+MISC ChangeLog 3001 SHA256 29d7da1f195e116f08e050e96c6b78f44804416d4b09818c7a827c5d68cc658a SHA512 f11d0bbc5bd684dd2b0c40a07e19ec57f14c195fa525fdbe1b837e5f89da83a780b8e4cdc31f06381ed794b2f8df22934293dcf5c176b78c2f9f7b1276856f71 WHIRLPOOL 5cd76b5ca0a3252cda2e10f2879b28f8d8225e3369ccd9c33661d9149127637c0b9601fd7b83024823c811f2efb75605dd9175f28cca360398bacc47ba461722
+MISC ChangeLog-2015 3097 SHA256 478841f4e7f476556558a02e3d8c05ba32010cc85a58a39a2dc769a0d86cea0d SHA512 5e013e6f714e37dab11763c655f896e53c35a158f2b1a6a5accb3c57b6c671b6a7b686f8f87c1118a394f50da71d0d893d780279f1d6285bf9b2e16720db80a4 WHIRLPOOL b7710dfca63baf4cf4dcfa5aa97c47625c889a7fb39613d95c4f1c8cbdce03b0f8a9895ecdb093fd1d6229f6bae5a34060279a2960bdee74839a38c9532a8a3b
+MISC metadata.xml 353 SHA256 73eca3b1f560cc2654b918bf14f538b7a76da85f5a3a64489b959eb0571d26e6 SHA512 9a3fed98b030dabc2f4abb6496ca80c44aaddcb9017d5f10328890757969b5fa73c0e17e31368bb5cb384e41ea830fb5d1eab705b3d90e89a292cf71a6e871dd WHIRLPOOL 7d662a6029a025fd6bc98a5e8e880b3d5cf9a54e71d2de19e54f090ed735e1340b9716ea3ab355d237d7d076033cfcfea19e88c5528b7efed83bfb369d0f4477
diff --git a/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch b/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch
new file mode 100644
index 000000000000..73e87e0b0713
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch
@@ -0,0 +1,15 @@
+--- a/src/external.py
++++ b/src/external.py
+@@ -41,7 +41,11 @@
+     _restarted = False
+ 
+     def __init__(self):
+-        self._extension = CLIENT._iface.get_extension("Log", "journal/activity")
++        if CLIENT.get_version() >= [0, 8, 99]:
++            self._extension = CLIENT._iface.get_extension("Histogram", "journal/activity")
++        else:
++            self._extension = CLIENT._iface.get_extension("Log", "journal/activity")
++
+ 
+     def _show_error(self):
+         dialog = gtk.MessageDialog(
diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild
new file mode 100644
index 000000000000..ddad2fd9208e
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit eutils gnome2 distutils-r1 gnome2-utils versionator
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Tool for easily browsing and finding files on your computer"
+HOMEPAGE="https://launchpad.net/gnome-activity-journal/"
+SRC_URI="https://launchpad.net/gnome-activity-journal/${DIR_PV}/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3 LGPL-3"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/dbus-python
+	dev-python/libgnome-python
+	dev-python/gconf-python
+	dev-python/gst-python:0.10
+	dev-python/pycairo
+	dev-python/pygobject:2
+	dev-python/pygtk:2
+	dev-python/pyxdg
+	gnome-extra/zeitgeist
+	sys-apps/dbus"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-python/python-distutils-extra"
+
+PATCHES=( "${FILESDIR}"/${P}-zg-0.9.patch )
+
+src_configure() {
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	python_replicate_script "${ED}"/usr/bin/${PN}
+}
diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild
new file mode 100644
index 000000000000..a06e51dc4aa2
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=true
+DISTUTILS_SINGLE_IMPL=true
+
+inherit eutils gnome2 distutils-r1 versionator
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Tool for easily browsing and finding files on your computer"
+HOMEPAGE="https://launchpad.net/gnome-activity-journal/"
+SRC_URI="https://launchpad.net/gnome-activity-journal/${DIR_PV}/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3 LGPL-3"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/dbus-python
+	dev-python/libgnome-python
+	dev-python/gconf-python
+	dev-python/gst-python:0.10
+	dev-python/pycairo
+	dev-python/pygobject:2
+	dev-python/pygtk:2
+	dev-python/pyxdg
+	gnome-extra/zeitgeist
+	sys-apps/dbus"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-python/python-distutils-extra"
+
+PATCHES=( "${FILESDIR}"/${P}-zg-0.9.patch )
+
+src_configure() {
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/gnome-extra/gnome-activity-journal/metadata.xml b/gnome-extra/gnome-activity-journal/metadata.xml
new file mode 100644
index 000000000000..c15f403d0324
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">gnome-activity-journal</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
new file mode 100644
index 000000000000..1c30e56b6067
--- /dev/null
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-boxes-3.22.4.tar.xz 1704964 SHA256 585a1c292010ebb479cb60e02621d01d450f84cdad82a61b7ce58a0218e1cff2 SHA512 98e923c67d116ad5411734415b96ced5cd5f9f2a03335c8b00835a2eae47ea46dfe72f0aa5819d6ac9310cb80b5c6504a9ef7c8e4d8ef4c35495aa8fa74ee848 WHIRLPOOL c2fe23ae0a9b0051c7b117ed6b3965961d4de35e7c251f25a3b37e62e8ef4d9a5278817028598d9cd5ebb06d9218534426c3b4e74efda9f6226b44e1efb1cebc
+DIST gnome-boxes-3.24.0.tar.xz 1710652 SHA256 7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49 SHA512 979d5c0f2cef052e2713508fc2fd46d64a3a325edd38dd0aa99f2e9700efd3f84916847b35487f9d7eb5e5e1c5f3b4b712b649fecf1523821c3488fa6b250026 WHIRLPOOL ca44d83ad85326293b14c9197c04b09966e1a917a24011df0f10f624412261f4799b9ef371beb81bc0258ff1d79f8707ab6c03c0558b7b3d0c79d13bfddbba90
+EBUILD gnome-boxes-3.22.4.ebuild 2651 SHA256 75193f82c775d98c43ead7ba5099fd1d41e630d589efd4999db73c2137969be8 SHA512 81a9fa766fd43e1888a013164f25a7135a3c25bad562b97afbfd7e6f466a0c08aeec3696e979116b4850c5c3e2e660fda82802b56908a8a238c1c38b7c6bd00c WHIRLPOOL 17c2f1a774665f0616f812872eb0a8b7b48671e3117e37ef721feccca20dbc3da1ca5f8e2202c5be6837da5421b05cba5dec1d3f705193eb07928fbe433c94c2
+EBUILD gnome-boxes-3.24.0.ebuild 2652 SHA256 604906be080cc7f80b83739da2c3d7f5ecc4ce74340626612112b0c00cef5320 SHA512 149578431ae88226e2188a1c314a58960c912c5915b7980c5071c4d2e9340e9d90729b20b4b9fc648f3da2c3502a925534dcc8b701d7503cbc81540a7b0f571d WHIRLPOOL 608f0c6e53fd069280fe3951adcd6b31756a613306f622a5bd86a7bf3103c762abfadffb6bae1bf6bbe02e2f1958ed294e7e1bb2a76a95a76a9c1debcb6794f7
+MISC ChangeLog 4945 SHA256 cb33ed42e1d8edd11772f4f2e8a84db562725f2bd8c4e9fb77ed9712e905c3fe SHA512 920b24f5af5dd1a5f8927b137e0fd02f6fd5db9911ce4230993caad6ad722ed961cb6dee827a1170257f4a0aa054c8601c398078b1daaf201da194d7986d8b57 WHIRLPOOL 65a8e7125072edccf978f43726f44600c53cf0794b148eb71701966f9006d93f83e40032eb646771ffecf4e3addfcceea98fa7f62f2b1cc355c8d0128f0fa06d
+MISC ChangeLog-2015 2244 SHA256 afcf66eb0cf66354c9e427417fbf8343d2a86bae8d6343e79f96d79c3a968f92 SHA512 08b8195bbf10a25bfae579ab11306a729467aae00a5f1376c9424d980623d6099492a2fd63353318efd7de43c384f336edd0ea4a73e704fd7e0c5b8dda733431 WHIRLPOOL 92fcff909fda60f37ac7277b8d12b8d597caebb76dea57ce9edcef3b8da0866212c0f303d6387a1b78b8c682d084328be25f36d44ef563adc0a3506777c1da94
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild
new file mode 100644
index 000000000000..feba37477a4b
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 linux-info readme.gentoo-r1 vala
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2"
+SLOT="0"
+
+# We force 'bindist' due to licenses from gnome-boxes-nonfree
+IUSE="" #bindist
+
+KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only
+
+# NOTE: sys-fs/* stuff is called via exec()
+# FIXME: ovirt is not available in tree
+# FIXME: use vala.eclass but only because of libgd not being able
+#        to use its pre-generated files so do not copy all the
+#        vala deps like live ebuild has.
+# FIXME: qemu probably needs to depend on spice[smartcard]
+#        directly with USE=spice
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-0.9.6:=
+	>=dev-libs/libxml2-2.7.8:2
+	>=sys-libs/libosinfo-0.2.12
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/libvirt-glib-0.2.3
+	>=x11-libs/gtk+-3.19.4:3
+	>=net-libs/gtk-vnc-0.4.4[gtk3]
+	app-crypt/libsecret
+	app-emulation/spice[smartcard]
+	>=net-misc/spice-gtk-0.27[gtk3,smartcard,usbredir]
+	virtual/libusb:1
+
+	>=app-misc/tracker-0.16:0=[iso]
+
+	>=sys-apps/util-linux-2.20
+	>=net-libs/libsoup-2.38:2.4
+
+	sys-fs/mtools
+	>=virtual/libgudev-165:=
+"
+#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
+
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Do not change CFLAGS, wondering about VALA ones but appears to be
+	# needed as noted in configure comments below
+	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# debug needed for splitdebug proper behavior (cardoe), bug #????
+	gnome2_src_configure \
+		--enable-debug \
+		--disable-strict-cc \
+		--disable-ovirt
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.24.0.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.24.0.ebuild
new file mode 100644
index 000000000000..a945e1f416a6
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.24.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 linux-info readme.gentoo-r1 vala
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2"
+SLOT="0"
+
+# We force 'bindist' due to licenses from gnome-boxes-nonfree
+IUSE="" #bindist
+
+KEYWORDS="~amd64" # qemu-kvm[spice] is 64bit-only
+
+# NOTE: sys-fs/* stuff is called via exec()
+# FIXME: ovirt is not available in tree
+# FIXME: use vala.eclass but only because of libgd not being able
+#        to use its pre-generated files so do not copy all the
+#        vala deps like live ebuild has.
+# FIXME: qemu probably needs to depend on spice[smartcard]
+#        directly with USE=spice
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-0.9.6:=
+	>=dev-libs/libxml2-2.7.8:2
+	>=sys-libs/libosinfo-0.2.12
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/libvirt-glib-0.2.3
+	>=x11-libs/gtk+-3.19.8:3
+	>=net-libs/gtk-vnc-0.4.4[gtk3]
+	app-crypt/libsecret
+	app-emulation/spice[smartcard]
+	>=net-misc/spice-gtk-0.32[gtk3,smartcard,usbredir]
+	virtual/libusb:1
+
+	>=app-misc/tracker-0.16:0=[iso]
+
+	>=sys-apps/util-linux-2.20
+	>=net-libs/libsoup-2.38:2.4
+
+	sys-fs/mtools
+	>=virtual/libgudev-165:=
+"
+#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
+
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Do not change CFLAGS, wondering about VALA ones but appears to be
+	# needed as noted in configure comments below
+	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# debug needed for splitdebug proper behavior (cardoe), bug #????
+	gnome2_src_configure \
+		--enable-debug \
+		--disable-strict-cc \
+		--disable-ovirt
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-boxes/metadata.xml b/gnome-extra/gnome-boxes/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/gnome-extra/gnome-boxes/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 type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-builder/Manifest b/gnome-extra/gnome-builder/Manifest
new file mode 100644
index 000000000000..baad3cabc60f
--- /dev/null
+++ b/gnome-extra/gnome-builder/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-builder-3.22.4.tar.xz 2480900 SHA256 d569446a83ab88872c265f238f8f42b5928a6b3eebb22fd1db3dbc0dd9128795 SHA512 69ee0d22f7e60f1bc236f2648662ece38f2a3c827d6877f8cbee82eadd499c19de8e4f6f94d7ad8832a93d26cddb5d34106ec6a9e878a7abea3350929d50711d WHIRLPOOL 9dd3f91d6f66a30e9ff6b415683f9a024d38f4af53029bb9fb4e5b3bf73f06c303516b4958585d7743ffb62cbb468da76b2a9c996ee460539762fada4c11a4da
+DIST gnome-builder-3.24.2.tar.xz 4342908 SHA256 84843a9f4af2e1ee1ebfac44441a2affa2d409df9066e7d11bf1d232ae0c535a SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf WHIRLPOOL 1be12b2ab58286eb1273881700eccf5a0f759e1bd80f8799481c8444229fb1e9a98162ff837c8102879c7ea3ac04994747169af7446fa7514641aea9d1cf0fa0
+EBUILD gnome-builder-3.22.4.ebuild 5156 SHA256 32017d0e217a714de0b13b4b98f66f8aaaba39f55292522c73be1059f1b02b1a SHA512 c3a63df2d162b05f795b83acad7a248c2413620ab3bc39059036d4753149f6518e62f31c95a6dcb96fadb66f2d5a962ca066f20a861d4633dc2ac5d6b901fc08 WHIRLPOOL d32690711a182c522822a09ba1880d05c159952a4c75de86a2a9c2867f85e23959b859ef2102846f6111e18eba49fa5fc1defc6b4623cc154dae08cb9218bb32
+EBUILD gnome-builder-3.24.2.ebuild 5118 SHA256 129c0fa5edcbe750ded8a98dadd4fb860f16d7c4622e4a1074071a9523d5144c SHA512 346de3175a6f25497274372544a662e031e99a2b0e55226a8ab602ec7a429a81dc28af2b6eed0a4db466a7f4114cd132fd79d17ec36da3869be9f2270b967718 WHIRLPOOL 4a2cda368ad96a507e17ee6e946a46866df05777b421ca9f0407fff806a82979227c95156a12b110a10457594db053d685e0aee159f46ef89925558f9289ef04
+MISC ChangeLog 4644 SHA256 51aa1030da258e22b6c29579618251fc2327a550097e709c17a7b28500b011ae SHA512 4dcdc540a1dad4fad6d92bd7a3e3d2637f3ebf37723f209069dcc8269a43156369ebd1f8a28d3d0f262ab22f9113fbb039a9059afc49f8b05969a7e73121b178 WHIRLPOOL 0448c7ffb183ea23e1fdf6bb448c3b6f7292115cec364f62ecacf9422531750010139c467e490e21fe62277af246578c5ca4a5d60b7d29151d9ce62c4eebc2a0
+MISC ChangeLog-2015 411 SHA256 bf3dd003c68d59dc4dfe33515663a84a473daed34c55e5663fc68d56783236f0 SHA512 2294827a28a1428da2a30745f2c7d94685c3fe0ec2cd2012c3c13d0b297f0e51b3a911807d646fe0e9efedb699ffb96a9935afbaf1e83ce3bcb0d94311bfff29 WHIRLPOOL bf86082594e0733da566ab13eb7ce1422b86c0114f4d22f4a206bdd3d98e8bad76d13650cedf391fa3b2802a4d343e7fddf3599314387836c6f1ea1a9ca44fdd
+MISC metadata.xml 1011 SHA256 59028d6d9b5fa46032029f75161cee29b56291b40a6f6e9c54bba5b18365a226 SHA512 b3519707a4023a6c9892827abaf6465e28dbad2f1a8c2760a3f2d9b34d4be384d10326870e0d7952b41cb725c955cc838092786543ff1867db4a3acf41cb404a WHIRLPOOL 1b3b5dde7b6f1046a5c631fc1f6c0179e1af1b2d6f7e7bb9bbdc92b5dd3b8147de29f6528334aacb4d2bad93f99307d1814877b66891753cdab6dbd40ffd84a1
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild
new file mode 100644
index 000000000000..063b139c3079
--- /dev/null
+++ b/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_MIN_API_VERSION="0.30"
+VALA_USE_DEPEND="vapigen"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome2 python-single-r1 vala virtualx readme.gentoo-r1
+
+DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="clang +git sysprof vala webkit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/configure.ac files and the requirements within.
+# Most have no extra requirements and default to enabled; we need to handle the ones with extra requirements, which tend to default to auto(magic).
+# Look at the last (fourth) argument given to AC_ARG_ENABLE to decide. We don't support any disabling of those that are default-enabled and have no extra deps beyond C/python/introspection.
+# FIXME: >=dev-util/devhelp-3.20.0 dependency is automagic for devhelp integration plugin
+# FIXME: vte could be optional via $(use_enable vte terminal-plugin) - but most/all people want this and have vte?
+# FIXME: flatpak-plugin needs flatpak.pc >=0.6.9, libgit2[threads] >=libgit2-glib-0.24.0[ssh] libsoup-2.4.pc
+# FIXME: --with-sanitizer configure option
+# FIXME: Enable rdtscp based high performance counter usage on suitable architectures for EGG_COUNTER?
+# Editorconfig needs pcre.h, with vte migrating away, might want it optional?
+# Python is always enabled - the core python plugin support checks are automagic and not worth crippling it by not supporting python plugins
+# Relatedly introspection is always required to not have broken python using plugins or have to enable/disable them based on it. This is a full IDE, not a place to be really minimal.
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it. Last full check at 3.22.4
+RDEPEND="
+	>=x11-libs/gtk+-3.22.1:3[introspection]
+	>=dev-libs/glib-2.50.0:2[dbus]
+	>=x11-libs/gtksourceview-3.22.0:3.0[introspection]
+	>=dev-libs/gobject-introspection-1.48.0:=
+	>=dev-python/pygobject-3.22.0:3
+	>=dev-libs/libxml2-2.9
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.18.0[python,${PYTHON_USEDEP}]
+	>=dev-libs/json-glib-1.2.0
+	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
+	clang? ( sys-devel/clang:= )
+	git? (
+		dev-libs/libgit2[ssh,threads]
+		>=dev-libs/libgit2-glib-0.24.0[ssh] )
+	>=x11-libs/vte-0.46:2.91
+	sysprof? ( >=dev-util/sysprof-3.22.2[gtk] )
+	dev-libs/libpcre:3
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+"
+# desktop-file-utils for desktop-file-validate check in configure for 3.22.4
+# mm-common due to not fully clean --disable-idemm behaviour, recheck on bump
+DEPEND="${RDEPEND}
+	dev-cpp/mm-common
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	>=dev-util/gtk-doc-am-1.11
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	!<sys-apps/sandbox-2.10-r3
+"
+
+# Tests fail if all plugins aren't enabled (webkit, clang, devhelp, perhaps more)
+RESTRICT="test"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# jhbuild support
+# rust language server via rls
+# autotools stuff for autotools plugin
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	export PYTHON3_CONFIG="$(python_get_PYTHON_CONFIG)"
+	# idemm is C++ wrapper for libide. Once that's needed by something, we might want to
+	# consider a split package instead of USE flag. Deps are in libidemm/configure.ac
+	gnome2_src_configure \
+		--disable-idemm \
+		--enable-editorconfig \
+		--enable-introspection \
+		$(use_enable vala vala-pack-plugin) \
+		$(use_enable webkit) \
+		$(use_enable webkit html-preview-plugin) \
+		$(use_enable clang clang-plugin) \
+		$(use_enable git git-plugin) \
+		$(use_enable git contributing-plugin) \
+		$(use_enable sysprof sysprof-plugin) \
+		--disable-flatpak-plugin \
+		--enable-terminal-plugin \
+		--disable-static
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" virtx emake check
+}
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.24.2.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.24.2.ebuild
new file mode 100644
index 000000000000..13a5b0fc43a6
--- /dev/null
+++ b/gnome-extra/gnome-builder/gnome-builder-3.24.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5} )
+VALA_MIN_API_VERSION="0.30"
+VALA_USE_DEPEND="vapigen"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome2 python-single-r1 vala virtualx readme.gentoo-r1
+
+DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +git sysprof vala webkit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/configure.ac files and the requirements within.
+# Most have no extra requirements and default to enabled; we need to handle the ones with extra requirements, which tend to default to auto(magic).
+# Look at the last (fourth) argument given to AC_ARG_ENABLE to decide. We don't support any disabling of those that are default-enabled and have no extra deps beyond C/python/introspection.
+# FIXME: >=dev-util/devhelp-3.20.0 dependency is automagic for devhelp integration plugin
+# FIXME: vte could be optional via $(use_enable vte terminal-plugin) - but most/all people want this and have vte?
+# FIXME: flatpak-plugin needs flatpak.pc >=0.6.9, libgit2[threads] >=libgit2-glib-0.24.0[ssh] libsoup-2.4.pc
+# FIXME: --with-sanitizer configure option
+# FIXME: Enable rdtscp based high performance counter usage on suitable architectures for EGG_COUNTER?
+# Editorconfig needs pcre.h, with vte migrating away, might want it optional?
+# Python is always enabled - the core python plugin support checks are automagic and not worth crippling it by not supporting python plugins
+# Relatedly introspection is always required to not have broken python using plugins or have to enable/disable them based on it. This is a full IDE, not a place to be really minimal.
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it. Last full check at 3.22.4
+RDEPEND="
+	>=x11-libs/gtk+-3.22.1:3[introspection]
+	>=dev-libs/glib-2.50.0:2[dbus]
+	>=x11-libs/gtksourceview-3.22.0:3.0[introspection]
+	>=dev-libs/gobject-introspection-1.48.0:=
+	>=dev-python/pygobject-3.22.0:3
+	>=dev-libs/libxml2-2.9.0
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.18.0[python,${PYTHON_USEDEP}]
+	>=dev-libs/json-glib-1.2.0
+	>=app-text/gspell-1.2.0
+	>=app-text/enchant-1.6.0
+	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
+	clang? ( sys-devel/clang:= )
+	git? (
+		dev-libs/libgit2[ssh,threads]
+		>=dev-libs/libgit2-glib-0.25.0[ssh] )
+	>=x11-libs/vte-0.46:2.91
+	sysprof? ( >=dev-util/sysprof-3.23.91[gtk] )
+	dev-libs/libpcre:3
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+"
+# desktop-file-utils for desktop-file-validate check in configure for 3.22.4
+# mm-common due to not fully clean --disable-idemm behaviour, recheck on bump
+DEPEND="${RDEPEND}
+	dev-cpp/mm-common
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	!<sys-apps/sandbox-2.10-r3
+"
+
+# Tests fail if all plugins aren't enabled (webkit, clang, devhelp, perhaps more)
+RESTRICT="test"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files
+# jhbuild support
+# rust language server via rls
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# mono/PHPize stuff
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-channel=distro \
+		--enable-editorconfig \
+		--enable-introspection \
+		$(use_enable vala vala-pack-plugin) \
+		$(use_enable webkit) \
+		$(use_enable webkit html-preview-plugin) \
+		$(use_enable clang clang-plugin) \
+		$(use_enable git git-plugin) \
+		$(use_enable sysprof sysprof-plugin) \
+		--disable-flatpak-plugin \
+		--enable-terminal-plugin \
+		--enable-gettext-plugin \
+		--disable-static
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" virtx emake check
+}
diff --git a/gnome-extra/gnome-builder/metadata.xml b/gnome-extra/gnome-builder/metadata.xml
new file mode 100644
index 000000000000..78c212429a5c
--- /dev/null
+++ b/gnome-extra/gnome-builder/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="clang">Provide integration with <pkg>sys-devel/clang</pkg> for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support</flag>
+	<flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg>
+		(such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag>
+	<flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag>
+	<flag name="vala">Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala</flag>
+	<flag name="webkit">Enable <pkg>net-libs/webkit-gtk</pkg> using plugins support and the HTML/Markdown previewer plugin</flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
new file mode 100644
index 000000000000..a63747d3efea
--- /dev/null
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-calculator-3.22.3.tar.xz 1324432 SHA256 8dba14b449a6a141aaf86b2ce8d8722bd03b3c398892ba583127d2a2995e52ca SHA512 e11731a3b0d16067e98d7f5d6657c879dde22563c4ac7cf8e4323c6d959f7b4e95e1d28cb2c937b1bbc72256fa1e6e2cf3a1bdc77f72f38766605e482b63ce78 WHIRLPOOL 30f1f48dd92081044cc7f5126873535807a0f4925ba1ddbbc34d08324c5bb0ed808cc356c837b1c1e84c8fd0dfa3226150203dd47b72850fc6d6b71fc4fca6bd
+DIST gnome-calculator-3.24.0.tar.xz 1358368 SHA256 44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10 SHA512 55968f3a307748050089652394a3652b8e199be9abf87d43e732874526dc2f08c4521e302a69afd2c09705ffa67a890fc2217503dd31ef51959df9189364c22f WHIRLPOOL 2f089fcf9fa266da39d5828608315124d02e0154b221d5e02e122ffd9d5c8c8c61ccebbf3e691f9075f9fb822ab0ab31e519a90f89de819c5ffdacf70726595e
+EBUILD gnome-calculator-3.22.3.ebuild 817 SHA256 182c89f48e363f5d3e0f956fbb9b4e575323e9f8b93650f871af77b32de57c8c SHA512 2219acb5b62e3b8eb2b263cde34a008053997da93cb02d40833555d3e635d4f3146c31961c301ed88ae88bcb3eab087c28ec5173f82430dc76f1c59b2f0a8959 WHIRLPOOL 109ea91a9a1d2377a8dce4e92bd875fb7d6b56ad63cdbc712ebd8aac75105151caf1e0b5356ba1c80d0eee4496d2874966c8ed8519d355dc6ef07f3d2512202e
+EBUILD gnome-calculator-3.24.0.ebuild 833 SHA256 e9fcd3df861ba39226de910cf5cbf1c45b47e33df62feeed7ddf3ff26acdea2b SHA512 e7dd12fc4ea4c6daeb4231a69a38d627145fd41f5a83a93a2e0c71a44e70c744d8e01cce2d970212a08d7aabb06deb4048209506a84ef567be59f775d8fd27ff WHIRLPOOL da4a5ed1a4e868d9703877f756b85f3a5bf8fd8a13d67f6558aad674a6afd00877690973a4b614e3763e890c57b2866344ca597180aeb4cf101b7c739a99ab13
+MISC ChangeLog 5871 SHA256 9d523891fec0ab3c74902832351f3a6e77205e26022a54e2e62733a53e8fc441 SHA512 d552a69f306a0adf3a7872382392b052c8032959187dc8f3e9892065afdb9d4514f5ac5fe62de7cf2cd8a5cdd9c5828a4f05dfec245773dd4b5888cef4745b85 WHIRLPOOL 111b39340860ba45d7267e1d47cdcf1b8da8564717225589348789ab5d1263c1f8e38046fbb5cd818aceb5919661542e4cbf8693fe7b85a4e6f609487249f249
+MISC ChangeLog-2015 4082 SHA256 7606bbe5f42b9cf67bcfc535793fa2c38f2b7def4a7403349c3154996b990dc9 SHA512 a2d29faf158790755488f0d6b4cce7a4938f851d495d8b5f0769dff9c3550e966981abfa300ba8c4d8b5d88a4a1ef8f357b95bc3d17510007151ea1397aeff2d WHIRLPOOL 09840d92d85718bb905cfd26fd89401c7b244fff9bcc1cb2a588dd4286ae7df7f519718f6cf260c343ad8ece01e9bf38abec0c033790b272e0a562bd0f7c145f
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild
new file mode 100644
index 000000000000..08b9733fc622
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libxml2:2
+	dev-libs/mpfr:0
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3.11.6:3
+	>=x11-libs/gtksourceview-3.15.1:3.0
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gnome-utils-2.3
+	!gnome-extra/gcalctool
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		VALAC=$(type -P true)
+}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
new file mode 100644
index 000000000000..92caa273c56a
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libxml2:2
+	dev-libs/mpfr:0
+	dev-libs/mpc
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3.19.3:3
+	>=x11-libs/gtksourceview-3.15.1:3.0
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gnome-utils-2.3
+	!gnome-extra/gcalctool
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		VALAC=$(type -P true)
+}
diff --git a/gnome-extra/gnome-calculator/metadata.xml b/gnome-extra/gnome-calculator/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-calculator/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
new file mode 100644
index 000000000000..ebbf05e56946
--- /dev/null
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -0,0 +1,8 @@
+AUX 3.24.3-week-grid-fixes.patch 4124 SHA256 85506ab76ab3a0425808e27886660d9fd8c4dabc833235f5e7719c3eb9a01fce SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0 WHIRLPOOL 90c5f4407127eaf2f8ed48de1083c5bcf1246ce2088f2966202313b568042a4128e6b4e278b5fac5d76a2ab2810152cbf7218705496b640147e1220ca67f6b07
+DIST gnome-calendar-3.22.5.tar.xz 2376792 SHA256 5c933189b842f1e836bb366f2fb9e5323961440bcc16b62dc9ac6f6eb4f5314d SHA512 113a77c64fce8317f12d1704bf4076b48abb0f42e4d6e474a7912bc948295bf71e8b9ea00e50301464fa9726cdbfe453af92a24acd3c9ac76a6f40e92062e335 WHIRLPOOL 186efae0a9059b0fa3b4728bd5026f02ac39ccf74120bb9dc1e7d174513e19ceb6e0289204af440ca74b48b3f0a156a1a4d762f80e45e096205fb75b3c920202
+DIST gnome-calendar-3.24.3.tar.xz 2425292 SHA256 3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67 WHIRLPOOL 8a807675061ecfef862d535460845fd9feae86744f18667cf54ce4721f53ed100677a66ab9bb1a8f118ab9f41504e7a3c444e65c8d88652fe96e2b954bf6110c
+EBUILD gnome-calendar-3.22.5.ebuild 748 SHA256 5efdb25b98b43761413d8a931337cd0ea65251008e8ad570b6bc6d9edbb17f94 SHA512 70cf17138a1f4d5f14076c9f330228a1f82007bfbaf121b4ccb2a6d36a3b83e257e7e9aa2f5c601e7fd11ddc05399babb5a0ee98d3bc632c08af8fd27e3db266 WHIRLPOOL 6686110c264a1e0608dd0d2f902a6c62f39a1aef40e2a941779cc8d326282182279fea67b7821a9b3a6b090f77e653b15376240551f68ed8797b10b8753a41dd
+EBUILD gnome-calendar-3.24.3.ebuild 1023 SHA256 e49a2dd73e1d40c09338c0c3c9b336fa8a5f2fb3130688360693c9767629c149 SHA512 8fdb17af92906789327928cd170acbe498d2481deeb92067d0bbc21208f7a457b4a1d759ff6c0a7f7677316a6cb8d0e2c9f852e17087f8693cbfc5a7333f5510 WHIRLPOOL bdddfac62a858256b02c52baa0759d1ac10e6e3c92c881595201555953ac0e10a857cc6d552086b2079643cd11390683c91995cf71fecf7128cf37a5b68f6328
+MISC ChangeLog 6448 SHA256 da857b593611eabe4cb115a8d5943df37a448de1ab6d2a080db2222dc1a5b41f SHA512 2e698d0b5748c21ba12dd35c5010ed01e46f222a79483e4d5ac451f3d8467d60ba1fde0a06ab9affa435459362892ab196fe564593758883d13008a39ca53a12 WHIRLPOOL fa46e3943ce8f3b69f81f16f538117e3ba1bbf7647fc8b96cae778368ba11cb718af9466286ffcbade44d13856b6aa169fc209487db6dc5368fea4a23ebcc667
+MISC ChangeLog-2015 777 SHA256 b42394c57a79a6c588331bbd9069d9b9139ee01551b5db273c9232414fc9dfd4 SHA512 99930861aad72bf6b2de5747f450c4124f363790c815d2878dea35f60a4d26b84e6ab86792a30f09b6f16f13bc8e8f8bad93ebc427c965725a6c55455200c45f WHIRLPOOL 170154908822bc70348e82941c501c6ad4cb6dbb5bf4aa66783575589d7496156865f6cb9fb2a1db760efc833efde5ed6420dae9a43dd774e4754055607269dd
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
new file mode 100644
index 000000000000..e382029ceeb1
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
@@ -0,0 +1,112 @@
+From 9f4bc90761bb9eb3b3e8bdc9ec6b42f44f02053e Mon Sep 17 00:00:00 2001
+From: Abdullahi Usman
+Date: Mon, 10 Jul 2017 11:43:36 +0100
+Subject: week-grid : seperate week's events overlaps.
+
+The week view can display mutilple events that can partly or fully span
+same time ranges.
+
+But week view fails to make correct assumption about the width of events when
+two or more events span some time ranges in which these events also span some
+time ranges with other events, and whereby the number of these other events
+that they span time ranges with does not coincide with the number of the events
+that the other event also span.  Week view ended up calculating cells that
+appears horizontally jointed up.  Also int16_compare() does not dereference the
+pointer from g_ptr_array_sort() correctly and that makes it sort events
+incorrectly and hence making events appears vertically jointed up.
+
+If an event have other events in which they span some time, we calcuate its width
+by taking into consideration of all the events that the other event may span
+time with.  The event that has the higher number of time spans is considered.
+We also save and retrieve our positions using UINT_TO_POINTER and POINTER_TO_UINT()
+respectively, and then dereference the pointer from g_ptr_array_sort() correctly.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777416
+---
+ src/views/gcal-week-grid.c | 41 +++++++++++++++++++++++++++++++++++------
+ 1 file changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
+index 20ddb48..ab125b0 100644
+--- a/src/views/gcal-week-grid.c
++++ b/src/views/gcal-week-grid.c
+@@ -184,10 +184,10 @@ get_event_range (GcalWeekGrid *self,
+ }
+ 
+ static inline gint
+-int16_compare (gconstpointer a,
+-               gconstpointer b)
++uint16_compare (gconstpointer a,
++                gconstpointer b)
+ {
+-  return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
++  return GPOINTER_TO_UINT (*(gint*)a) - GPOINTER_TO_UINT (*(gint*)b);
+ }
+ 
+ static inline guint
+@@ -204,7 +204,7 @@ get_event_index (GcalRangeTree *tree,
+   if (!array)
+     return 0;
+ 
+-  g_ptr_array_sort (array, int16_compare);
++  g_ptr_array_sort (array, uint16_compare);
+ 
+   for (i = 0; array && i < array->len; i++)
+     {
+@@ -235,6 +235,35 @@ count_overlaps_at_range (GcalRangeTree *self,
+ 
+       n_events = gcal_range_tree_count_entries_at_range (self, i, i + 1);
+ 
++      if (n_events == 0)
++        break;
++
++      counter = MAX (counter, n_events);
++    }
++
++  return counter;
++}
++
++static guint
++count_overlaps_of_event (GcalRangeTree *self,
++                         guint16        day_start,
++                         guint16        day_end,
++                         guint16        event_start,
++                         guint16        event_end)
++{
++  guint64 i, counter;
++
++  counter = count_overlaps_at_range (self, event_start, day_end);
++
++  for (i = event_start; i > day_start; i--)
++    {
++      guint n_events;
++
++      n_events = gcal_range_tree_count_entries_at_range (self, i - 1, i);
++
++      if (n_events == 0)
++        break;
++
+       counter = MAX (counter, n_events);
+     }
+ 
+@@ -652,7 +681,7 @@ gcal_week_grid_size_allocate (GtkWidget     *widget,
+           context = gtk_widget_get_style_context (event_widget);
+ 
+           /* The total number of events available in this range */
+-          events_at_range = count_overlaps_at_range (self->events, data->start, data->end);
++          events_at_range = count_overlaps_of_event (self->events, day_start, day_end, data->start, data->end);
+ 
+           /* The real horizontal position of this event */
+           widget_index = get_event_index (overlaps, data->start, data->end);
+@@ -689,7 +718,7 @@ gcal_week_grid_size_allocate (GtkWidget     *widget,
+           gcal_range_tree_add_range (overlaps,
+                                      data->start,
+                                      data->end,
+-                                     GINT_TO_POINTER (widget_index));
++                                     GUINT_TO_POINTER (widget_index));
+         }
+ 
+       g_clear_pointer (&widgets_data, g_ptr_array_unref);
+-- 
+cgit v0.12
+
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild
new file mode 100644
index 000000000000..c6ae37760e46
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.21.6:3
+	>=gnome-extra/evolution-data-server-3.17.1:=
+	>=dev-libs/libical-1.0.1:0=
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
new file mode 100644
index 000000000000..75c1537a99c7
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.21.6:3
+	>=gnome-extra/evolution-data-server-3.17.1:=
+	>=dev-libs/libical-1.0.1:0=
+	net-libs/libsoup:2.4
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
+)
+
+src_configure() {
+	# Explicit --enable-debug=minimum forces no -O and -g touching in development (odd minor) versions
+	gnome2_src_configure \
+		--enable-debug=minimum
+}
diff --git a/gnome-extra/gnome-calendar/metadata.xml b/gnome-extra/gnome-calendar/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/gnome-extra/gnome-calendar/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 type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
new file mode 100644
index 000000000000..babad1df132f
--- /dev/null
+++ b/gnome-extra/gnome-characters/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-characters-3.22.0.tar.xz 1481416 SHA256 0778b625646d6d934cf252d58a2e16403889da6bfc237bdca1d3cb3258f63d4e SHA512 c04d79f9b31601e127ae6103b2f473e2e4733facebf504189a8d5721a78b430883a0f790b58537eb7772c5a4ce72013183d037909f30a237cd1482c31144905f WHIRLPOOL 83e892f6f3f0f7c7f6171d9c049e1f029865dfcb6c998c16db5fb9c47ed550d307eb9113dc46324d5c1c3a487ee04a08f9e27357c25d120a577be86b18131b9f
+DIST gnome-characters-3.24.0.tar.xz 1490304 SHA256 9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596 SHA512 28531676e3ed89cea574f800a1f0e19106eb4ccb0edc62ea493bb6680fdbe3b1ed45c3cd865a637c059a89df63b980cd4a9d69d73049778c52725b1d38fdad9d WHIRLPOOL ee087ba7daac78fff365794f09e8e547aebe3bc9288602423a6bead3a5614d99fc620dadc705ba1abae15c1352c00bd93276d5ad82aad268d07a2bbecd5be5a2
+EBUILD gnome-characters-3.22.0.ebuild 1087 SHA256 c88e4ba2549d4da4f845dba7ce3f17b71cab76cb287d839211d9dc2ffe8850bf SHA512 d5b33399bd0042e66f5ca0ee15d15693893ce20e7318d14f3ddff7f813232ebb697cc6dbd76fdbdb463ff2956b0ae970f75a53965c09db0620ba8d1cd17365d3 WHIRLPOOL b40a5ab2b031c830a49f257a2b4aaf1dc341008bc3d76f628fe4e98395fc1b02ead2e27753d68f9d666f30773dccb19620d1f11253570bddd39569a24c4037ac
+EBUILD gnome-characters-3.24.0.ebuild 1166 SHA256 1664d7e8fbb88d40f3513c117dd3f6c97cf20de276af433a51b6a9d2f31fbca0 SHA512 c5d16e3e3bb2e2f1ea2dab8739a685c8ca1d92341fdf0dbde873bed6efd5207ce0b81d6053768e66f924824b83a37358941b10edd3ee698859a1a14ae695172d WHIRLPOOL 223c471609d9f0401583923a6d6cc1a74a0c05d03c85f68109dc9f4c67142841d7c9c5bdd8c6097eb3822b7a9017ae634547296090a0bece92d5aabf79d3464f
+MISC ChangeLog 5253 SHA256 098dc316d1f17281ae808314c3a149e070ded8c3f5ad4c227a0d798d322864f2 SHA512 3da80ab7bd78b8a75a7b663e5e174a0929554d789f78ab65c45e9ffce1a4bfe8056f9884bc4690563c5b4a3d177a5a069ea139eccac0e909094350a6b9c1c1d2 WHIRLPOOL 70dd89387cb73cbc0dfdc5863d779be257e1a80ae3b81eebe5922b1cc88be6f38873616020eb8d06da8d4021c793b3f75fc56054f5423b79fce2293a34b9f05f
+MISC ChangeLog-2015 423 SHA256 df2fb43c08125ba2f972f544bb6238f9ce28707761f4c0e0cbfcf3c61d880c86 SHA512 3c4c0f4657384a90419fe09284285aa82c0c040dc2aebc582d2a9a13b2f7f1a0e9912d5fff7aca1e12cdd3911513477fff7a8a876c66e44afe4540c311ae8d91 WHIRLPOOL fdee8093b90490fb753a45793f50bd6406fcd2c57b798d4d692086d0f3eca9aa33cb3e83c5ed6982581944185832a56b709b4659871dec6ac2c11af9269302b3
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild
new file mode 100644
index 000000000000..2d624b5bdb32
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libunistring-0.9.5
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=x11-libs/pango-1.36[introspection]
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
new file mode 100644
index 000000000000..d6daef0506eb
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libunistring-0.9.5
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=x11-libs/pango-1.36[introspection]
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed 's/print \(.*\)/print(\1)/' -i "${S}"/tests/smoke_test.py || die
+
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/gnome-characters/metadata.xml b/gnome-extra/gnome-characters/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/gnome-extra/gnome-characters/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 type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
new file mode 100644
index 000000000000..7bb36978c1a7
--- /dev/null
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-clocks-3.22.1.tar.xz 954416 SHA256 bee05dd8e7b7c79a3ff6d8505c0ecc3bae16002128ec0e2065dd25aa5e5416af SHA512 76c4b9c493d6897a3d5bab4679f834bc515861bf6030d7fac2b59f5584b2a5278385dd4f5747adbe04df92c3af822ded669490d680daf3b9bc46ce09786f602f WHIRLPOOL ce5e8841480409917e3d5175075a68ecba7bb80f6579a3b92d7851494b27c71b6b2f614bf1693cdb5dee87e011ac7bad3efe59bea863914739f2c2caf3688628
+DIST gnome-clocks-3.24.0.tar.xz 954576 SHA256 9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36 SHA512 f29a61ac9634008fa918f9f08c6e24c93816c0077687bd2feff3ef2c62c0db475076de5dbc1e223027627e985c4e4362f0cdf1a47821356c0a9ef9c4cd672de1 WHIRLPOOL 7f7d06e640e9aab8742d60a40f128f4786561af71e5cbd83d034ef7e3a7e6b6e5ca7342adc0df2a3bfd6b7fbed0fdd971b9fe57f4f4b6dee526d4edbb46b2988
+EBUILD gnome-clocks-3.22.1.ebuild 700 SHA256 3fb3d1dbd25b5453917fcd3fe0fe523fea30e3461825356ffd2bcd39dd5e348b SHA512 6c443dbcce5358c79cdee75f5b98251d058c23719e04ef9cc7d5f34013e0137d5b885be7ea9f04282b6a6d3f30534bcf14c4bcdc6b6dea8c364536bac5703c5d WHIRLPOOL a89fa4ed09a2f7c8d5915c85bc2093a6f08ad4043619a325a4bf1f753a998f335d58ae097c3338ae8fdb88994caa4f78270cda390870ef7a29cbbd84858409f5
+EBUILD gnome-clocks-3.24.0.ebuild 702 SHA256 a44597a2dd5d64fa7fd80f50b21b24a4fa4b39307a87642861e231ae7dfee666 SHA512 b8882a89e8e54c8c84459993fb5249365da7075131dc9020dd9fd36d431fd3f4a71fbbf1e9b86a748bf1a231a675cb42a31e8c5757fecc071ae897a4e91a8410 WHIRLPOOL ae128b9fe881e65aa91fc7aec9b8bcc750f2c3aeeeeb15fdefac9f9c5a9dad82a0c8336739d77c26d5467d56af636f0bad8ed9475735eaf38dd6eb1f88e540e4
+MISC ChangeLog 5401 SHA256 72add4f51ae385d44d40cb7981b96fb2daf7ad1111b0267656f02b9d69f44c35 SHA512 6fd34e7bb300fca77d675635fd8ff5016e0fc69e3bb72acc581affdd8cfc806f9dde90eb0bcf3a4d417897cc121c9b31d2d23e36f99162ee6de442f06b28a0b3 WHIRLPOOL 1dd1ce59da3c9e5ad516bb515d75e313c791e9cf261466d6abfeafa8776db0bdd9c2cc7c3ceeeedef12c68205f45af85a0d7663193b4f72dd9c75f82b452d166
+MISC ChangeLog-2015 3154 SHA256 0bd717763ef40deef22d23dda230ded5613421e57f4d4148b48bb4dcb383b2a4 SHA512 737ca1df93089f6c23d402616708fba899aaa41fc0ba3d8bb83ee693917f5d3390f13241c84b1fa4c5f401d3efdc9e32f46548f6bcd480962de3304233ca127c WHIRLPOOL fa5c9d43d48d81803eefac96e68f4f85a35c98ff8866631432086543a7fdbd3a2e2b6e0f3ea58bcb9c8a34e85d11810d8f597140e7e63aaa360b14be01463917
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild
new file mode 100644
index 000000000000..ee81f0dec157
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgweather-3.13.91:2=
+	>=gnome-base/gnome-desktop-3.7.90:3=
+	>=media-libs/gsound-0.98
+	>=sci-geosciences/geocode-glib-0.99.4
+	>=x11-libs/gtk+-3.19.8:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
new file mode 100644
index 000000000000..d00c4c6163e0
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgweather-3.13.91:2=
+	>=gnome-base/gnome-desktop-3.7.90:3=
+	>=media-libs/gsound-0.98
+	>=sci-geosciences/geocode-glib-0.99.4
+	>=x11-libs/gtk+-3.19.8:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/gnome-clocks/metadata.xml b/gnome-extra/gnome-clocks/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-clocks/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-color-chooser/Manifest b/gnome-extra/gnome-color-chooser/Manifest
new file mode 100644
index 000000000000..948718a2a1c4
--- /dev/null
+++ b/gnome-extra/gnome-color-chooser/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-color-chooser-0.2.5.tar.bz2 228808 SHA256 99133af61f5c2fe2272de115b485471dc4038f5d6964f2fab3feb574a4c1afd7 SHA512 bd29e005456142ffa459f38aedce13302e60dbb6e649883d099810df1f6b3765c28b8c69ef3f19c8252c2fec895df90ae660a43c5790d204e8690c74b35f3cc4 WHIRLPOOL 6fd17d84d6fcb40e99af05bef37893653280e870c91a24b78f9cbef5e1f2835005dde8bac9875cb47e6f07a534ebb308d9e4ffaae098feda9c91dfd6e38dbb3f
+EBUILD gnome-color-chooser-0.2.5.ebuild 1188 SHA256 651185674603110902dd82597e1b3e8da42e07a48224db3a123d464a02443f38 SHA512 3b4938183a02b7f363c3484f74560014d3634df76fa676c148945c5a615e06d2a74854459bee84533ffbb062c98b225689ea5238dc70203e37593c7d5cfd07a8 WHIRLPOOL e4edbf8c6fb3b0bf3b90e6e5642509b170f7a77096750048e6361b64256d0b93a05ed7913ebf52c54e0bbba04b9af64ea1adb4e61445e5e2fa9bb24f5bffbfa6
+MISC ChangeLog 2899 SHA256 e978ef9de66ada41a8d07c4056ab772c3504ef95479b864488b30f1daf9b646f SHA512 ad6c954a196420558418e8de8267a0d174894d2914349d1b37ebdc5b9187b13eabed05810812ccce9c528aaeb091d13ec6d408d5771e3370ecada9949784f0e1 WHIRLPOOL ccea4ebb113bda6c4d74d80e9565c96e3a14b727eb721f69e6205c23a11a5b4e746ff7f55368ec4ac7859a2a70e0d33e6971a77aeae3e20dbbb7674d42c1c66c
+MISC ChangeLog-2015 1543 SHA256 91323914dab1c35a73e7b9d54cde40fc5556c2421d9133d082dd79e08fefbefb SHA512 1394012999e0f777d50fc2f7bba292eb0ca05e24e8dd2e5a5adadbe045b6ea1fbbfdb7b8afce9664de4dae430330a5693320acf73051b04716d50285a54cfc65 WHIRLPOOL e19578990507fe3b86a289e58b782b0add5f4dfbdbcff10c0c8d6ea70499e7fcb53838d4ae0fb527def9d4265740642da517e40fdee64ff592e11f0c78d1af0f
+MISC metadata.xml 244 SHA256 56cd8a2edff425d6a78d62720a99f5144274e1ec2576bfe2506081bfe9e0ba78 SHA512 a566c44dc596386edd7e6aca0c606bc28268ba0494ff90e9e6c7938169b71a4c21fb05c01d66b3b820041ceb9755daea72f5cdabc7d6ebcd6684f2e47759f114 WHIRLPOOL 050c9981057d0e49b4edbd32e7cc142ef179b08fbf8724b04bf3d54055fe3996f8ee9115a054fdaff9551110105a7072800e9e32fe85410cc17d40eed2843ae4
diff --git a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
new file mode 100644
index 000000000000..9a9cbb6a5a0a
--- /dev/null
+++ b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="GTK+/GNOME color customization tool"
+HOMEPAGE="http://gnomecc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnomecc/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-cpp/atkmm
+	>=dev-cpp/libglademm-2.6.0:2.4
+	dev-cpp/glibmm:2
+	>=dev-cpp/gtkmm-2.8.0:2.4
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6.0
+	>=gnome-base/libgnome-2.16.0
+	>=gnome-base/libgnomeui-2.14.0
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Don't pass --enable/disable-assert since it has broken
+	# AC_ARG_ENABLE call. Pass -DNDEBUG to cppflags instead.
+	use debug || append-cppflags -DNDEBUG
+
+	append-cxxflags -std=c++11
+
+	gnome2_src_configure \
+		--disable-link-as-needed
+}
+
+pkg_postinst() {
+	elog "To use gnome-color-chooser themes you may need to add:"
+	elog "      include \".gtkrc-2.0-gnome-color-chooser\""
+	elog "to ~/.gtkrc-2.0 for each user, otherwise themes may not be applied."
+
+	gnome2_pkg_postinst
+}
diff --git a/gnome-extra/gnome-color-chooser/metadata.xml b/gnome-extra/gnome-color-chooser/metadata.xml
new file mode 100644
index 000000000000..740db1c713e6
--- /dev/null
+++ b/gnome-extra/gnome-color-chooser/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gnomecc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
new file mode 100644
index 000000000000..11ec6dc3b22e
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-color-manager-3.22.2.tar.xz 2671864 SHA256 e837a184e66a6a5fb778730a58d3aa8d3a10a447e13f48efc86cac7e4c94d45b SHA512 dd50cff841fc8e70554c0c998494e363b709d1a8d4084dfc8daca6297d9491c1b797c4f3f106284e0f8ef133ac77704ad805b5519566c2f49e311f30a1e8397f WHIRLPOOL 188bf45db1e7713fdf884d35ce6274a65a9d4f338a428b4555ba8d09b75d9f907b60377d8bcc355f0afe9ad93ae106f2d0eeb4a49150112f2d476883e60990dc
+DIST gnome-color-manager-3.24.0.tar.xz 2857120 SHA256 a1009e6287d97b8d1fdd6e44a4c8668bcf05f1bb7f2186243318e54c6d061dd2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003 WHIRLPOOL 9882c9610a93fe5eb82f8ba66a559b7675cf4902ba5129b94dc3ad19f6c7d37aaabe8cb753957959587f04d6f0d89c7598a46cd30274c27c7ead331873917215
+EBUILD gnome-color-manager-3.22.2.ebuild 1532 SHA256 e2464b63317537c790691285dc3d37cbc0270dcc105cef448b383c972511518a SHA512 75aac8de5f1a1425948107ab943f73eaadf1d735f236ce586950e606bd6eaf8cd0d80a8957d8f6e74848e2d4bc46c36367655c1e27a360424f089864e9766896 WHIRLPOOL 9f13a0d1263529d3e3edcd4a33d1d12f0e0265e922d95b09d97db1711ee94ac95adfaed185df4860bd2596e94c5621f8bb5ac4501e932368ba9bf7b96b161e39
+EBUILD gnome-color-manager-3.24.0.ebuild 1536 SHA256 3c25da9a5dc3168a90af211a5b030c20d39cc0114430e27d282857bceccae4d1 SHA512 269ed4330823cf48e5f1cf54f2f1f85bfab5cb3e952f6e0680192b421ffe6322f82ea42103e256acf3ddae68dae9618b693a8b7ba54a132b6ea840cbe019437b WHIRLPOOL 1ba00cc248ab0ac06a897999a44d102c8d142b37f7b2751d9a140c6d5c2d1309f14c0a118a6689688d6b4d2e37cb84b584b96e1b146ddab098a097b2c653abbf
+MISC ChangeLog 5391 SHA256 f0064efd8766b58de0107547b3abd69bb0b06232605eadeda4ee0a394affce8f SHA512 fe18493f15b5fa5d7cb0cb65709a910533aac7ea8b715ca43ba3d34a3041fea8adf96ee7af498d1b3f1f29a62321a441ad4caaa5a294bb6ad8d39fb12e1cb5ba WHIRLPOOL f141cd41c9f7a83665f9984da9aff1d0b6d4a50fca70b9a916f94cded06bd37e6cb82c390a7b32ae69c9a69e32f429e7d82efa964dcd142323cd2e86154ede6a
+MISC ChangeLog-2015 10393 SHA256 cf21b5c75f07916be83732f6f0aa14f11b8322238278f7bd2d92f11e2d284b0d SHA512 f0c9cb31219ac9c93ed0a3a9e6d9d05a0860eea85d80b50e2073b38becaa558b09b0be799cb1bcdb04d2207e1fd46e49bf954d57d7922680c45ad74c4547dd13 WHIRLPOOL d0696c1f6c9ade07d80346da15302b6ba5abf57105ed8216884266f424d913c02a02bef073fb63d72892e811d68cd04a6323d3886bc30bd8bd7fbcf7c0563613
+MISC metadata.xml 394 SHA256 ac5ecde7e1d38e4f19e593305fa7a5a652eb19e7ac56c6a0e10a1ea08598e8f4 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d WHIRLPOOL 99f6dc2e081ccd317a159e7a27dd5462fa11c08b17a4a5df9b794b45764ff565926e9e62d39c1848d00cb1adf2cdb870b3f79317ea04fce7c5107a72698b7b1e
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild
new file mode 100644
index 000000000000..2933fb386a91
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="Color profile manager for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="packagekit raw"
+
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
+RDEPEND="
+	>=dev-libs/glib-2.31.10:2
+	>=media-libs/lcms-2.2:2
+	>=media-libs/libcanberra-0.10[gtk3]
+	media-libs/libexif
+	media-libs/tiff:0=
+
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/vte-0.25.1:2.91
+	>=x11-misc/colord-1.3.1:0=
+	>=x11-libs/colord-gtk-0.1.20
+
+	packagekit? ( app-admin/packagekit-base )
+	raw? ( media-gfx/exiv2 )
+"
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Always enable tests since they are check_PROGRAMS anyway
+	# appstream does not want to be relax by default !
+	gnome2_src_configure \
+		--disable-static \
+		--enable-tests \
+		$(use_enable packagekit) \
+		$(use_enable raw exiv)
+#		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version media-gfx/argyllcms ; then
+		elog "If you want to do display or scanner calibration, you will need to"
+		elog "install media-gfx/argyllcms"
+	fi
+}
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
new file mode 100644
index 000000000000..55f0c58e4624
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="Color profile manager for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="packagekit raw"
+
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
+RDEPEND="
+	>=dev-libs/glib-2.31.10:2
+	>=media-libs/lcms-2.2:2
+	>=media-libs/libcanberra-0.10[gtk3]
+	media-libs/libexif
+	media-libs/tiff:0=
+
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/vte-0.25.1:2.91
+	>=x11-misc/colord-1.3.1:0=
+	>=x11-libs/colord-gtk-0.1.20
+
+	packagekit? ( app-admin/packagekit-base )
+	raw? ( media-gfx/exiv2 )
+"
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Always enable tests since they are check_PROGRAMS anyway
+	# appstream does not want to be relax by default !
+	gnome2_src_configure \
+		--disable-static \
+		--enable-tests \
+		$(use_enable packagekit) \
+		$(use_enable raw exiv)
+#		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version media-gfx/argyllcms ; then
+		elog "If you want to do display or scanner calibration, you will need to"
+		elog "install media-gfx/argyllcms"
+	fi
+}
diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
new file mode 100644
index 000000000000..6968539644cc
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="packagekit">Enable support for the distro-neutral package
+			manager GUI <pkg>app-admin/packagekit</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
new file mode 100644
index 000000000000..1ad6b493dcb5
--- /dev/null
+++ b/gnome-extra/gnome-commander/Manifest
@@ -0,0 +1,9 @@
+DIST gnome-commander-1.4.8.tar.xz 6374144 SHA256 7124e9c45d934b0fba95e6721715d07a251e1e2e054d614a3145ad587340de86 SHA512 1b4a6980bff62ce454d6e0952941bacb078c157d5b6a12ee917a849ada89d9d02bb90e92e01eaf6ee4c0487c35251a9591de9cf340c6c2c3f16a2dd853bb6798 WHIRLPOOL 48a01ba8c5f89025b73dc15826cd9bf87ad094a5775bc82861034b37d094b3725c5cc54032ad968d54ca6e9db014d2dd9de4217fa3bd8d5cad1028a4be8cdae0
+DIST gnome-commander-1.6.1.tar.xz 6550308 SHA256 9f796c65b17e7d3a125e8298638d16d3b0ba7ea155371d7b8d413e7f8b4aeee0 SHA512 717e8bb560c6c7e6505cfee1d9ab12f7b3d5c2f8131b9eaf8b15e13aa71dad85574b14ae6f3a42dae42d8a6a291d33cd71db5a4155184bec4f66e3db8b2daab0 WHIRLPOOL 7569ec3bf275754022a19830871bde6139363c1a3d2e1792cff678cee79674d7a6022ba8fa678f9e48a79bebcf36acfd08c75db4f9e3c457e668a2e68c88c1f0
+DIST gnome-commander-1.6.3.tar.xz 6653164 SHA256 9ac8b0041b0b2648252d461776e2be65e87f2fc52b027815c8c93c9b448f7cb5 SHA512 92f138c3cff1b88b967340f945bfa58c5840fb3db806943b4d4eb87211fea10de01a8a365de6ca2b18cb0503bd850e758c3a37fe604b5402481c03e953e94dd3 WHIRLPOOL 6f907a807b0a72e09456216f734b5a10213498c1d06d9b08a0d783035fa83433d8c8959f8c4946ce9ddba0aa2435cc742a8cb038a2d1679ae2c72a1539137307
+EBUILD gnome-commander-1.4.8.ebuild 1571 SHA256 72c350d75112980191c294363f244cc070c6dee1cc7e8faeb9bb23c757780d00 SHA512 2c3ab2d3fc0759e121f2714ed7f2eb6e27d90193dc5e1a317df6ea162be906716ba96a7df142d2bbaba693fcf55c1e76e8754bdfce36219ea98fce005d112eea WHIRLPOOL 149b99e83abfd7b7d7b297b6916a27b2e4c2958df8cb46ba6379e55685d84691f10a734ffa6ef6360c234281e4db7aa6d1ee94321de2be15a9dfbcbd61715da6
+EBUILD gnome-commander-1.6.1.ebuild 1646 SHA256 e59b269903e8340a0b708f5f913d9958efe41e4accd9e18d20706c70ad5e51b0 SHA512 d20e75f3636b5f38de32bdd91a59cf7c32990618540ac4cdb26dab691211eafd2cb4dc8a15321a03a08ce0bc1bd539ab45eeef9642192f5c5bef4f1cc7843535 WHIRLPOOL 0a0c83401c7aec2746567f0f0c2f22088eb12fb1d2e6166f606e728f9bd1c6f23d5a1a78fdf4ed169676c43547f504414a22d7fc1e18e6acde496d5179357906
+EBUILD gnome-commander-1.6.3.ebuild 1691 SHA256 2624126c3a72f555a4c1a545eb49ece78761c8012334e973900d0d05814742ae SHA512 ef168d556e78ad00f2ef05b506c90bb6e5df8434d12113d686e5f07c81b82da3eb59a6c65fb8f3d8bf36e24d3cecce45c4d14cdc285f282ec99e109ba95ad7d7 WHIRLPOOL f3fa820e28bc8c9e33157bd0c17b5e73a6b1bfbee5e0aa28c6a6420f38c0952a1de2eeeb7019efd5a39982279053a370d3cc26eda989f5cf23d67f015a06a5d7
+MISC ChangeLog 3831 SHA256 5c3b045347cad2ed53bd423202644193e72240d4e0b08adc146952bc6fdc36c4 SHA512 05b984dd6ef2703ba860eeb9c9fe886f3cd2feefcc69c1aa2301376a8b9c11a58a21fadcaee4cbbeef845e42b598eda7afd9f255490021754bb965b750e806d5 WHIRLPOOL 47e0a5a4069dd42fb1179ad182bde7d8abe3343f013cd46af8163b278933a48ce4b57384cb5426a6c4b918423788f6778f9161fff140f2f0262773aa45de48cd
+MISC ChangeLog-2015 1828 SHA256 ea6bae077957a1ab13f05b4d995e2f6d092e52afb5bea0c6cb7506a89756b984 SHA512 4d3306ffa4c81d8e272ace46edf8cb9c05457d58842945ab6a23424e593980c8f1e01fc5a6f2c8b7c927d29b99fea48ce2224f295676130e4cb35d200f84969e WHIRLPOOL 1fa534e6ecbedf7818df911c71ab1b908ea4ba9148c2e8eb22ed10e9a966acfb41f5c1be0978301dd1a28e7ab8c9eb7ef20d82d24fc2cc8ce2c1d48cc88c1952
+MISC metadata.xml 1341 SHA256 2a1e6e8e32c933cb9c7c93825e54324fba873f5225ccf418269097addf1bbf63 SHA512 d3f4147f6cc33421f3a4fe4dc44db301daebe435c31e94523f8470733de5f5b5a4873fbf1a7e7a2be18a89012a6686d704bfb7a384999372932b4896f1f25a4d WHIRLPOOL 4e0c9d599576fee4611f83e9635755e8f124510dd71bf31cec5debd9005f8a4c6095b50b6018192efa36011854dfd1fc7ffc051cce926c815fb01b59eab1208b
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild
new file mode 100644
index 000000000000..c812765380d9
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="chm doc exif gsf pdf python taglib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="app-text/gnome-doc-utils
+	>=dev-libs/glib-2.6.0:2
+	>=dev-libs/libunique-0.9.3:1
+	gnome-base/gnome-keyring
+	>=gnome-base/gnome-vfs-2.0.0
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.4.0
+	>=x11-libs/gtk+-2.8.0:2
+	chm? ( dev-libs/chmlib )
+	doc? ( app-text/scrollkeeper )
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	pdf? ( >=app-text/poppler-0.18 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/gnome-vfs-python-2.0.0
+	)
+	taglib? ( >=media-libs/taglib-1.4 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	G2CONF="$(use_enable doc scrollkeeper)
+		$(use_enable python)
+		$(use_with chm libchm)
+		$(use_with exif exiv2)
+		$(use_with gsf libgsf)
+		$(use_with taglib)
+		$(use_with pdf poppler)"
+	gnome2_src_configure
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.1.ebuild
new file mode 100644
index 000000000000..f5d9510947ec
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.6.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="chm exif gsf pdf python taglib samba test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-text/gnome-doc-utils
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libunique-0.9.3:1
+	gnome-base/gnome-keyring
+	>=gnome-base/gnome-vfs-2.0.0
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.4.0
+	>=x11-libs/gtk+-2.8.0:2
+	chm? ( dev-libs/chmlib )
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
+	pdf? ( >=app-text/poppler-0.18 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/gnome-vfs-python-2.0.0
+	)
+	taglib? ( >=media-libs/taglib-1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( >=dev-util/cppunit-1.13.2 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable python) \
+		$(use_with chm libchm) \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with pdf poppler)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
new file mode 100644
index 000000000000..c164d9d403c0
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm exif gsf pdf python taglib samba test +unique"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-text/gnome-doc-utils
+	>=dev-libs/glib-2.44.0:2
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+	gnome-base/gnome-keyring
+	>=gnome-base/gnome-vfs-2.0.0
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.4.0
+	>=x11-libs/gtk+-2.8.0:2
+	chm? ( dev-libs/chmlib )
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
+	pdf? ( >=app-text/poppler-0.18 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/gnome-vfs-python-2.0.0
+	)
+	taglib? ( >=media-libs/taglib-1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( >=dev-util/cppunit-1.13.2 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable python) \
+		$(use_with chm libchm) \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
new file mode 100644
index 000000000000..44a93515f4dd
--- /dev/null
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>u.scholz83@gmx.de</email>
+    <name>Uwe Scholz</name>
+    <description>Proxy maintainer. Assign bugs to him.</description>
+  </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+<upstream>
+  <maintainer status="active">
+    <email>u.scholz83@gmx.de</email>
+    <name>Uwe Scholz</name>
+  </maintainer>
+  <changelog>https://git.gnome.org/browse/gnome-commander/tree/NEWS?h=gcmd-1-4</changelog>
+  <bugs-to>https://bugzilla.gnome.org/browse.cgi?product=gnome-commander</bugs-to>
+  <remote-id type="freecode">gnome-commander</remote-id>
+</upstream>
+<use>
+  <flag name="chm">Enable metadata support for Microsoft Compiled HTML Help files</flag>
+  <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
+  <flag name="unique">Enable single instance support using dev-libs/libunique</flag>
+  <flag name="pdf">Add metadata support for PDF</flag>
+  <flag name="python">Add support for python plugins</flag>
+  <flag name="samba">Add support for SAMBA (Windows File and Printer sharing)</flag>
+  <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
new file mode 100644
index 000000000000..264bd10d739c
--- /dev/null
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -0,0 +1,8 @@
+AUX 3.22.1-fix-vala-0.35-part1.patch 884 SHA256 06d2810051d0a50d7b426022d78546d3708a2bdf9acdfc33663cdba20d4b3eeb SHA512 73754d230efe89d3e3273e1d24a69e58e45a8d6e74fce1a41f7a7889aa58189fcc2f5edf36ce2418c43871716634301308f0c211f0f18282cb409d009669bdf2 WHIRLPOOL 957eaee4b99591bbeb4763a7722660ca57e7a4b93473b85f447871eb9339fe5aa65514f80cc9ad2d4f60989bb5f90422685875cfd4021ab9c705597faf341f4b
+AUX 3.22.1-fix-vala-0.35-part2.patch 1501 SHA256 36b7065462ce7c352e42f35eb9d701afc1fc7e9479b80ca5568dd82d96a428db SHA512 700772e2c87bfad32e408f20653a20976c0a3b243fd4bc8b6ed61cb9fe34f1b1f572b877aa05e9b9c3854cc444d5d7fc1c26dcd9ac28bf76694eb02c2e31bb4c WHIRLPOOL 7b43c1a4237f8ddb2074dc659fa6f2af7802d5fced2520526e41fca3377ff7c8fb02f495ddd040ea3521f4471f376957829c1673252f6807df25dd3cce834e58
+DIST gnome-contacts-3.22.1.tar.xz 788820 SHA256 e45297fb6f379a978605f7e183201be70dff2912f55072a363bdb1f67d9fe87b SHA512 d93ed6c65ffdabe1925cc795b88ff374fe69e03fcd36af7c2fc67a5236b90ab6af4bd269b6fc3b344fcd6b4688d866628b8b090bb62de95f8bd0c2e40c26a107 WHIRLPOOL a2cb0a70152bbe5b742c57afc865fe44345b3159be40daea68f4d826aea2cc255ac82079b6c5ab47e7ac589b3dedfecfa1946637ada8e5022b7ac88277a3f615
+EBUILD gnome-contacts-3.22.1-r1.ebuild 1842 SHA256 fec15e8bf4c1f8a97087813695aa5dd5783bafd433688a044ba55a5d81f46618 SHA512 2b8c5aac232bab047e0c6a1ad42417163acd82b79e1fb45d996592ea1431eb5f6b0d3e7bb7b040c7e5c337126a6ff21457067c3ed4c9d8d5650035dad3f16045 WHIRLPOOL a7809af41b3ec6e830fbf70373db687fea5b5acfdff5b9e9c943a511cfdac8a09c0f5de886dc1276e08fabc4be7f8893a1b062b6ff55b74268fce209de037981
+EBUILD gnome-contacts-3.22.1.ebuild 1629 SHA256 e5cf96a02b8d05d8dba29140cfff23621b8bd212bfc6e49c2dd205fe5e8f8756 SHA512 17fa5224ea43f39ea97a2936e2cc1e8ac63a9cb90904db43da9c12368c611eaec0a27e9777604ba37fc4defdb92351d99faf8d526d22634cd50ae8d0359897ca WHIRLPOOL ea0e26b735181987ca3cc4147412ae0ea28417454ff146dd75b7c04633f343b849238d4d162cce81deb54a82dbb60f24961fb702f6f3f0f9ecf82fac3f2ea578
+MISC ChangeLog 4525 SHA256 de8f8e6840826b60199640baafe8ca3fe4b4a7e929388af05280255960818de1 SHA512 581a9bb5d0b55136ad6db8bcb0d8338c8df730e4dfc6fcc54832173d947c9f4083c6c2c730632be33d1c12aa677b696b780b1421e03f503d38038d1480c5524b WHIRLPOOL 15492a26b7d56f124ee59ff4d193689c118992e79eddbcad843bc1b6562c31c943ffa0db06f51ac382c9b1c651d12831189734392e17d7c627dd8be50e5275ab
+MISC ChangeLog-2015 5358 SHA256 fc3c8cde774a7306dbfcb66ebc2ff221c9d7595e8d49cd1dccc2b776363998fb SHA512 530b670982954be4eaabe7ed202459edb441b058e5be828e87c18b74a0757eb1fadce760dd5798b5d0e557e647038b11d8e053edbbf153be11c5e6d257fa0c82 WHIRLPOOL 92ccfbcefaa621724c76b28fd1f0150e9086e6d977239716dbca714e64e1191a78341dd054ca15ccdf89430641d3d57b4599e085bbd976029835ce28e135b8ed
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch
new file mode 100644
index 000000000000..b9634e6fc041
--- /dev/null
+++ b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch
@@ -0,0 +1,29 @@
+From 2ba6e380dd8a3575bd8f4d4e5d8d3883003e9f54 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 1 Oct 2016 14:27:55 +0200
+Subject: [PATCH] Don't restrict RowData.details to the generic type "string"
+
+This allows AbstractFieldDetails<G> based values to be assigned,
+like PostalAddressFieldDetails.
+
+Fixes a build-failure with vala 0.35+ due to stricter type-checking.
+---
+ src/contacts-contact-editor.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala
+index 3372f87..3978887 100644
+--- a/src/contacts-contact-editor.vala
++++ b/src/contacts-contact-editor.vala
+@@ -77,7 +77,7 @@ public class Contacts.ContactEditor : Grid {
+   }
+ 
+   struct RowData {
+-    AbstractFieldDetails<string> details;
++    AbstractFieldDetails details;
+   }
+ 
+   struct Field {
+-- 
+2.14.1
+
diff --git a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch
new file mode 100644
index 000000000000..4cfe861fa509
--- /dev/null
+++ b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch
@@ -0,0 +1,50 @@
+From b96b0fc07c49724f252a5cd35f2d028f91529068 Mon Sep 17 00:00:00 2001
+From: Jeena <hello@jeena.net>
+Date: Tue, 15 Aug 2017 16:53:05 +0200
+Subject: [PATCH] Drop unnecessary format-string.
+
+Code got refactored in 3.25/master but it boils down to dropping this
+extra parameter.
+---
+ src/contacts-contact-pane.vala | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
+index 8e100f2..fce832b 100644
+--- a/src/contacts-contact-pane.vala
++++ b/src/contacts-contact-pane.vala
+@@ -451,7 +451,6 @@ public class Contacts.ContactPane : Notebook {
+ 					 DialogFlags.MODAL,
+ 					 MessageType.ERROR,
+ 					 ButtonsType.OK,
+-					 "%s",
+ 					 _("You need to enter some data"));
+       dialog.show ();
+       dialog.response.connect ( () => {
+@@ -463,7 +462,6 @@ public class Contacts.ContactPane : Notebook {
+ 					 DialogFlags.MODAL,
+ 					 MessageType.ERROR,
+ 					 ButtonsType.OK,
+-					 "%s",
+ 					 _("No primary addressbook configured"));
+       dialog.show ();
+       dialog.response.connect ( () => {
+@@ -482,7 +480,6 @@ public class Contacts.ContactPane : Notebook {
+ 					DialogFlags.MODAL,
+ 					MessageType.ERROR,
+ 					ButtonsType.OK,
+-					"%s",
+ 					_("Unable to create new contacts: %s"), e.message);
+ 	  }
+ 
+@@ -493,7 +490,6 @@ public class Contacts.ContactPane : Notebook {
+ 					DialogFlags.MODAL,
+ 					MessageType.ERROR,
+ 					ButtonsType.OK,
+-					"%s",
+ 					_("Unable to find newly created contact"));
+ 	  }
+ 
+-- 
+2.14.1
+
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
new file mode 100644
index 000000000000..2c52f3abc33a
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-0.9.6:=
+	dev-libs/folks[vala(+)]
+	gnome-base/gnome-desktop:3=[introspection]
+	gnome-extra/evolution-data-server[vala]
+	net-libs/telepathy-glib[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+# folks-0.11.4 to avoid build issues with vala-0.36, upstream 7a9001b056b4fb1d00375e7b2adeda9b7cf93c90
+RDEPEND="
+	>=dev-libs/folks-0.11.4:=[eds,telepathy]
+	>=dev-libs/glib-2.37.6:2
+	>=dev-libs/libgee-0.10:0.8
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
+	>=gnome-base/gnome-desktop-3.0:3=
+	media-libs/clutter:1.0
+	media-libs/clutter-gtk:1.0
+	media-libs/libchamplain:0.12
+	net-libs/gnome-online-accounts:=
+	>=net-libs/telepathy-glib-0.17.5
+	>=sci-geosciences/geocode-glib-3.15.3
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.20.0:3
+	x11-libs/pango
+	v4l? ( >=media-video/cheese-3.5.91:= )
+"
+DEPEND="${RDEPEND}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-vala-0.35-part1.patch
+	"${FILESDIR}"/${PV}-fix-vala-0.35-part2.patch
+)
+
+src_prepare() {
+	# Regenerate the pre-generated C sources, bug #471628
+	if ! use v4l; then
+		touch src/*.vala
+	fi
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-man-pages \
+		$(use_with v4l cheese)
+}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
new file mode 100644
index 000000000000..d1c0351111fd
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="v4l"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-0.9.6:=
+	dev-libs/folks[vala(+)]
+	gnome-base/gnome-desktop:3=[introspection]
+	gnome-extra/evolution-data-server[vala]
+	net-libs/telepathy-glib[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=dev-libs/folks-0.9.5:=[eds,telepathy]
+	>=dev-libs/glib-2.37.6:2
+	>=dev-libs/libgee-0.10:0.8
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
+	>=gnome-base/gnome-desktop-3.0:3=
+	media-libs/clutter:1.0
+	media-libs/clutter-gtk:1.0
+	media-libs/libchamplain:0.12
+	net-libs/gnome-online-accounts:=
+	>=net-libs/telepathy-glib-0.17.5
+	>=sci-geosciences/geocode-glib-3.15.3
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.20.0:3
+	x11-libs/pango
+	v4l? ( >=media-video/cheese-3.5.91:= )
+"
+DEPEND="${RDEPEND}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Regenerate the pre-generated C sources, bug #471628
+	if ! use v4l; then
+		touch src/*.vala
+	fi
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-man-pages \
+		$(use_with v4l cheese)
+}
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-contacts/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest
new file mode 100644
index 000000000000..c63d6e0020ee
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-directory-thumbnailer-0.1.8.tar.xz 273896 SHA256 fb56fc36f6d8fba1858af4e582eb281e1e529cdfa789061b1f5287bd3d972e06 SHA512 ef4ca209897a6eaff635c840a66d175b3b57896167199a51762e4089bb9b5518f8700c3534019dc14a2e6a6542fb131d4d01d5c459baff2f7d09f7775e20bbb5 WHIRLPOOL 2999f41ab4c00ef80113b91a14b8a5864304fd56bbc1c27e88812ac72b8f42d0e76619564c394e326c7f21ecbe7af1ec2f43e138abb19817686a2e3ba0282dd8
+DIST gnome-directory-thumbnailer-0.1.9.tar.xz 275432 SHA256 f1e7bf8b70833e9601532468b8d80254e0bc43909b6e6860e819ff239161a6e4 SHA512 c7299eb5127ec138aa5ac1ea0a5c5d3511a16b4d71ab6c5fc5e0baff04837e282d5313293623f312a448b2f3ef0a83f5e7d805f600998cb1a4a7b29b89d243e2 WHIRLPOOL 843c8b0f9795f3b365ec4a63d6da31aad979a6d624f6519a2c1d58def7a9e9039da6f1fa017a94922ae3ca9cdd149816bff8c593be3fa0be1ac8c9057b58c023
+EBUILD gnome-directory-thumbnailer-0.1.8.ebuild 493 SHA256 6fce2b74558a392813071aff1c19a6249938f28b978f8ecf8f98fbf98546cc42 SHA512 d23a02fe26441374764d02c54b88ccff52a97ad35852b002864f01c01800d9c54ac6acd1658720cdfba78a16f1dc8dea5b6bd6ddbf6d71186d88e6eff4cf7886 WHIRLPOOL 061807bb1cf9ac56a7d8227f8fce309cd5bc97ee35bd6ed7e9359adf75a0106a0b0dddfa6030733fdf9821109f8f935271e162ecc6fe803c3717d3e110a2ca2d
+EBUILD gnome-directory-thumbnailer-0.1.9.ebuild 498 SHA256 db0dbce69ecfa7f99cc0138b993d9b469348c6c1fd7d37d956ef922009d65b78 SHA512 da82c57882776ca67accc045b26008b39578f5d584877f2aed388a2ff82742784efeaa76c2a877516f0b13142aa3990ab398a638f84e0cd5ca5c7b51687ad4df WHIRLPOOL 9602ee9458085eabb8cfde2a3d34505f18dc13e845680d88cb03447fc8717af4378a4859cbee8491bab73aa436bdeddfd9cc13faddfaeeea6f2647f40120c264
+MISC ChangeLog 3209 SHA256 a1f16e5b36c652ba774cf51a6e1ee4b3440d3a85322d202a5fcf7fc16698e4f4 SHA512 a3a3b759c8a6e2d0e4210ee8df9652d7ca7aa10171bd21084405243bfb039f66518f9bf7db439a734120d2599cae4cd7c1004affae789f72901f62b5e55ea7be WHIRLPOOL 9c27e4739f6779248b576eff550093804a3e7b6c042803a047f33fdc3defaedfb42fa18b2536af0e4c8acba6ed8f3e12c7c3b4f247581a3be146677d41a5291d
+MISC ChangeLog-2015 594 SHA256 534fb4fa9ff6e10e7df0b201dab4f7c2b0c2b8e277a665a8dcae531c708f26be SHA512 07b9868dad42755737f1849bea83d2293f02fa73c2b61ad5ff06d2d854e4be977c6be6f84f01ab9c4c03671a4b2cccd2dd3a0b9859fdfb8060c093456bb0c13e WHIRLPOOL e471e4434b7c1404cf62ce4c0a314d2443ee02b8c336bb27ea46cdd472a945af2ba8afa1e2a68420e03317a93315a5cd63360be481f603470a7c747e439da30a
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild
new file mode 100644
index 000000000000..117d97485ea3
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Thumbnail generator for directories"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.35:2
+	>=x11-libs/gdk-pixbuf-2.6:2
+	>=gnome-base/gnome-desktop-2.2:3=
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.9.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.9.ebuild
new file mode 100644
index 000000000000..74e983f3413e
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Thumbnail generator for directories"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.35:2
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=gnome-base/gnome-desktop-2.2:3=
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-directory-thumbnailer/metadata.xml b/gnome-extra/gnome-directory-thumbnailer/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer/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 type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
new file mode 100644
index 000000000000..6d7b8b1d0e81
--- /dev/null
+++ b/gnome-extra/gnome-documents/Manifest
@@ -0,0 +1,11 @@
+DIST gnome-documents-3.22.3.tar.xz 2314508 SHA256 c63010e1da641fb7e5b0e5eb779d3b6824c9b254e0f5bf47d7ef0a31ad635f4f SHA512 1984d83a8246a085a1fe716ba31da738a3976b7900c993f4ff57c290bdf86d1223b856bc9aabb071c6d9579c994f3468fbba2653e086f15725a43ff5eb534a02 WHIRLPOOL da565292d4e558fc2aa5681d6aa55b15a9e170b915232d0085a802f7f1eb51dedf03d5b8b973383ab94c6df388e31f5a966c8409e422716ab0d4f34cf6e84292
+DIST gnome-documents-3.22.4.tar.xz 2311320 SHA256 65db92a735290e5b33df9f961f280f569c7e07a65d0cf449ea15a462c3acb4b5 SHA512 a55ba63c930830dd769b0e15c9710a9de6bd065cdc3131fa735d205cab7ec8b5f0c3a7ef89e55965fc95ebf4ead653aa087166c6c251aa33d95e22529a343578 WHIRLPOOL a592a5e45b4effbbf2708723456a04f14cb4bb810016d72573d435d17cabc31fdbb6152673ad477958c7341da081e543953ca02d2559e128824cbf7b3cd81901
+DIST gnome-documents-3.22.5.tar.xz 2312164 SHA256 cf66db140305b075015355aa0028d7f4276ba78439a95a684f1a9c8c94a5a188 SHA512 b074c5f5a5d7a698f3e571005a523f48928eca4081df7cfba6c97a0178b59ef3071920e5622e6200c8f59125fee934baaa2f07b8c011f8a4c2338c8488d0c516 WHIRLPOOL 94e5b47029384d362449bbe8c3c8ffbe551b2684cd7c0447ab3e57a8acd02d6a5c859e119a4fbb3b6a3cd25acf5a87f78fc9f0ed4a68a9c3b6def15492812f27
+DIST gnome-documents-3.24.3.tar.xz 2313680 SHA256 c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a WHIRLPOOL 7fbd205785a6dd373b1c06a4e58e908abfe6cd609e5cfd4068881eca016f503d10dce8ff2e80551a8968cb15ebdac5b1f573c95d07bd4044e4f3489c6164d700
+EBUILD gnome-documents-3.22.3.ebuild 1342 SHA256 492301b35d6d2fca4fb63440433f6c4c0108f57d024c27f5e391f1e11bf46124 SHA512 72538607fc381227a6e7a3262607a6c21f2dee5ab3825a4e135205fc59f10e438e33fcc4034991f726920ec0d9e0a8d4d4634db08ab6e461587b094c2b76b1c5 WHIRLPOOL e65fc41c072f8de9d7aa4675706322e20b3a00b9f5d292083c71d823a11fdc04971686f0ae8c2ceab3175365cd2c298943668ea3d0832bb11223ceaf0fbce868
+EBUILD gnome-documents-3.22.4.ebuild 1246 SHA256 4e2efd1ae7100e440d69d38342df9b4779319a4debf62891e43cf8a3afc7d218 SHA512 b88138e0ef03c53fe282df60b50a2ae5a8052130d81a0bbb78b9bb85b623e5d4573730d6b97caacdb4a184a62ea2998b078c983c067044da94d46bd690218f81 WHIRLPOOL 3108a484c212a7eca3cb53850278b6b7fe0b94ed44b8a89cec23d0f594506aa4ac737d6c0e61bc47fdbce783ce57b7f45635200a3ea5228210005cab2b18f32d
+EBUILD gnome-documents-3.22.5.ebuild 1246 SHA256 4e2efd1ae7100e440d69d38342df9b4779319a4debf62891e43cf8a3afc7d218 SHA512 b88138e0ef03c53fe282df60b50a2ae5a8052130d81a0bbb78b9bb85b623e5d4573730d6b97caacdb4a184a62ea2998b078c983c067044da94d46bd690218f81 WHIRLPOOL 3108a484c212a7eca3cb53850278b6b7fe0b94ed44b8a89cec23d0f594506aa4ac737d6c0e61bc47fdbce783ce57b7f45635200a3ea5228210005cab2b18f32d
+EBUILD gnome-documents-3.24.3.ebuild 1247 SHA256 9acc0ff6a9342c80ff153045f4af7febfef58b4912c949fa01500717a8baff09 SHA512 dd0c45e70f8314845f504289bda7763383b95db04e859172cbdeabfde3049885017571538ac26b770a2dc9c7371c22c9d887da7eabc16ae010bc5167cdfd7579 WHIRLPOOL 98b4e67c2d5bd6f79183101ed2be6540199e62a14092e1fbc7dd1bad2388d2621bf0e78d32306334bd316f089c7505f00599cbbbc3788d956146a653f8a5cc29
+MISC ChangeLog 6978 SHA256 11067f3aacf80ac96045b699a6b1e85f79e1b9e1f428fd8cd2f15bdb84231592 SHA512 b6482834f7029312cc888585034a61a7fe10e51804d1ca10d0fc0a7d059c08d4c97b23a6dbe8c93416a06882fc3cbaabb2bfe6d90274c1b8ffe056075eee8f8e WHIRLPOOL 53595ee63ab89048744c7ff6e657ca3f63abd4790cdf416d9f8fd7c26b151edb9ade61c4e4a97239fad32e69bc753875d8233aeaa9063a690d907580cb8205c6
+MISC ChangeLog-2015 6824 SHA256 8dc69ecd025b99018ceb6cf753d3f2e1935de6bd51df4a0e4b9b0c6fafdb4d07 SHA512 27c91ac8d33d312169b6b2c1937263358383446d99fcf53af3565cbf6a92fe2895711bca8e9454f2529d12b25136ffcd8cb82257ae4bd19de4f0faab3c812f78 WHIRLPOOL a25a472105d380dd840b758b18bf8f946299e130e0d64b2e92d692292ff60ab1b2fc1ae756657b9a2374cc3061c41485deb456f482df472435038aa5140fc865
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.22.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.22.3.ebuild
new file mode 100644
index 000000000000..15ec6da700cd
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.22.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
+COMMON_DEPEND="
+	>=app-misc/tracker-1:=[miner-fs]
+	>=app-text/evince-3.13.3[introspection]
+	>=app-text/libgepub-0.4[introspection]
+	dev-libs/gjs
+	>=dev-libs/glib-2.39.3:2
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
+	gnome-base/gnome-desktop:3=[introspection]
+	>=media-libs/clutter-1.10:1.0
+	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
+	>=net-libs/gnome-online-accounts-3.2.0[introspection]
+	>=net-libs/libsoup-2.41.3:2.4
+	>=net-libs/libzapojit-0.0.2[introspection]
+	>=net-libs/webkit-gtk-2.6:4[introspection]
+	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
+	>=x11-libs/gtk+-3.19.1:3[introspection]
+	x11-libs/pango[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/clutter[introspection]
+	net-misc/gnome-online-miners
+	sys-apps/dbus
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.22.4.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.22.4.ebuild
new file mode 100644
index 000000000000..f71284f3fff5
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.22.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# cairo-1.14 for cairo_surface_set_device_scale check and usage
+COMMON_DEPEND="
+	>=app-text/evince-3.13.3[introspection]
+	>=net-libs/webkit-gtk-2.6:4[introspection]
+	dev-libs/gjs
+	>=dev-libs/glib-2.39.3:2
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=x11-libs/gtk+-3.19.1:3[introspection]
+	>=net-libs/libsoup-2.41.3:2.4
+	gnome-base/gnome-desktop:3=[introspection]
+	>=app-misc/tracker-1:=[miner-fs]
+	>=x11-libs/cairo-1.14
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=net-libs/gnome-online-accounts-3.2.0[introspection]
+	x11-libs/pango[introspection]
+	>=net-libs/libzapojit-0.0.2[introspection]
+	>=app-text/libgepub-0.4[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/gnome-online-miners
+	sys-apps/dbus
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.22.5.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.22.5.ebuild
new file mode 100644
index 000000000000..f71284f3fff5
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.22.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# cairo-1.14 for cairo_surface_set_device_scale check and usage
+COMMON_DEPEND="
+	>=app-text/evince-3.13.3[introspection]
+	>=net-libs/webkit-gtk-2.6:4[introspection]
+	dev-libs/gjs
+	>=dev-libs/glib-2.39.3:2
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=x11-libs/gtk+-3.19.1:3[introspection]
+	>=net-libs/libsoup-2.41.3:2.4
+	gnome-base/gnome-desktop:3=[introspection]
+	>=app-misc/tracker-1:=[miner-fs]
+	>=x11-libs/cairo-1.14
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=net-libs/gnome-online-accounts-3.2.0[introspection]
+	x11-libs/pango[introspection]
+	>=net-libs/libzapojit-0.0.2[introspection]
+	>=app-text/libgepub-0.4[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/gnome-online-miners
+	sys-apps/dbus
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
new file mode 100644
index 000000000000..6ae2c85594cd
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# cairo-1.14 for cairo_surface_set_device_scale check and usage
+COMMON_DEPEND="
+	>=app-text/evince-3.13.3[introspection]
+	>=net-libs/webkit-gtk-2.6:4[introspection]
+	dev-libs/gjs
+	>=dev-libs/glib-2.39.3:2
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=x11-libs/gtk+-3.22.10:3[introspection]
+	>=net-libs/libsoup-2.41.3:2.4
+	gnome-base/gnome-desktop:3=[introspection]
+	>=app-misc/tracker-1:=[miner-fs]
+	>=x11-libs/cairo-1.14
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=net-libs/gnome-online-accounts-3.2.0[introspection]
+	x11-libs/pango[introspection]
+	>=net-libs/libzapojit-0.0.2[introspection]
+	>=app-text/libgepub-0.4[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/gnome-online-miners
+	sys-apps/dbus
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-documents/metadata.xml b/gnome-extra/gnome-documents/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-documents/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
new file mode 100644
index 000000000000..12e08e069fc4
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-dvb-daemon-0.2.90.tar.xz 700504 SHA256 8d1f3cc6cd8cdb5e032841ea136d27c432f2c8a9b9e46fc8e7d752e22c875a5f SHA512 73e18ed5b267f1ef1ceebfe4ff25ccac3222bca9d7da164dd16acf9367c6b9f9710e915c81ef851c54b6fcae9b08f36d0c78665f4af425afc41b4c08eba49c40 WHIRLPOOL 618584c1e25be5ef4ad4a6c551a61e9a8bab8f8d1b308e863193dbde97af44554b82116d6b1ec86d88367defdc76c8c50ea10e4bf19be54c8f5325f2169f12f6
+EBUILD gnome-dvb-daemon-0.2.90.ebuild 1690 SHA256 de6329252c18a029c386cad4b575df2dbf79d784262b3474b40b0b8910a6ac5b SHA512 259a4cbf06f9e10f26124a9296d6fef2f98bc8221f5285a028b0f8d96be0e3925be006a36833f9e725cb0f1b57ecea48296004db53b1c8aae53d093d8a56b1aa WHIRLPOOL 824c408683ac6860a309a5077b53e4d889acedaaa9febdb0f519cfec4289d1c18367effe641915dda2cf3978389c0cc42d2348a420d4293a0dc217bcaf44e556
+MISC ChangeLog 3872 SHA256 c7655b9c5794c471fc548bce06a452c93272b7254b9d31b631bd45a81095cf31 SHA512 72e9930d333710728e86fc01f8215a4401ec02710a7746abb3f27e7c8af2e8b977e1e7fe65dc4283b273d17adf8c389438f654a9b6805f4204584fbf51e076c7 WHIRLPOOL 8f2e3277e1c954daef1bbb05c708de9cf26439b0b7fd5f6585dac6a25540a495c0d9f09866c6b0b7d3d95a5b5e0090b1576ba00405e961a2fc22a110d83c5f25
+MISC ChangeLog-2015 3707 SHA256 465d43c72343a0a90f256fd3c81e65dfaff21a25c8b5f767395245dbbf208d70 SHA512 2dd6db10cdb3c61d5df7160ae204d42a8bf338f3f6439abc5ca0cf5fcbf031cfdb992624ee7148671c2cfcf84ba529a47879711ff63efc931f03459c1e4de229 WHIRLPOOL f48020ceb04adac3feaed578e5d8d4470f2a55b4581ca5b88b470ecf94733e68f7520ae66590ba1c3d1e2ed915645c64eec0ff03e3d042375defa35677fe9131
+MISC metadata.xml 587 SHA256 11fd7759fc8d1a3c62670d3f72f2d2cd12a17d807b0ce0daed244ceadfd541b0 SHA512 e3f3fcf4fefb21c6d5cdd394c3c663ba1f178e7f2f7432e3e03a0c2a546baaf328d25fed7dff1145833d8df17f955acd0e2d49db404385c4eb6155c961380243 WHIRLPOOL b3890e688d8b7acedd49f8a8c38b6dd781fc83ded7bde0079884d0a6d1c3fab321686151e40b43372978645ebb34bbd5b5496acbfe495e9d56fa05f6ed137da8
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
new file mode 100644
index 000000000000..4fb604a4e99f
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_4,3_5} )
+VALA_MIN_API_VERSION="0.26"
+
+inherit eutils gnome2 multilib python-any-r1 vala
+
+DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
+HOMEPAGE="https://wiki.gnome.org/action/show/Projects/DVBDaemon"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="nls totem vala"
+
+RDEPEND=">=dev-libs/glib-2.32.0:2
+	>=media-libs/gstreamer-1.4.0:1.0
+	>=media-libs/gst-plugins-good-1.4.0:1.0
+	>=media-libs/gst-plugins-bad-1.4.0:1.0
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-db/sqlite-3.4:3
+	>=media-libs/gst-rtsp-server-1.4.5:1.0
+	media-plugins/gst-plugins-dvb:1.0
+	dev-python/gst-python:1.0
+	>=dev-python/pygobject-3.2.1:3
+	>=dev-libs/gobject-introspection-1.44.0:0
+	x11-libs/gtk+:3[introspection]
+	virtual/libgudev:0
+	vala? ( $(vala_depend) )
+	totem? ( media-video/totem )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5.8.1:0
+	>=dev-util/intltool-0.40.0:0
+	>=dev-libs/libltdl-2.2.6:0
+	virtual/pkgconfig:0
+	nls? ( >=sys-devel/gettext-0.18.1:0 )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+	gnome2_src_prepare
+	if use vala ; then
+		vala_src_prepare
+	fi
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #569992
+	addpredict /dev
+	gnome2_src_configure \
+		$(use_enable nls) \
+		$(use_enable totem totem-plugin) \
+		$(usex totem '--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins' '')
+}
+
+pkg_postinst() {
+	if use totem ; then
+		python_optimize
+	fi
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	if use totem ; then
+		python_optimize
+	fi
+	gnome2_pkg_postrm
+}
diff --git a/gnome-extra/gnome-dvb-daemon/metadata.xml b/gnome-extra/gnome-dvb-daemon/metadata.xml
new file mode 100644
index 000000000000..001aba64a9ee
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<longdescription lang="en">
+	GNOME DVB Daemon is a daemon written in Vala based on GStreamer to setup your 
+	DVB devices, record and watch TV shows and browse EPG.	It can be controlled 
+	by any application via its D-Bus interface.
+</longdescription>
+<use>
+	<flag name="totem">Build a plugin for <pkg>media-video/totem</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
new file mode 100644
index 000000000000..d31b123e0316
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-getting-started-docs-3.22.0.tar.xz 119100024 SHA256 22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722 SHA512 8eeebe70054a5fe68bd19c81b0725d3f2084c92aa91c925653bb2e53d4cb66c592d78af1e5446bc8063e9f0bf19f684d8b22c01b8300886ff32dca228f45cb6f WHIRLPOOL cfa524a87c1a6a4650733357dc138d47aa453ada149a0601ff5897cbfc1f306ac4c0deedd968ca0b798a9068c6dd43c617cee145bf506a934716a928efcc0022
+DIST gnome-getting-started-docs-3.24.1.tar.xz 119137908 SHA256 9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97 SHA512 7d44ac4030c3459014f391d10699b48f9be789c196900e29a56574e98698ffe494d3344a7c99f04291c49093827385093877b9047549cc5ff4d352d39297387d WHIRLPOOL e7ba9a0f7577f7f6e8b5e35b4a80f2f103f28426b87e6d273376bc7911e53807582c2e4e7816d0d96cd4576f79ab432b542e43293e7c64df5f18599f4f213248
+EBUILD gnome-getting-started-docs-3.22.0.ebuild 424 SHA256 d68061434d1031d13017c371e3fc665b7ef88d3f4d7e08332023d94856d02185 SHA512 4cec7d1bdd1f8a95a0e001bb6fa2e613c4fd8ccf937d17cf6b09a910dcc96553ae9a485b3bd5ea2e3459077342675b93cd62538a55c00f08871d5b2d812e7cf3 WHIRLPOOL 027bcd73f415cc450acb2859430092238e327b97c5ff93fcc1f740f4b1549da44c00bfda35ea48c8dc003a74016bd28e6ee4495da80093d513a124a90c5ab9be
+EBUILD gnome-getting-started-docs-3.24.1.ebuild 426 SHA256 ed20a4df7ece565ff16573752989605e010f3c8348e03fa0827ae67a181d3eb5 SHA512 8a05c4b57f596caa62732f7c2d26483aab8b3f3ccfa349a686beedd9740d82320497350acbd07443194a319e25d8b8871f4f7baf133d9f58652929a7f9d2ea22 WHIRLPOOL 7e26eade819de687df3350d909f05008d2d57b29e1620f01a8e1797451eab4989c57b61064da4dfca4fbfab02d89fa3bccf7188c6c5b55ac7a10fab073f9f9c9
+MISC ChangeLog 4781 SHA256 a24e3f52a83d2fcf5bcffe6319c3abaec734d70f28f0edefceaff3f2d8893021 SHA512 87c3674a23ef2926bd064a3b3e1727890e157adb7890dd2ab18ab4718781eb0d52a5cdd835a3d512e17a68867119081b142c75003fb9ea57b3f8a4cf85cf053a WHIRLPOOL ec289bb0c7c46050b7c4425316cd885b0b58a08f43bbad54cb780113f706d042adf6d1fb0d0476944f668c2a7f456d3dd9721105a0fa773fb6168cc017aac542
+MISC ChangeLog-2015 2536 SHA256 95b7d6c536efbad657959c1da9b633dd9ded6c36d9294b6ab3f58f303a47a2e2 SHA512 c7c94286ffaeaddbdbc38f7a578b1ac9e6ab7f4639b1a9438d34b9279bd90ba70a68b295017f8c67f628b877385dd2f523b6cc53fffb379418e60494eb03eb1a WHIRLPOOL 2d034c54a5cf5801936d68c9d6c23a1b8ad9adfa1db3f2e404d102fcb7798b7551e5eceae46b611f61dec39433d65c3bb162706b2967d5368e7131b1563e5e3b
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
new file mode 100644
index 000000000000..234c965d2348
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Help a new user get started in GNOME"
+HOMEPAGE="https://help.gnome.org/"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="gnome-extra/gnome-user-docs"
+DEPEND="app-text/yelp-tools"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
new file mode 100644
index 000000000000..011e9083ce77
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Help a new user get started in GNOME"
+HOMEPAGE="https://help.gnome.org/"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="gnome-extra/gnome-user-docs"
+DEPEND="app-text/yelp-tools"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/metadata.xml b/gnome-extra/gnome-getting-started-docs/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
new file mode 100644
index 000000000000..31fb1b8a4214
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-integration-spotify-20140907.tar.gz 6709 SHA256 f1906851329461d3e1a2a7171fd8c6be5082505b04415f2879b1f634b554bbfe SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874 WHIRLPOOL 4f0867fd2aa0d62d9e71c933541896092991ee4389a79845c2ceff2c2712935405134291024817e9039afa0b62da9538cc329e110b739db28e40c1df2a28070e
+EBUILD gnome-integration-spotify-20140907-r1.ebuild 1088 SHA256 33e426a584b2af8e15b9ce57edda091f0f4577598b2eb785da8bab27c4ad5c05 SHA512 d5426537c55a588054638d30403e6a705da7ed399f78e55c3c00f9ce134c58e33daf438b9a4d95f6b90e24c5a777ebe8736c1d20fb41eb08db68990215d644da WHIRLPOOL 71c9c8f82684a3f4253c88b5cc48e9e2416b5adc577432811cb0e5595b3a7bea15295a8c086c44e855848c67eee8ce38e81fecb29c2f2eb9ddee9303583c3897
+MISC ChangeLog 2956 SHA256 cc7fd77e0850b0d097843476272c03aa639264ad332e1c86c2699cd25a80dc22 SHA512 09468118ba777843e25b681d5e5a9a2e2507359cded6f28d67a9501dc55064a87bef886148dec67025e8cec9d2ce91de77990e3b366f7572a9ee46fdf83a967e WHIRLPOOL 257488dba61a2a88b7d1274dc36447f6e6a807c4c4c779762ca0c528a502a8c5b19fa926e76ac7cb0e6244ba5d92561979914575ae84ef8e6899cb1716ebec52
+MISC ChangeLog-2015 2101 SHA256 da0c107f7fda3740e4769de3c98bc00c9511063fb7dbb820bd48ccfb78b7ce61 SHA512 621bb00354076c25d42675c4ddf2a2f2fd46587010c708ecd2c47df48b27a034f5ab099fbadd7ff9c426538eae53529489948ee6698581a7709040b52f6a2200 WHIRLPOOL a5cfd6ae8e4541fb8fe8d6c0e21ad204e0e93b173aa701f10d12f13f8e86b1ecc77d9ca5b54e479ed7688dcd49519ef96725524594bebf906ec3723e6996e94d
+MISC metadata.xml 354 SHA256 3edb911c53ea9a7c78defa15f1e37726627bb91382b4cc6d74507d93fc0bf921 SHA512 8c3b0f5ae534f97b3a5ba81cc5e48280b48a864ca7f161876546ba14d4733fc09e960be75741b2a97f895a46228ddd5d787e685dc83fae8943d12341418a23e9 WHIRLPOOL 3bc97d05ef323d7fcf17b644776e80687b77aea80d608fb66930ca1417a1c954fb83e4469e8fb833667cfc88c63685afa0dcce2462b395899c224f33cc60d192
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
new file mode 100644
index 000000000000..6b304d8fd213
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils python-r1
+
+DESCRIPTION="GNOME integration for Spotify"
+HOMEPAGE="https://github.com/mrpdaemon/gnome-integration-spotify"
+#SRC_URI="https://github.com/mrpdaemon/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz"
+SRC_URI="https://github.com/mrpdaemon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+#S="${WORKDIR}/mrpdaemon-${PN}-df9124d"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	media-gfx/imagemagick
+	x11-misc/wmctrl
+	x11-misc/xautomation
+	x11-misc/xdotool
+	x11-apps/xwininfo"
+
+src_install() {
+	dobin spotify-dbus.py
+	python_replicate_script "${ED}"/usr/bin/spotify-dbus.py
+	mkdir -p "${D}/etc/gconf/schemas"
+	cp spotify.schemas "${D}/etc/gconf/schemas"
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+}
+
+pkg_prerm() {
+	gnome2_gconf_uninstall
+}
diff --git a/gnome-extra/gnome-integration-spotify/metadata.xml b/gnome-extra/gnome-integration-spotify/metadata.xml
new file mode 100644
index 000000000000..890dee3a0870
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mrpdaemon/gnome-integration-spotify</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
new file mode 100644
index 000000000000..b9bc68a9afff
--- /dev/null
+++ b/gnome-extra/gnome-logs/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-logs-3.22.1.tar.xz 968664 SHA256 e2cdbd58d125beacda288d9f0b96351db9cc66c7363b70e5a627a2024d52b21d SHA512 0836f326407bcfa66b57f10218ccb557356baaed53867c96f4a8fa12eea547fe4bc8a4f5aea894852c4de31d19c4e2374ecfe78bcfcceda93d2884cefdef90be WHIRLPOOL c18dc2abe02df244d4e3844aac4bb511d37fa84b1f80dee51c68d3b626368380c5a3f8fb9b103f4dcb72d10d14f17e203cceab4ee77c820921d518f0d174f24f
+DIST gnome-logs-3.24.2.tar.xz 1000552 SHA256 9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4 SHA512 6f7dabb0b0093b860198344373eb1feae244ed23c3a65494499c09a83c687ba68ff023ec5ce34846be51fd74293fdb4b575cf3a748a22fae183e89086eba1db9 WHIRLPOOL e9578681498203c41c935e4242aab77afd4cd928466a496c7f123410513e9e169443caa182e3309d7a64161f3c12e8a2c42e5ecae08a76d619c89349a87df227
+EBUILD gnome-logs-3.22.1.ebuild 995 SHA256 c6a0f2c91d90f00937780daa1c8bc940a284e459879c463d799525fd1eb97f5e SHA512 7059edb371700bef17a64bcd021b8e82eae59d10d2bc7b78b7c146fa69c81cc5ab09f9877b6a4fbb63da26dff95b06f4b3ec861107e59e9d102e7c533f3e0ffe WHIRLPOOL bee4585e25cf6f211a5bad42b0ba3bca7259ac6a19c76f4bf7d288430ed16d57287530d7c25ef38ab3057c84bf4a1edd84000b4efc67709f34b0c71b0bf13675
+EBUILD gnome-logs-3.24.2.ebuild 997 SHA256 036345df3dfb500944d758fb51df443d68e04ada2b0ad8cb4aaad3f78c4c5b82 SHA512 b46802258f6e35da58763c57b13a50fb9330c57e6ed0b5cfc24c824dbae9b74a38759972ce1fb4eb61bc922cc732d54231f2288019fbadc9acb4031b8cfe636e WHIRLPOOL 3c08130c70859126bcb9c9421442b3d838886f67ea55b0cb4c731d91276b9f5a837c0bd150ff7afda1819e394b044eac2201f3d4319dd759ae4f5b4620b661f1
+MISC ChangeLog 4610 SHA256 d7e52566b12e7cc2c4d54f30e8ebf17ffff5b02ae6250d60ba584163729cde93 SHA512 fdd2e1657240b2865bf1c8408d453c0eaa56de7af1feb3a252683687aafc2a43874d6562492e0dff323b65c9987f2930249bca99a0c61e678b1ffe9aeb03b56f WHIRLPOOL ba5860426395f108258250a9b0654cdee3c9ef6c07fffb73ddfff2573e81cfb0a28cdffa8374f2466de8e8bf8a11f9aa8171e6f6ed234ee5911ae53ff02210e8
+MISC ChangeLog-2015 399 SHA256 82e3dccf60ca82cfa4cf2fe49bd1f4fd8c160fa64e84e10c6254cee00d1f5ab9 SHA512 12b36acd495da03091627aa15f8cd262af4ff8f17bb5c5c09f0422f01ea7bbe80c86689dea227c8826b0c8b3fca03f1319e14badec43d421b42d277b35ac4c77 WHIRLPOOL 685d68c3d0da3325c336e935e3b772b5fdaf95f4b4fcc8f0ff2b4596916bfb6d825921cfc343a0109aed939f969bde634fc070557c6564c5ef83758bc07104de
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild
new file mode 100644
index 000000000000..57a1a38ee30e
--- /dev/null
+++ b/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Log messages and event viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.43.90:2
+	gnome-base/gsettings-desktop-schemas
+	sys-apps/systemd:=
+	>=x11-libs/gtk+-3.19.3:3
+"
+DEPEND="${RDEPEND}
+	~app-text/docbook-xml-dtd-4.3
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50
+	gnome-base/gnome-common
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-man \
+		$(use_enable test tests)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
new file mode 100644
index 000000000000..4a7b8b506159
--- /dev/null
+++ b/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Log messages and event viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.43.90:2
+	gnome-base/gsettings-desktop-schemas
+	sys-apps/systemd:=
+	>=x11-libs/gtk+-3.19.3:3
+"
+DEPEND="${RDEPEND}
+	~app-text/docbook-xml-dtd-4.3
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50
+	gnome-base/gnome-common
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-man \
+		$(use_enable test tests)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/gnome-logs/metadata.xml b/gnome-extra/gnome-logs/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/gnome-extra/gnome-logs/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 type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
new file mode 100644
index 000000000000..781101f5eea2
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-packagekit-3.22.1.tar.xz 1684420 SHA256 4064bf32ea649d3f82dd25e4cc91ab0a3f85e03be82a12e54705bd245c3760ef SHA512 f8f5046f53c095f199cf75452a5f0c2cc62a54cd5337b696a3885358573b44d94bcf44b168a4ea8cbd00b746d0274437a5fc9cb10f0a55e9eb9f2dbd2a8e4f18 WHIRLPOOL 445f713db5710b37b59ed444623d84746ef635403d500f9dff5e52900c99ee8c5dbbf5f775f622d171308372d32e59c1795525bb45c917b2526b3b19a8faf578
+DIST gnome-packagekit-3.24.0.tar.xz 2174372 SHA256 8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f SHA512 af3291b11ad279d050fcd970e1c98257b65da5f36146d8e5f1f255ef1b17e6f2caf8073ce16623da130edaf452860788aa20dd2de6a4bbf639aaf9d3bbd7c095 WHIRLPOOL 2974ebe94259377c6e8ca4d1c29aecf8f1756fbfedc536002753553002716f75b82f4a62c4c737c2b56b34f510d97e10fb0b3600ba6ec4e600e1fc68649ab7a8
+EBUILD gnome-packagekit-3.22.1.ebuild 2277 SHA256 3fad0a6d619dbd46a219c0ea65fdb0f7bc6fdcbabf3f1201e975222d6bef84e0 SHA512 850a7e248b6b93aa1714003fd2e7a9614b5982ed227331dd6ca4a74ad0e4d069393b7852b09baa5731c6754c67c6f6d106e7b7a1b2a2716fcc947c819a588609 WHIRLPOOL 39f3d51a254bd32d9f4fa0e0b374ad034b4df9a3b67acfa2453508438dbba638094f4ee7809d5a97ebfe5e051576287c8afa38e91e02ed5705251d4c29fd9be0
+EBUILD gnome-packagekit-3.24.0.ebuild 2241 SHA256 4eebb2eee16942808268db41d8cafa506eaaee0dc16a4725b2016708710c7e99 SHA512 5a701a9aec0294d81c126fb157f1bc89fd1dab84e94e33c1a9391669a8fdd02b6d05961a2bb03ce0b3fba907832353e31452cbf2ecbf4053031890545871ec83 WHIRLPOOL 80869a30a2ace997791f383f3dda8a29f6e1480be13c9e426740fe8c43bf92bfd7fe3f3a90818f548b71ee97b2298f249b6c12010b2522138960270a67ecc6bd
+MISC ChangeLog 4279 SHA256 59458ca7b58911784d94d12d8333cdf4debed4f6e2c33356456caa07369aff4d SHA512 bd61690e8c8bb36604abe78db14239e9220d3bcacc34b25a87bc1393bbdfd5fa62d76063c984bfbafb27ce8850c6aedd305e2c29b0e84459cc32c3d0242ebcfc WHIRLPOOL 6ac41cc5997f15c7decfcbfe2b10ddecd810f351da5665b96bc9539557236a6799db68c5d35fa9ce7ccd99c696f8439a434c4c85bc527d30c8635da3b509d554
+MISC ChangeLog-2015 4032 SHA256 a73c61d135e0d27adaaccb39c3af9b313309af98d9687abfad30779e7f067102 SHA512 5db49bd8223a1b7373456fa7cd3750f0a373e4691837b2a2f90465eab81cf4d28934619b826445325820749613d7a028f865ef79811de0a10cce60887d928ae7 WHIRLPOOL 563347d0c58bb7c5b20b525fb5d89969881189491781791c547fd9520d4f21fbd589be0d0991fb2e35674794679cb38de1c42396e30baa5cf21ec1b469f5eacd
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
new file mode 100644
index 000000000000..0fc509b13a24
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="PackageKit client for the GNOME desktop"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd udev" # test
+
+# XXX: test, upstream managed to break gpk-self-test beyond repair
+# gdk-pixbuf used in gpk-animated-icon
+# pango used on gpk-common
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.15.3:3
+	>=x11-libs/libnotify-0.7.0:=
+	x11-libs/pango
+
+	>=app-admin/packagekit-base-0.9.1
+	>=media-libs/libcanberra-0.10[gtk3]
+	>=sys-apps/dbus-1.1.2
+
+	media-libs/fontconfig
+	x11-libs/libX11
+
+	systemd? ( >=sys-apps/systemd-42 )
+	!systemd? ( sys-auth/consolekit )
+	udev? ( virtual/libgudev:= )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# NOTES:
+# app-text/docbook-sgml-utils required for man pages
+
+# UPSTREAM:
+# see if tests can forget about display (use eclass for that ?)
+
+src_prepare() {
+	# * disable tests with graphical dialogs and that require packagekitd
+	#   to be run with the dummy backend and installed .ui files
+	# * disable tests that fails every time packagekit developers make a
+	#   tiny change to headers
+	# * gpk_test_markdown_func: no definition for that one
+	sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
+		-e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
+		-e '/g_test_add_func.*gpk_test_error_func/d' \
+		-e '/g_test_add_func.*gpk_test_modal_dialog/d' \
+		-e '/g_test_add_func.*gpk_test_task_func/d' \
+		-e '/g_test_add_func.*gpk_test_markdown_func/d' \
+		-i src/gpk-self-test.c || die
+
+	# XXX: g_autoptr requires explicit type support
+	sed -e 's/g_autoptr(GpkTask)/GpkTask */' \
+		-i src/gpk-self-test.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--enable-iso-c \
+		--disable-tests \
+		$(use_enable systemd) \
+		$(use_enable udev gudev)
+		# $(use_enable test tests)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
new file mode 100644
index 000000000000..3b3299265a41
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="PackageKit client for the GNOME desktop"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd udev" # test
+
+# XXX: test, upstream managed to break gpk-self-test beyond repair
+# gdk-pixbuf used in gpk-animated-icon
+# pango used on gpk-common
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.15.3:3
+	>=x11-libs/libnotify-0.7.0:=
+	x11-libs/pango
+
+	>=app-admin/packagekit-base-0.9.1
+	>=media-libs/libcanberra-0.10[gtk3]
+	>=sys-apps/dbus-1.1.2
+
+	media-libs/fontconfig
+	x11-libs/libX11
+
+	systemd? ( >=sys-apps/systemd-42 )
+	!systemd? ( sys-auth/consolekit )
+	udev? ( virtual/libgudev:= )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.9
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+# NOTES:
+# app-text/docbook-sgml-utils required for man pages
+
+# UPSTREAM:
+# see if tests can forget about display (use eclass for that ?)
+
+src_prepare() {
+	# * disable tests with graphical dialogs and that require packagekitd
+	#   to be run with the dummy backend and installed .ui files
+	# * disable tests that fails every time packagekit developers make a
+	#   tiny change to headers
+	# * gpk_test_markdown_func: no definition for that one
+	sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
+		-e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
+		-e '/g_test_add_func.*gpk_test_error_func/d' \
+		-e '/g_test_add_func.*gpk_test_modal_dialog/d' \
+		-e '/g_test_add_func.*gpk_test_task_func/d' \
+		-e '/g_test_add_func.*gpk_test_markdown_func/d' \
+		-i src/gpk-self-test.c || die
+
+	# XXX: g_autoptr requires explicit type support
+	sed -e 's/g_autoptr(GpkTask)/GpkTask */' \
+		-i src/gpk-self-test.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-tests \
+		$(use_enable systemd) \
+		$(use_enable udev gudev)
+		# $(use_enable test tests)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
new file mode 100644
index 000000000000..b27f5607a6c0
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-power-manager-3.22.2.tar.xz 453204 SHA256 4f02d101d768fc4da52b7a294b233f7e4e1fbc09515d144bf2040bab9e0724e0 SHA512 a8039404bf9850422d385281b6572485b39b5fd63c7eec1b41df14f4d551898a90c8d943683517744d0dc2d851a7fd1f7697655af91a0d17a3df476828a763aa WHIRLPOOL a992ba80a60bcc5ae84cec722043cf4377158e3c4635f34888f1c0dfc1eea3e9dcfc415c68f6ea20a6583bab5a67e45aa80044ff25653b189c85da0e8429790c
+DIST gnome-power-manager-3.24.0.tar.xz 554616 SHA256 135ec3cd01f02e9cc006a2944cb8bd53382b01bb39c871131ee706417c9f0ab7 SHA512 fbbac0f5176382ccd13497cd80792d10ca4bc39fa4cc0585543f5458ba0f256ffb66b7ebd82667e482ba33cf2b6f3ef6a64bf2f55ac224e1d9ab2e2b7491e4e0 WHIRLPOOL 3d1add453426667401d6f1ab8ca6fb496e5edd9b6ba8884ef807a7167a4cbc8424bbdd2215303636efbcbdf7c6d284b4098301bce6181ca493101e2e3a34cf4a
+EBUILD gnome-power-manager-3.22.2.ebuild 1325 SHA256 d1df9b21e58705abde8e2b54f03cdb4e141a578c80a27da49034980fe0d4c7d5 SHA512 c5469e6c05c96901ba3993c948dc291981c281331779af3956a2337f87e1d74566ad738d231b8f1f6e3d9189c87150a9ca5cb68b7e2dd85e97879a97f4b1ad77 WHIRLPOOL 7ad49c317972c2c92cbd794ff3f03d3a50296f3409bb9e2f9425bc4a3b966897a707135e3ed4cc333a5bf18ba934047da6ca941f518c2bab967f39313f9c5a51
+EBUILD gnome-power-manager-3.24.0.ebuild 1310 SHA256 dc727148fc2a56931fa50f26dc0577ab9c4f42d8071d0eab7051c2af3a70aec7 SHA512 66a81bd16d1fa124694db633ec91e6370e956947c4df35699000e42357a02140d6b6a86c552a1b11fcd0511256fc5ecd55249fd6217cbb430dafc6567f89d028 WHIRLPOOL 4a6d77f4f140ae8aeb01abe654a1ee67a71a479b979989138bd66b710298a69a2b16ad90129568cfd46a8e12b2510420fdac16bfcc33e91008d3a11e5679b1d6
+MISC ChangeLog 5280 SHA256 3eb0bc307422f79e8b8fd3575f994ff16b3fd12a2229e69dd80cc0e457cb56f4 SHA512 ac6344a3927c69391c6064af8f35d3c996ef5b5816ef3ba76e95536362f8020b37c6345f31231fb0eb1ab1e45f26bbe99e24f5db0961238ed0cbfe27cdfdfddf WHIRLPOOL c8e7ce211efcf578a06166d9f3f5a2b66494721d9dc3d2e59b2e8e1eeb747ff835617998ebadcc6af57c4e6cf4d5f58e432af54775251fce0d7ef5e06e1da7de
+MISC ChangeLog-2015 34514 SHA256 212a0f84436177d23ebfd724d766f308cea5298bb2df7347c46f11a0dc1cb96c SHA512 787fa1e56d0e79280844ffcf1d377944972fdb30baad62bd9d5f271635af40f66c288023e8b22d9165f918b2566c864af11f64c888565e7b5f6628bf64d5cee2 WHIRLPOOL 11fb7dbfc900a6e95e389e562da9ef1a13d967da824299da03af49b57e0fedc567cac02d82109aa168b805fec6dec9bbbb2217a88ecb371f55b4484e96b13177
+MISC metadata.xml 421 SHA256 9114e2ed75818e13e1f7a7a1703d904cdc1d08f5c4817eb9b1f8195a79f0a393 SHA512 3734560a015221b467a58c968ebd60272e14fc37bd93d07dfecc15e68dd403ed82e1724d62ba88ce3ee07b5c0e179adc1fc67d68d2c119458901e609a740b43a WHIRLPOOL 257565c4ba380b1e1a521f914c8daf5843d6f471467872edbac779f7c50b024dd5b11bd3113251359b06c0e626d8282cb9c1bc1f54c1b01ec1398b16dc9a6d69
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild
new file mode 100644
index 000000000000..a095427215ab
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="GNOME power management service"
+HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.8:2
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/cairo-1
+	>=sys-power/upower-0.99:=
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	x11-proto/randrproto
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
+# (files under ${S}/man).
+# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
+
+src_prepare() {
+	# Drop debugger CFLAGS from configure
+	# Touch configure.ac only if running eautoreconf, otherwise
+	# maintainer mode gets triggered -- even if the order is correct
+	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
+		-i configure || die "debugger sed failed"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test tests)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
new file mode 100644
index 000000000000..2b21ce1ba41e
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="GNOME power management service"
+HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.8:2
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/cairo-1
+	>=sys-power/upower-0.99:=
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.7
+	x11-proto/randrproto
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
+# (files under ${S}/man).
+# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
+
+src_prepare() {
+	# Drop debugger CFLAGS from configure
+	# Touch configure.ac only if running eautoreconf, otherwise
+	# maintainer mode gets triggered -- even if the order is correct
+	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
+		-i configure || die "debugger sed failed"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test tests)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/gnome-power-manager/metadata.xml b/gnome-extra/gnome-power-manager/metadata.xml
new file mode 100644
index 000000000000..8b88d4204ab7
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+		Power Manager daemon for the GNOME desktop environment that makes it
+		easy to manage your laptop or desktop system.
+	</longdescription>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-search-tool/Manifest b/gnome-extra/gnome-search-tool/Manifest
new file mode 100644
index 000000000000..63363cad0166
--- /dev/null
+++ b/gnome-extra/gnome-search-tool/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-search-tool-3.6.0.tar.xz 685172 SHA256 a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42 SHA512 55126e1d49b32015e5bc6db70a7094b3ea72ed447d66f530f72fa057af982faa1dbeae5f179cc3c0ed71fea58f756f47c40809e9d11c68239fa2232352e579a5 WHIRLPOOL 065121d71b0855bfdae08e1c56e8a6552e78c07af010205d9852dcda06f02e687f66a765ec30e7e2b14bd4cb2ce9e291010dafdb001c50edf2691cffdeffa25e
+EBUILD gnome-search-tool-3.6.0.ebuild 911 SHA256 d6106b50c62b9bd47ec943c5d6a0f8ede853ee6910102544c9bed188f7916eb5 SHA512 c1dcebb9826df3165a6f486728822180d1fa851fb29aeda4a47521a44105b4c99cd689ed3e08662e1dad2f2cf0c76b5b3624c6cf326a4175050574d200aeba5f WHIRLPOOL 0fc12469dcb3e89574e76abdb1e0ebb1256c3b97097be6a59a4ec419405acef27c055b966ad2b5e1787c39f09c9d316b7d931d9494bc865ff45f948a7f77dd32
+MISC ChangeLog 2460 SHA256 e50ba2c250a618ceba31bd3b5035b713971307a06481619e1192610f221e874e SHA512 b1b29479c4244a9527995e70ea8c6c42aa8fc20718b35535d87c97e3fd624d17b2ecf6b3dfa2e95d564642705a7fedb464bdac6eedf26f3ac2712fe4b350c2c0 WHIRLPOOL 343ec644b0db3cdbd3fb6ba28c9940fa32a3a5b1ce1c2e6e5823191dfc5ba96f630297f82f3087af592a59df46be6c15636b46995a609a648cbf2496f46cd596
+MISC ChangeLog-2015 1069 SHA256 76ddf9f8336c04c25ce97374abbb16539d95dd0e7a72f817799fd9d75ffb7b28 SHA512 d633d06577e96f0499aabf2335b72f053e024c17c6bb3eb75c1619018ff679511c41bc96e1fd1b33b0613eaef33fcdc936ccbac97d75d7b5dd65a3ded7137cb7 WHIRLPOOL 9ad00a9200c7074bfd170150f9614a5c90f7460ccbd4633bb51ff6ed64edd03068f8572cfddf6783e76cb9af4e235e2fc437f2b69fe564c3cc598d6ce106d576
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
new file mode 100644
index 000000000000..1ffca1a609d9
--- /dev/null
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Search tool for GNOME 3"
+HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.30:2
+	sys-apps/grep
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3:3[X]
+	x11-libs/libICE
+	x11-libs/libSM
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/findutils
+	|| ( sys-apps/mlocate sys-freebsd/freebsd-ubin )
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	gnome2_src_configure
+}
diff --git a/gnome-extra/gnome-search-tool/metadata.xml b/gnome-extra/gnome-search-tool/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-search-tool/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
new file mode 100644
index 000000000000..d86e3ff23830
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-shell-extensions-topicons-plus-20.tar.gz 6173720 SHA256 02ffe087b390b277ce3245b3db675977dad0ed5b6503d719e6e868d8a3082825 SHA512 89feaf4a42f1785c7667ba451efddce2322599c5441bfe66c8bcc72fa3c07bbc2535e34db5383ab9c5b38a61f83ec6ef245473f2c269708e4042684f2d7a07bc WHIRLPOOL 0ccba7837700964e730ab07c8fdac5795b08aab884fa0feab56789e0a5b8166ed864836a383baa01be86c49969a409c4d3b92f2a6653eaeb0387114352e245ca
+DIST gnome-shell-extensions-topicons-plus-21.tar.gz 2756641 SHA256 92c0865dff0bba89b64fa8a7808a29294bf6904430336c7cb13f51b823f74a13 SHA512 f85db46f20c24f0b11ce2c79c0548b88262faf059d674073e328917dc8497de0e07ccd6f3613f45aa9e49109468d78293f3a8f0f4fea5a24a7c5254666cda5df WHIRLPOOL 56c9933775ba9d10ee6bb383cf60ca76430ee97a6b22f238ef4b64892aecb61a8e523cd3e65ac6857a7e5d32c54d28bfcb4f8da1a6eca1df23e65afe8233ef6f
+EBUILD gnome-shell-extensions-topicons-plus-20.ebuild 1165 SHA256 12ba8f5a6afca26273a14db4437048c5dba94affdb03b6a8ed6fc5feb84631ac SHA512 075f4a6f42c2fa12c4e24baa6465c157e137bfb1fa19e89b1525cdd0ac61b1dbf49fced35f241cc023f2fd5d60e0c22610ce0f07fb8d13eb958e4a71e149c15d WHIRLPOOL 1fedc7eddc37f6318b41e76479395927dfa8cc4d070f9f0be136418464379788c21490ff81140592c20511f20b9d0118ddd70003bbf58d21e86bd336bb92d90b
+EBUILD gnome-shell-extensions-topicons-plus-21.ebuild 1329 SHA256 216e300b843339168ad1a9150446f3903995264e7ad01b4f82dba98af978af47 SHA512 dba500a6685f3896218e3ecaf7f3fe374db2cc39264fe4f6ad5ea220a1f9064ecb263771ff3c529af6827d18eadbbf8aa4c6afe5a9cf0346d29288c32670bf78 WHIRLPOOL 63c42dc4d8515b3142ecfab97187d5083a0597627b9cc94c56cc75cc97b9d471f6386da613293adea7566f8e61d3b482361b653567ae6ebe9b0869e0213f624e
+MISC metadata.xml 339 SHA256 373926033d85917882bddce65c6c6e2482dc7693ac1b0d88b64b63b4d979dfae SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40 WHIRLPOOL 960bba128f68bdc1c834a59f4a4f45017b83e8a60611ef0974b134332e31667179010dbc6d917e5b42d28f70328f95bcb213d4f2b379fe75c30214c308d1f1a3
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-20.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-20.ebuild
new file mode 100644
index 000000000000..ce20730a5df2
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-20.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="Moves legacy tray icons to top panel"
+HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
+SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.16
+"
+DEPEND="${COMMON_DEPEND}"
+
+#src_compile() {
+	# It redoes this with "make install" later due to a dumb Makefile, so don't bother
+	#make build
+#}
+
+src_install() {
+	# TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
+	make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
+	dodoc README.md
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild
new file mode 100644
index 000000000000..7639cc3ca8ae
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="Moves legacy tray icons to top panel"
+HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
+SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.16
+"
+DEPEND="${COMMON_DEPEND}"
+
+#src_compile() {
+	# It redoes this with "make install" later due to a dumb Makefile, so don't bother
+	#make build
+#}
+
+src_install() {
+	# TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
+	make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
+	# Assuming it needs only compiled gettext catalogs at runtime
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
+	dodoc README.md
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml b/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml
new file mode 100644
index 000000000000..725b4746cbef
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">phocean/TopIcons-plus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
new file mode 100644
index 000000000000..84d8d91e15f6
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-shell-extensions-3.22.2.tar.xz 339444 SHA256 df7c22c69e29162bc1a7018b25b9a2fc37546451746b8b3c5109e5ac92238a87 SHA512 7cd045f2df885f50f5e7e41b818aad01c65bd503d656793d64bc9e283fe715f588215a894ac856da0c4c2759c549a1ce2dcb91af64081f40c664c9d28edc2d1c WHIRLPOOL 17d3f6fb7a46f7157a21ca468d7425c1c732390201ce30384d36c8d304c157ba177134315d18a7a81449891217f813ff0ab27974674f176277a1839c395be174
+DIST gnome-shell-extensions-3.24.3.tar.xz 346420 SHA256 3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79 SHA512 7948a9cb6f5cb8d760bc42ea2865823ee60bd164b491d944edb0413e362f38ed90d39ead44ac57872a83c43c4050f5448936e739626b89a2b486a22f41d61e20 WHIRLPOOL f053b81faf4f41bcb24d6e9b1576ebb347ecd7be5944d226e4545abb14f754fddc79ff7e8e8eb31b5d541ce138d5722c29564ebcfa7fb098e14b552b539e39ac
+EBUILD gnome-shell-extensions-3.22.2.ebuild 2052 SHA256 699fc136aa0d10c57cb90b7671a2c60e6c5ac7e8b6edc7e97ab86cb9b43cfddc SHA512 b718a6171594590c37c6695ddde1cde5d62193faaf4a1122c7645ba9a3850e3434bc2996b08be02813330789e85e4e52972d07bf192b258ae0da404269d88d31 WHIRLPOOL aa563f5eaa8df1937863b0e3ae39c8c40ef0ce584304ddfbee4ac1ed3b13c51d16bbb8c75aaf96ebc2cecd50022f19ac02b5519f31da0b781fcb56acdce9d9ea
+EBUILD gnome-shell-extensions-3.24.3.ebuild 2054 SHA256 8769f49c55be9abd53340e8d3c870ebfde2a1ba6fdbe664c54a964f3cc7facae SHA512 9e49eef6ce79f27eeafdb694b32b62bb2d1d888cf8ddd56c3d1ee169ceadb05054fbd649a47a68f7937109be743a8de5eaa89e1f2ea872147fade561712275b7 WHIRLPOOL bc651bde2a319f658b7310abb3ad0d5f2225926272d95e6c358710f7536005813772f115a4dc95507945302b3a1e5069a67a6bfd4f7429bb4d8a0d66a274b96c
+MISC ChangeLog 6934 SHA256 12460c2e25aa5df0349954a93efe14a70682fc7cd061873b9292c705a1540a08 SHA512 896671ae0d1319f0894c8a43911bf3782b8463fd1b46c87a2e45d1e622f383407fefe52d2413992fb8c5ed670670229d335bcfd8a936b476b248255ec0e37156 WHIRLPOOL 29f94c1e05b416d4da4b511f862e72fc31075e7e7d0beb3ec2e072c30d6327a34d4fa4bdd719d6db2f24ada3bbfb03ccb111585ac769d6c4329dd0e1b1e2e8b5
+MISC ChangeLog-2015 7289 SHA256 180e02508bcb1e9af237b351794b6d330525ba15edaf151c31876c5f28263a56 SHA512 ca3753ecd3b550f35e9919db4d785e25e5aaf682863716dc48cf5ef95f8f6d487435fbad79c7274f56b82972185deee15a171ecefce91c0481cfd7c241be1012 WHIRLPOOL 1bce81167141c12ff15e609e1bb3573a1fdec97b8ad661fe94f88bb8112570d43aadd54a69d7388ed32ccdc1dcc8045b836cae14fa3e05a626f8e9a74f43bd25
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild
new file mode 100644
index 000000000000..a7f2f222872c
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.14.2
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	x11-wm/mutter[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+"
+# eautoreconf needs gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_configure() {
+	gnome2_src_configure --enable-extensions=all
+}
+
+src_install() {
+	gnome2_src_install
+
+	local example="example@gnome-shell-extensions.gcampax.github.com"
+	if use examples; then
+		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
+			"${ED}usr/share/doc/${PF}/" || die
+	else
+		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
new file mode 100644
index 000000000000..a4b657463969
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.14.2
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	x11-wm/mutter[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+"
+# eautoreconf needs gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_configure() {
+	gnome2_src_configure --enable-extensions=all
+}
+
+src_install() {
+	gnome2_src_install
+
+	local example="example@gnome-shell-extensions.gcampax.github.com"
+	if use examples; then
+		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
+			"${ED}usr/share/doc/${PF}/" || die
+	else
+		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-extensions/metadata.xml b/gnome-extra/gnome-shell-extensions/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
new file mode 100644
index 000000000000..a972fe86d713
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-shell-frippery-3.18.2.tgz 78955 SHA256 e21a7074037beb4931d5e29adba9c8fbfc49bac6dc95c49a022ff9eb00789938 SHA512 721c35ae47e97e0241b4ddd90c4bcd4b5fa43d7874cbb20bc3ad3e3239ee797269c19dedc0a83a85606a135d954b1f4e3abc8a5c1d283614e073fa073f5dbdda WHIRLPOOL ea9932cf1324aab0a149c5751ce306e54692648e579c1e2df859621847a073ea89bd04b9bd0043ab8716db813bc2968293b62412231eb7939c51eed4bbd5f06e
+DIST gnome-shell-frippery-3.20.0.tgz 79090 SHA256 43bec5fbe2b6a2fa1e929dcdd7f742e37aa3c6bb350bb483f9ef8d1d419152a5 SHA512 da78a432aa3192d1f41a20e5f65c14f518d113eb751d6df34207109bff9777a0d638f4ebb576e2ff06b085cb98212e2dbd67c1b70d9976b57a6a224f197c43f4 WHIRLPOOL d926e255b5f90091e15b3a97caa02d8fef772f442641850291e0752391c62647b8ce55098865a48b46e5a9934f5c0ea5a83eaa7fd09ff029a4ccbd2dc0091796
+EBUILD gnome-shell-frippery-3.18.2.ebuild 916 SHA256 4050ed92e7db995f0b72e497dc11aa83863c0fa0109602a709545d73894283dc SHA512 963a97fdf9fc153abc66f833ac4dd84a783dbea9b6ad42e8277263b387f573ede2a83109899d28c409cab9d28c5dcf1b78845f49c2fc6d49970bbfeb2546a47e WHIRLPOOL 494c057490598a55a9d7526657e364f249f6f324c31b68913c7c0fff240cfaa97c0f95727151d6d54a6d5e5492d1e73faf5736ce6783d0e7446626960fbe1cde
+EBUILD gnome-shell-frippery-3.20.0.ebuild 914 SHA256 f47daf9166e0c0de8ac9a96a51f9af3c0f34c8232ab8b75f404db29a0a7708dd SHA512 ccac0795713377614f5f3ca85cfb69812e61721ffa56a4bba7a7c4d8580f3544eab2b9796eaba91c1f162e182de247604b01bc5438270708161d787638d0b7a3 WHIRLPOOL b16a89fe921ee0016ebabe37290a22af178ea93d5fb004e92f82a5841fa2162d8280bd793e9ccfc40127f177c6c2ad4a6fd778bdbbf1c37f5c9a507a0559cf8e
+MISC ChangeLog 4724 SHA256 0849c1f51dd5e927673140ed25ae4e57296ef3c4826fa3720aac3e83415d16c6 SHA512 17c9df7357383e3a91a9c90be267cdac343a658a902b992c47a3ddb319a5648bae5184c449e0368878182233fe08c613889dbc78797f6e66e6d978d0f081e357 WHIRLPOOL cc493180f1e6848d65cba7959a3d3bca276be9f63b33569cfa7e1d5acad9f1ba09d3bed1aecc2bcaf205ad562abf488539050970e86b5837d54be4ebe04d6bac
+MISC ChangeLog-2015 3349 SHA256 383d135736b448e487bc6954e3cebf2301193b31e2257be167666e925e1e231c SHA512 bf4db253ad327f0682b3cda04db49dea4fb9b92841ed5777bba2ce3dfa436586ac8193e48ce5c383e685c8abc53b937bade8a294f23b947186848455c971d0a4 WHIRLPOOL 292635454ca44bbbff931a40d4ca5b54d0989a35568a92fa7a4737b32e638e5298d78265e5a4854c42828aba4cb4a7b480afc7679d7b0d1f385cd7db6085d38e
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
new file mode 100644
index 000000000000..5f4c609ae399
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.18
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild
new file mode 100644
index 000000000000..9312554cb72d
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.20
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-frippery/metadata.xml b/gnome-extra/gnome-shell-frippery/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
new file mode 100644
index 000000000000..08784bd1ccf6
--- /dev/null
+++ b/gnome-extra/gnome-software/Manifest
@@ -0,0 +1,4 @@
+DIST gnome-software-3.22.7.tar.xz 3865764 SHA256 c19de1e19c3c7f934b24348f0e005d6ffaecdb6372047209fe9fd9e62c34b379 SHA512 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825 WHIRLPOOL ae3217b84f86a20c6da6b6165c6141fbc4e1ffae76f478d632082820c5c519e4e2acb9aaa034618c43297c64c8411b202ba1a46ddbec513b0ed699a429e6c3db
+EBUILD gnome-software-3.22.7.ebuild 1905 SHA256 8dfb52fec667f01e533da8eb1067f45dcb6f38f38f7e9d32070b1b55080ce01e SHA512 39cd8f54b680ade58142114ba78bc56ee18655a24659c4cdb3f1e3f2c9df155bcad34bf1b6a333a29ac697b50ef067eb17f6296b91dd0483985e6a884e16718e WHIRLPOOL dcc232a155ef317dec0a71ab90c16cc6db6484cd6a98f47ca415c60495a1e118996d3c28cb401e856c22016645b9d376a9b718b4e07fd3997d09c3c3647de9c1
+MISC ChangeLog 1932 SHA256 00b816026d68f09bcba7514f4c229af304be554110127c8ef7f85b90dcf54dd7 SHA512 89b6f3df86920a7c412ca9866cd3ddfc620db3a9224ee1bbbbb1f2260fb8280a6096b4fa09fbeec0e11f3ccebfe2e108d681a0c1ee7b61af4a4d61eea340b7eb WHIRLPOOL da44bf9f713e0ceaec5398c4b06c63b49f4fba4a18f52f7988e546553ed0dfa55edcc71f38933effcf19486ec001bd0ad2ed91d3a1f0d8ec8d5c2272b25e4b09
+MISC metadata.xml 259 SHA256 6d16d32cce05219baff0d7aef9baf4f8f4622ba77a55e9bc5ae9b074ae8d4600 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc WHIRLPOOL dd2c856848fdc98df5a4ffca31b95078656373a87ccf2e44be410e7139f2980f3ebb0ae951e2e92fc46ce8e3a3ecefec169c3a15bbcceba69c1bd8224a8dd271
diff --git a/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild b/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild
new file mode 100644
index 000000000000..f43cb6123697
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome spell test udev"
+
+RDEPEND="
+	>=app-admin/packagekit-base-1.1.0
+	app-crypt/libsecret
+	dev-db/sqlite:3
+	>=dev-libs/appstream-glib-0.6.7:0
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/json-glib-1.1.1
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+	>=net-libs/libsoup-2.51.92:2.4
+	sys-auth/polkit
+	>=x11-libs/gdk-pixbuf-2.31.5
+	>=x11-libs/gtk+-3.20:3
+	gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= )
+	spell? ( app-text/gtkspell:3 )
+	udev? ( virtual/libgudev )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+# test? ( dev-util/valgrind )
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# valgrind fails with SIGTRAP
+	sed -e 's/TESTS = .*/TESTS =/' \
+		-i "${S}"/src/Makefile.{am,in} || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: investigate limba and firmware update support
+	gnome2_src_configure \
+		--enable-man \
+		--enable-packagekit \
+		--enable-polkit \
+		--disable-firmware \
+		--disable-limba \
+		--disable-ostree \
+		--disable-rpm \
+		--disable-steam \
+		--disable-flatpak \
+		--enable-webapps \
+		--disable-snap \
+		$(use_enable spell gtkspell) \
+		$(use_enable test dogtail) \
+		$(use_enable test tests) \
+		$(use_enable gnome gnome-desktop) \
+		$(use_enable gnome shell-extensions) \
+		$(use_enable udev gudev)
+}
+
+src_test() {
+	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
+}
diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml
new file mode 100644
index 000000000000..4cbddcaa19ad
--- /dev/null
+++ b/gnome-extra/gnome-software/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 type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
new file mode 100644
index 000000000000..58b37c432c02
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-system-monitor-3.22.2.tar.xz 907524 SHA256 68a5b097157a6e445fc2467cbaecfede77d00b774c93e8aa69b6f784055dc982 SHA512 ff713efc63a8b5f247c27358f69fcb8b27d631fb242bddc6a819b453996f7c49ba8a883bd3dc38437dccd227cbf393e473226d597af0994f25f4ca3246707d13 WHIRLPOOL 7362895dbdae5bbe365e1db7e951eae10d75dda2bddf51281a13df79c4adb7a8d48b3f34c71af33d227cc6e3250c4f465118c1dc2067ef11b8d3ae96738481a5
+DIST gnome-system-monitor-3.24.0.tar.xz 930956 SHA256 c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f WHIRLPOOL c78c309202a01d5c5436998c9e4a7a07584460f1e03bfb7f0047c0345ad4dc97aef7d5d2802247e125b5e4f7fb388d8056c375dc25e99464aad6c7b1b5ed614e
+EBUILD gnome-system-monitor-3.22.2.ebuild 967 SHA256 c756cad2f3c0990ee08458529c0d783f854738c9ebbeda4461d194c2782b155b SHA512 5faf503b26e4a3dbd0d8dd0de2570d75533e5b9b1c78a7c2c8bc92922c3c86e2a70b4c8a3f76c41b919dae224d9f4112d29f9bbeb03123b9b627917648b20da0 WHIRLPOOL 05e973e1f0a39fc6fdc2c1fddbb046092be9090e7ce5d32bb913110c44650e25fa32fd078ebf55e887a81fe64f66c6ca25707eadbfb9e8bf4d0b8ea073c987a2
+EBUILD gnome-system-monitor-3.24.0.ebuild 976 SHA256 366512f27fe7100b8d8ebcbd7fffa0e0656a2a7164cc819f2d3260c0bee0c157 SHA512 c8c659d3fdc23aae7f4e077a5fc9aa8aba7cafa05b4ef82c00cbaa7c35e27bcecb4aa7f0de79c3cab5789df288ad4ee8391a94cf3052cac245cb9d78bb9090fc WHIRLPOOL c2b91ad4a71ddd6ca87c6d96546d8a9a62ffcc27d50ab994d7b7e4cd8306d2ba2d0c91de3b6ea4c3c26ba8e18a762504f7d2295b39f696b7c26ebc50b841c7c1
+MISC ChangeLog 5056 SHA256 147b5bd4751cb8f3550f41923aea75ac4de2672ec986afbe34351bd133f5cbae SHA512 7ebdbf8df98d08b45c5d28e2ccac67bb8aa917cbf844cac3142935da060036614bab63b4ab9f35757c068f0b7ac84c0c48170a3fef06533b70598b15836cffb1 WHIRLPOOL c1b258c1bf5ac8e4c7c9a41f034d823103f7a2039d2681ad030428b5ec774dc7fbd1de946bb9c200e68057178ab6b604fc221304289f34a1f978233dbefe9271
+MISC ChangeLog-2015 37991 SHA256 619bddaaa9f7fb48d8632d8eabf7bf5f16f162f32a4867397628269a5517bccb SHA512 6c697dae9fb8d63e9a6e16b76eaef19373eb6ba851b6a185bc5b6de868d60aca9401187e0106e4ac0b7f28b69f4ae51b193a9b5417583fefa414be0fc470e2f1 WHIRLPOOL 2814df9e508160791456345edad0a83f74363b65ad1b0237ac9909ea494a4ebe71b9cc827b1bf6428ab53011332e89742db23fdbaeb6971201ccc6c1dcd38afa
+MISC metadata.xml 378 SHA256 760054d80e510146d9d3e573767da99e172db09ecf618be0656884da0f540ecf SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88 WHIRLPOOL 359ca2373ecc800993c242481244c3ce6b59040f219005b064c91b40741a2490791d881c66c16993ece9641377050db99b19e0507ce82667a4688f822ac21825
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild
new file mode 100644
index 000000000000..62a944fda1f1
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	>=gnome-base/libgtop-2.28.2:2=
+	>=x11-libs/gtk+-3.12:3[X(+)]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/glibmm-2.34:2
+	>=dev-libs/libxml2-2.0:2
+	>=gnome-base/librsvg-2.35:2
+	systemd? ( >=sys-apps/systemd-44:0= )
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.41.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# XXX: appdata is deprecated by appstream-glib, upstream must upgrade
+	gnome2_src_configure \
+		$(use_enable systemd) \
+		$(use_enable X wnck) \
+		APPDATA_VALIDATE="$(type -P true)"
+}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
new file mode 100644
index 000000000000..807d3e553975
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	>=gnome-base/libgtop-2.28.2:2=
+	>=x11-libs/gtk+-3.22:3[X(+)]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-libs/libxml2-2.0:2
+	>=gnome-base/librsvg-2.35:2
+	systemd? ( >=sys-apps/systemd-44:0= )
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.41.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# XXX: appdata is deprecated by appstream-glib, upstream must upgrade
+	gnome2_src_configure \
+		$(use_enable systemd) \
+		$(use_enable X broken-wnck) \
+		APPDATA_VALIDATE="$(type -P true)"
+}
diff --git a/gnome-extra/gnome-system-monitor/metadata.xml b/gnome-extra/gnome-system-monitor/metadata.xml
new file mode 100644
index 000000000000..f4a330c0bbf8
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="systemd">Display <pkg>sys-apps/systemd</pkg> metadata, e.g.
+		unit names, for running processes</flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
new file mode 100644
index 000000000000..c13e153c55e6
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -0,0 +1,8 @@
+AUX gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch 1029 SHA256 fc4b0937abe4186901d8d0605a99c3839ed5291351a44519e9360653afcf0409 SHA512 55bfacefeef6581dd42e1e3f8474196cd29d4eea8ad83c7b33bac5757854e0f946927ccf25cd09e0f93b971361c6ff3896772e0aa18f4dfec9c77c11a73cf147 WHIRLPOOL 9eac5c17e4eec6d16688f1faebb45502e02d8389277041fa2abe8fd4a01d220f016bbb3a964e10def3c6dcbaa263982ad4a54bad44c510713bb8504ce29728be
+DIST gnome-tweak-tool-3.22.0.tar.xz 260132 SHA256 3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb SHA512 c63c2c61787c78e2e25077cc83b28ae49bffd9e7c39aa78ebd93587ba9640275083f46273cb55986bcc46842449a31f38b77f0e9be69cea551218fd160f6d769 WHIRLPOOL 020c7f87a321558bc9addbd4bced797c458a71834edf6e11d9b40893d03ec9cc57b203d4aba3f3092d549ffcd9b1d96a080ea034ed97752dba8e445cb269e67e
+DIST gnome-tweak-tool-3.24.1.tar.xz 261872 SHA256 19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd WHIRLPOOL 3399af3fefe226c10f51a42e7f3231e2cf7c3b22840694a2671651bcc3ee4366bec3c973be7240020ffe1cdb1b07aae29f1a4b5c9ab4775c53cc505115a92c6d
+EBUILD gnome-tweak-tool-3.22.0.ebuild 1649 SHA256 c95c86cfb6c30bbbd178424c026c60304f5155638c9031dd2d556f8989bff505 SHA512 50154ce71b3504ea9aff6797031cf9dec2209def242a701d8a05215a1dc80cf5fc8508456641776ab409da984a8af0e931d7ef2f0319d53ee51bca63d6126a8a WHIRLPOOL bdff36af0689441eb6a1dc3fa1d8368e92673d3bc54197f655384ae8fc5dafd43ac73572c5b9c9155cc54758d9ac4eb1b0c2c889c865e7ca340caea7228501b1
+EBUILD gnome-tweak-tool-3.24.1.ebuild 1584 SHA256 492a8abcc836929b1d72308ebbc730a5bfe3ae3ed2354b6cd8da9ae8350f4317 SHA512 acd8d11d43de2f2c406ad4b7733e96979395cc268fc53223eaafa7583572ac37ac2c27903f01b6c30341414e11d44371b96b6393dddd01040236fcb0993ed318 WHIRLPOOL a52b0039d352fc9103e5b52aba2d1fe62e82a83ade7e5b3cd9a46e44a271e1c70aae37d89941e3afa30a4262cdad1bc290baca568906a88c98ceaf21a67cbb20
+MISC ChangeLog 6042 SHA256 2a6184dba042a0d2ca5376894b87439cc129464b6af81e543d585271193d171c SHA512 caeef57ce07ad888f743f32e3012f1194b353de09a0ee87a73dc410bea3a0dec938b28a0d8fb7fc02908946c6cb3eece3b76935b89412ed906e32d08d0c8a4fa WHIRLPOOL 796e943c2174813dfdca447e8024fe0c42a8fa97328d7f4c34eea1e85d8ce9b98b82e91db1b04e0884fbef4619ba42bbccabe62fe67f9c9bd0bf4e47e8f96418
+MISC ChangeLog-2015 8114 SHA256 84052d569120e635aa4ffedf985331214e0096182286bddc8e1ab895b0f84401 SHA512 019d2f6f5795768496481d90e04545cc27c80936a519ff9731a4631f0fbe4ba7ced930ac8552c6f2620bf08c4e4860276cfe4b1844db2766fafae8e1e869fa6e WHIRLPOOL dd7854cdbd6a813c90639a9621d02bc5c5d193e20f52ed8f7b00362e4e7d224a8a03c42fc12e2da5087a07e27efe77fa1d43c8971f8687c165953ebad3166e74
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch
new file mode 100644
index 000000000000..b65a713277b0
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch
@@ -0,0 +1,26 @@
+From c848d45b0697a6ac3661dbf3fbd356864e8b4e24 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Tue, 15 Jan 2013 17:23:12 +0330
+Subject: [PATCH] gentoo-cursor-themes
+
+---
+ gtweak/tweaks/tweak_interface.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index b20a41c..2125d59 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
+@@ -69,7 +69,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
+             **options)
+ 
+     def _get_valid_cursor_themes(self):
+-        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
++        dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
++                 os.path.join(gtweak.DATA_DIR, "icons"),
+                  os.path.join(GLib.get_user_data_dir(), "icons"),
+                  os.path.join(os.path.expanduser("~"), ".icons"))
+         valid = walk_directories(dirs, lambda d:
+-- 
+1.8.1
+
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
new file mode 100644
index 000000000000..91fd458f0e89
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Tool to customize GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+
+# Newer pygobject needed due upstream bug #723951
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/glib:2[dbus]
+	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+"
+# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
+	>=x11-libs/gtk+-3.12:3[introspection]
+
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gnome-settings-daemon-3
+	gnome-base/gnome-shell
+	>=gnome-base/nautilus-3
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Add contents of Gentoo's cursor theme directory to cursor theme list
+	eapply "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
+
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	install_python() {
+		gnome2_src_install
+		python_doscript gnome-tweak-tool || die
+	}
+	python_foreach_impl run_in_build_dir install_python
+}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
new file mode 100644
index 000000000000..ad1a344271fc
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Tool to customize GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/glib:2[dbus]
+	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+	>=gnome-base/gsettings-desktop-schemas-3.23.3
+"
+# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
+	>=x11-libs/gtk+-3.12:3[introspection]
+
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gnome-settings-daemon-3
+	>=gnome-base/gnome-shell-3.24
+	>=gnome-base/nautilus-3
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Add contents of Gentoo's cursor theme directory to cursor theme list
+	eapply "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
+
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	install_python() {
+		gnome2_src_install
+		python_doscript gnome-tweak-tool || die
+	}
+	python_foreach_impl run_in_build_dir install_python
+}
diff --git a/gnome-extra/gnome-tweak-tool/metadata.xml b/gnome-extra/gnome-tweak-tool/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
new file mode 100644
index 000000000000..ffcd5cd5528b
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-user-docs-3.22.0.tar.xz 14148700 SHA256 7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc SHA512 d81768b1c2bb5e32fa6d81358dc8fce24d1a6af4a01553c30879a73afb86bde8ece513f5bd08df9fd1bd4e8cc545ee49f2f072391eed13703d804f73c71c696e WHIRLPOOL 55f7b2a79fb4040b2d8f353fea0a2d4f45a8aa315d6934501ced1bd258c011fe9827743060f79ea4a77f04cd0971041ff272c822e68f76c262e03fc70b1bdc46
+DIST gnome-user-docs-3.24.2.tar.xz 14167700 SHA256 c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f SHA512 7725ceb6d079d244f9f764c54b2d374588a808c8f1b2e70f655e1d3e3dc957cab3a8edcfe3d000c5d4520e9d9da031585a20ade978b66753ef3b2c912230a87d WHIRLPOOL 954757569efa4de1eadc237dba29ebb69a9d64a4a490b9d676d032e483dddefa03cbc402bcf1fb18fee6702b7765a4f39d0247bbaa7edf740b24b6ae8cd9b107
+EBUILD gnome-user-docs-3.22.0.ebuild 936 SHA256 c747e5e3c8a55dc2fe3f2f7bbd957b0edbe321514e796b358e300d844c7a3ba9 SHA512 c551a2e2598aad54bb3a6b99c1aceeae23013a432ea5e1d5c3fa0eda39eb53e9177056ba426263b45bd6cc9337cc160046bb74b7eb5b4fd9d4ad07a25bcb787a WHIRLPOOL 91d2540f75f7a0f3eb5bcee9fcf92b7dbd212c7fb90af9cc837d8c6fdba2727df66f121d14a02122ef6b72c9bf3ed2a914c4a651010bfc6c56125b83a0e9f7d6
+EBUILD gnome-user-docs-3.24.2.ebuild 938 SHA256 a007e2613cfa88da992b9f31be7bc1187dfbb305a1e1c0be483f53b73b3a1160 SHA512 a139e769889f92e049bb061551a04c88942c5836ab657225bbb2303fb8bc40c42fc0d58476ee59e2ff31fa29c0ced9c61ac2ae29d298592da4e1d7a25b34d458 WHIRLPOOL 8d96562e21e5b9f8832646054983dfabe25139b955d6a66e17c866eb86fe853012bb2d80a1b6d1bb3f6b8408052773b18e8b051e01ba64c229dc5da6d3cfa6c4
+MISC ChangeLog 4517 SHA256 145f1a63688f73dc4e8360660272d0657eec1ce482fecc0aa14b712b74c66983 SHA512 7d5cf0a25da5845ec3e56306d5a0adf5bafd3f7e120fde0b822297e13b3584a7695568761822febce7c75075ac5d82c691f9ea84b51ec4bd4adf6ea38f90965f WHIRLPOOL 5eb9c9be71782c099f54abc9e66d251fac2cfe1739f416ed4a59d0eb4a159d81a3fd9e9a96e4672a1953f9dae517d8b383f8ea3227adaa63032e3053dfcf2c7f
+MISC ChangeLog-2015 25026 SHA256 9ca7a5b08696be378ba94a8b59ac17f688e4a277257e80f603d2b5a9bda1cdaf SHA512 a1293c170513238574975d5933016cf5ed24d55a4c5b6b190cf9465231ba62084c38c427b591a7462cdf794eb9867c891f7bc704e46c0d8ddbccf995ca436b1c WHIRLPOOL 9e0bbc44101e853efc6a2937461caa2e61851f8f8d08f62880bcde5184f1bce40d105b1b0428a2a50ba23328bd60e954db425c30cd851678e0b045506310fa45
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
new file mode 100644
index 000000000000..64d032ba5168
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
new file mode 100644
index 000000000000..c0d96a974619
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/gnome-user-docs/metadata.xml b/gnome-extra/gnome-user-docs/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
new file mode 100644
index 000000000000..5c829c646c71
--- /dev/null
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -0,0 +1,6 @@
+AUX gnome-user-share-3.18.1-no-prefork.patch 553 SHA256 55208c3b3a17a579753cff8fa9b330c6f2ee0b82deb74966109bcdc75a93edf2 SHA512 f1a8156d09e0f7dad2422b79000f34843567a7e0b66838774e03576a81cc243a52e0bf52d88bf7be98f2454e3119b3080a6c72c1320faf6ab5e4494d7be4fe0b WHIRLPOOL 361058bc25c433736b7fee453b080a997c1095aeac30a2dd7bc7736d5f536e68e0f34d1a1bfd0d34808ff8f760b53cc36d6fb9ea49f2d09cf19b7b59456c2ff5
+DIST gnome-user-share-3.18.3.tar.xz 347528 SHA256 3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1 SHA512 3f8da3cc6f73aa612883252982fac0c53e35184ac0d31f210b525fd04dd8dbffb3f7be4c331309ea9df6a712000eb2d29f75224505c822cffc11b3d435e17991 WHIRLPOOL ea8b00b4be1907ea19bff09d53a6cd62171daca3cb55e0cf2cdc3ebe3fd77c0fccbdf9592059664cd3f0d6248a34949d2a13214b9f6cac2cfc2e9cd794a72d80
+EBUILD gnome-user-share-3.18.3.ebuild 1338 SHA256 2de6b3fe9061316eed7ebea06d6992124fa4b2625bdd2975d8299ab5abc1dbcf SHA512 0fc7927a387ad1a2f6f8d3ea0fed37d9ece10d76832905659bf6addf9047100f688bf38ee0cc409482fb4f73b3e3e28f53f91038834ef4af0cd07d742b5927a0 WHIRLPOOL 3840b5cdf77b17735faa09500ca770fcefdaf0b4c6595942ba2c3a76b3527fa749eab317e776717642aeca66fd29bb379111ff1881671cbdfac40b185755c6c3
+MISC ChangeLog 5334 SHA256 40235e4f1ef3006bb1faded667ef8311b2e548497fa07c814dc10c068436dd6b SHA512 facf042e283482c7ad3e9a35d50341702cb356540eaee220138c53e930fbdda8cc3cdd7e9ce9f00e1cb2fd0f2570acf7d50cd5662a4ffff097afbbfb9884d81b WHIRLPOOL 097b03c8a03d642854d4e173f10eb86c10a6f26fa9b8fbbe056755fa26e35e2e09908e800117a2fbd5964ee7ff5e296b94932c50a056c17f7ace3a3bc46224e2
+MISC ChangeLog-2015 7530 SHA256 409855d396cb98f54d9e9c207adb0787a2d26daeee362515764b3ab393fb0f9e SHA512 7e150c648f09796fbe89dea248b16e9620cd187fc6c3d4f57809a341414db2438d8c05b42f42cb9fbde679f920f7b2492ad309421eec1a09c617685288efcc6a WHIRLPOOL 210eea0567e2a43b465ec727bf5251ed2162c38105580ed6ba29032066a3bfc7aec3b196b081c5bbdfeebf10b9b249cac8ea37862b24a1ff3233962fc7e63780
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
new file mode 100644
index 000000000000..156721d286cf
--- /dev/null
+++ b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
@@ -0,0 +1,10 @@
+--- gnome-user-share-3.14.2/data/dav_user_2.4.conf.orig 2015-06-03 20:21:27.512774376 -0600
++++ gnome-user-share-3.14.2/data/dav_user_2.4.conf      2015-06-03 20:21:33.588774303 -0600
+@@ -9,7 +9,6 @@
+ LimitXMLRequestBody 100000
+ 
+ LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
+-LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
+ LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
+ LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
+ LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
+\ No newline at end of file
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
new file mode 100644
index 000000000000..c102ec8b6bba
--- /dev/null
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib systemd
+
+DESCRIPTION="Personal file sharing for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# FIXME: could libnotify be made optional ?
+# FIXME: selinux automagic support
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/nautilus-2.91.7
+	media-libs/libcanberra[gtk3]
+	>=www-apache/mod_dnssd-0.6
+	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+	>=x11-libs/libnotify-0.7:=
+"
+DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-3.9
+	app-text/yelp-tools
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Upstream forces to use prefork because of Fedora defaults, but
+	# that is problematic for us (bug #551012)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
+	"${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/gnome-extra/gnome-user-share/metadata.xml b/gnome-extra/gnome-user-share/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-user-share/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
new file mode 100644
index 000000000000..c024dde9fe7e
--- /dev/null
+++ b/gnome-extra/gnome-utils/Manifest
@@ -0,0 +1,4 @@
+EBUILD gnome-utils-3.8.0.ebuild 605 SHA256 e5ae69cb96e3995da09533690df78df17d0165a412acadb5898ba0a25c64bbc1 SHA512 aff6dccc6bdbbed252313f9904aebdadb77be9a19772250a2f7bed50b46b6a8485ca3efcc957c5f3f866fba93ad3988385cf5e237d22d2158c7e1ada262b70f4 WHIRLPOOL 5a74ed974babdb4482155eb973acc64765b1e0edfbae6d4d916ad2f7ea0e010bce67358c899e67ced910afbcf3f7b2639d8472537aae8282ca5dc2dc79138b39
+MISC ChangeLog 2442 SHA256 81b5b0d00790e409cec6b78c23b04f8ebb4b5e8f677db430b497a8a50af7ab10 SHA512 05d627279bfc049c8d7c61c5f1ad8a273d121cf6211f3b40a384e44eb75fba649e45fdf1a0649d54421661c69d13d1e0ad3879bff60258fbc38e5738eb0aaffc WHIRLPOOL 17d0f5abef5f1e3f1b8b69de0f3c43fda65396751a9757daad5fc842b4fc5f1c9bbdee273d74887821acdc0f7c737630ba5f9fb7e053ec6ea0c8a77558aa4656
+MISC ChangeLog-2015 31264 SHA256 3ef51a6a3943a1967f490deb80088525cac7dbc94b858c1afc1a66760432e9eb SHA512 296727c43c98330f9e31c5a521b82569ff03e1d4328ce5dc739e7e1869cd11ba77154f9a1d9648fa5a3dff4dd1f8e9c63e43174a9730609b1a1e62a939923592 WHIRLPOOL a0984e636d94901e50839aafa18e5270a0d556c954ea8612d564b5e240b5cf5d3024301b702d2a4e7dce60f4f5cb538e26f5cec3def7bc3f9a81ae4255147ef1
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
new file mode 100644
index 000000000000..a7a82db68fee
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Meta package for utilities for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
+
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND="
+	>=app-admin/gnome-system-log-${PV}
+	>=app-dicts/gnome-dictionary-${PV}
+	>=gnome-extra/gnome-search-tool-3.6.0
+	>=media-gfx/gnome-font-viewer-${PV}
+	>=media-gfx/gnome-screenshot-${PV}
+	>=sys-apps/baobab-${PV}
+"
diff --git a/gnome-extra/gnome-utils/metadata.xml b/gnome-extra/gnome-utils/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-utils/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
new file mode 100644
index 000000000000..3f2b154f026a
--- /dev/null
+++ b/gnome-extra/gnome-weather/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-weather-3.20.2.tar.xz 5360264 SHA256 7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b SHA512 3c592726949251d4deae6412592975d6439dccf3415df1ac2bff75ee97ef9fb927167ceee0835ef4d1d3205038340c20d9e9b2261205412341baeb4098c9fdff WHIRLPOOL 7f78ecbf6c035beac8bca4bf89828b12de0f301ac5e7d18aa8740b9d260cdf43b76e4e7727986001c1876d0d3328d658042b02bce1d56935ea34747248fc7d5a
+DIST gnome-weather-3.24.0.tar.xz 5358924 SHA256 e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574 SHA512 c286c97dc1cbb4991e56ed49e8c788c6a58f0f0dcd5534812ee3e06a0570fd1bb0b45f7e35bdc11443f62dc3a2cd262db4f3d2b1f238cfc24236de88de4a4bce WHIRLPOOL cdb908d42af29719c06d0f84949065730e4da249b3e4cd525887f2570164a78fcb334f9be0f65440395031df11e2171829601af32d22bb7797c697ab92521388
+EBUILD gnome-weather-3.20.2.ebuild 1081 SHA256 c009ce4365d97f7a5da57338fafe20ec2ece13247376a4fe69f36b5951fee5b3 SHA512 69ef257d0b5329843e87cc09260f25b8b9453c3cff34d83be05aa4799be34f994cef75b7cf974365766d5e0acdaf8c7b0f125d758a0bf7f89da34cdf2a162f3f WHIRLPOOL 57fa27abd5e465dfcbf0093ecbb2bbba8869d1febd47e065f2e824588d648aa5c7584d084ad7d8b71032808274df30a38c2c65fafd35eb3b7dcd365b376056d8
+EBUILD gnome-weather-3.24.0.ebuild 1083 SHA256 4459179e5b920b30a47ed8c42eb8bc1c5ec353f2ec9e119bddc7505793dfef3f SHA512 7a13e6f5675449c93f796c1044be27516f02300e3342c4f6f84966917afc2fb56f1a8b2e6b2b62266d0ff642625af254cc39c0d87ceaf897dda7ac05adde2fb1 WHIRLPOOL 1ad9df2b8a3b4dab3eaafba85e39364e8b483007b7bcb6648229788e8ed297af9bfed5985093a32a43905e6ebc95c61aa706f71d931d110e941395920f65d92d
+MISC ChangeLog 4784 SHA256 6107edf90941432362a5f3a17acd9b3180bfbd839c8a90d66b05add22d1ef7c0 SHA512 01f8407d7b2f15d3fe0cc15c2adc73847cc4d4a49161dbd3d9b5ed85f47580aec82dee6b3ac8c08ffafed13b934e76dcf242cc603900d34785e70c51c5fc808b WHIRLPOOL 130903d06c2553b21a9e9f0ac94331b75860b102d8cd7fc92be2d72361ecc8cbcd927fe72035c96b35cad1f12d2623dfa5bddaf2631aa2e4b26e5d4bdf0c83cd
+MISC ChangeLog-2015 2770 SHA256 510432139e20f57f1664fadb161835375345bb2ca9d16656c80b46a187c34711 SHA512 4a933e27e7f3e65f8fed72eb243054eb97e77d06666b8b7c0051af8f65502c5dd02bef2f3c98a1ca3f7fceb83111612069e4ffe9979dfdeea00d1eccad94495b WHIRLPOOL 5d7aefcb0dd6f9cc759127c2209e524d673363874907151affbf092021a8e6418e8788b045f2a220353585401d9e3505ee541a73a1ce8b0235b9baa8f91883c6
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild
new file mode 100644
index 000000000000..bcd6d19ffa36
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A weather application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libgweather-3.17.2:=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.11.4:3
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
+}
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
new file mode 100644
index 000000000000..298f8403247c
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A weather application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libgweather-3.17.2:=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.11.4:3
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
+}
diff --git a/gnome-extra/gnome-weather/metadata.xml b/gnome-extra/gnome-weather/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gnome-weather/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gpointing-device-settings/Manifest b/gnome-extra/gpointing-device-settings/Manifest
new file mode 100644
index 000000000000..60caa8020409
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/Manifest
@@ -0,0 +1,12 @@
+AUX gpointing-device-settings-1.5.1-crash.patch 1097 SHA256 84dbd85a86fe05892f035a367271fc633f589742ad62510df94357aae5dfa3d9 SHA512 6c4da6cdd9bcc2735737643f54aa6d361a23e9a588189db7a0047d4426b023a329b7078cb12c9fb1787fe4489a7d35b0cc31703b2596738494d76ea900283aa8 WHIRLPOOL 74a1a639438a3a3da1cdc4e949018cc890631ed88f7c6cba9e604fe047c72ce1b98cdbee110dc77329844bd00f1c0343d421e34e3e851c3b0ca5d08e0c571fc5
+AUX gpointing-device-settings-1.5.1-fix-build.patch 1167 SHA256 b4ab1bcbaa0b16ea7b369eb225ae5c800e356b0d9c4bd2e5c788994522aad9b6 SHA512 ec0e5636b557aa95ae93422fb06e8137acbaeede6a6b9f2936a84c53c032f8c4c0200728141f774fe49532c8288b5bb3c840e5e9d22e471af7ccef9109d85488 WHIRLPOOL ee3f204b87bdc51c206c9d4f890296a529ac53f4661a9f88e0fd6fbf4d82eb4a46e4b91e493ec53e2b444917847ae8999ba034942eb5a44c4d5167d5639003fd
+AUX gpointing-device-settings-1.5.1-gsd-3.2-fix.patch 933 SHA256 f2f7ad87b538d70ba87f1e07731589723ddc2c95543148fa4676965ecda553ec SHA512 ea9fd1e61c0455e38c8d36f147e1b44cf07b400e90a57f2544722d93030be1bd9ea31498e77ea17726ab277bfe064b62985e28b2963ff61513312627d7e23daf WHIRLPOOL bbf3066e551fe3ef746849ed8947dc9fce8043bea2e89fe41b88336f668a4d502ce6ceca390e068a1dd17244c8587c0b0209b6a8d5a94859b0590e6f7a2daf27
+AUX gpointing-device-settings-1.5.1-gsd-crash.patch 2062 SHA256 73260c4d4e4b4d1c6e8493fba77841fd57101019a3416d2a7bc1609f8d7ba3fd SHA512 c81c13950673bcdb6b47b94d591776efc0b9c037559d132bb17d40369b82f190b6280351e8998d2be0046090a5235dcb67253bbcd34777f23ff340c84796eff6 WHIRLPOOL 726f31d0f1f2266ded4ec7e558b8f96a6b1f7bf868df456242da5797b1ce5f4820dd6c5a0489e35cfdc0b466c9fbbd4975ee3a739ecef0208ede31181f8e04fe
+AUX gpointing-device-settings-1.5.1-gtk22.patch 8272 SHA256 b8fa0c56351d6bd65a3709e34d10903bee1c761fe1b57acefdff3c03a4e6553a SHA512 5650ceaa6e369a331e4e171a2d920167a208a1b73621419879079d53e4ee0cc4210401d0879e40d3fceefca39cf6fc391ee01a8e7a81d25bbc14b560fa83c8fb WHIRLPOOL f070b3ecf3f997d9d2cc3833fbcfdfc1e5adef4f160c579c644ea825344f54771047a8bcb38efc5397d829fe56eea00492431926ece3d6564ca5f70d835bb6ad
+AUX gpointing-device-settings-1.5.1-plugin.patch 5068 SHA256 f74bb7c430ceafaccf31c783c252ccd1e911ef21c414d89ace687dabf0d0df2d SHA512 3bc8a461d33f95808f5e4473ab21db9a3c62011fffddc61ca8e6ebcec791ecc1c82b87bd54e7b5c77fa72e3f4e90e5ce951760b05be72c382ff8c5e06a6807f6 WHIRLPOOL f514c7d951745aee9743275dfa1b2d6d66f03cd6ac2f1e43d757570c10f0add5d49110ade868f3e101ebfe9059836b5c04532b2197c2d32ccbc8e91bf645d357
+AUX gpointing-device-settings-1.5.1-reboot.patch 9300 SHA256 bfddd39c350aeddd64de846c5bb37d54e23f72d525a183f3e5f56026196164b2 SHA512 f7d5f1ad8fbc9443aa89f237c92ac048a0316cef4944252f27c79a0f0aada65a30b7926776f6c3321fa03b50bab77af2f9f0e407fb80896338d46b3ac266f307 WHIRLPOOL 2ad41f0a0a16d3a873e5ff948ccd249c608ffbd22a34c90ee2d4f28958efcc5a97ce238a4a1844197bced1c5a67ab8cdf7f8d0217d05ff18f49337dd08e81518
+DIST gpointing-device-settings-1.5.1.tar.gz 458352 SHA256 cccdbb5cd3ea18b9458ca23fd3bfbdc98410917f2037472b08ac239dbd2639b3 SHA512 37bcecdde4da1714de1c0562d0ba8c875aa197a0b2fad55a868d659ad0ed6a37156b408e9ae07f95091391d972ceaa268636ee579f4a3f176203898b227e3b76 WHIRLPOOL 195eebdacd3e02452e7ce3d30c827ba194827427b6b70cdf824ac2dc27179aeeb65710587b3d0c8757819bb95c5c5edf52cd30e318480f005fb8ace2729238f4
+EBUILD gpointing-device-settings-1.5.1-r3.ebuild 1317 SHA256 9a029342bce0f69cb7b95a7237cc627ee3910ae7262d2916915231cb779884c8 SHA512 4eb0e212524fc489600f3de1afab32b54ce53ac98e14eff6c60979e22cc65587625fde7d662acb7ffd6d494927c7e020ba8232405ea9db2b4fcec51a09328568 WHIRLPOOL 072e679bb63a860afda2f034ca2571f3feb1a981373bd19bca834c9b872ad3ae1a8efe8eba620e6a080873519b5556484c0353b1d6f7b111e0960c1052603531
+MISC ChangeLog 2979 SHA256 7e66ae9ef157d8f46f81c109b88a78fe2f07c68c54cc6bc46ee1db71c387e29f SHA512 cda969ef3fd779eff5d83297d72b3a52b77e50dfc9b53f1edeadb5e557142df99b85d14b0911a4936ce57e3d0371d22284cf57f3d746662ab95c497ca04c1c90 WHIRLPOOL 1bbc13cddf955499b15dcf66dba484ced44ebd450f2206611fe351277e7249e4d25c2176d594d61e87a190ecd955a9881089e13eaebc6306eccfdbac93ca6711
+MISC ChangeLog-2015 4825 SHA256 770817d0e26d43efcfaf84fca3e54072862e2c01c666c017642936d6f3814648 SHA512 6993593799558cd495c0f457f02a558cde23a578701619921c4f80260754958484212e53bed0f62b6d8cee3579ac8dcb7339843157fc810746bf30f79445454f WHIRLPOOL 17751170d52c10d169f2b0c099ba98f22aad1481a8b5f2680edd565093666ed891dec5c2ff447300f7d6326e969d2304898665a2422f6f5f997ccfc22db5f0a3
+MISC metadata.xml 250 SHA256 776edbf34d72b937a0b5369af34bf3e25b20e18262e4ae2dfb504267e8845ceb SHA512 db3b134f1e0c0a92de7c23bd65eddb27b1291ef8624cf7f5bf3e40cf63edc5286459d385b2a09d58c244f253e953441980d1fad1b224f75a9d5cb32c38e3b95f WHIRLPOOL 34e0906d067817a910d057cf0832ef3dd2ec9f6d0e0fdcfd472d4957b7d44cdba9a629643867542956431a47d4b86e434744a030e0c2853ebbae7a8531d551c1
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch
new file mode 100644
index 000000000000..789925c0bc97
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch
@@ -0,0 +1,30 @@
+commit 70add06dec8413965f3e98b6ba9a3c82168ea72c
+Author: Hiroyuki Ikezoe <poincare@ikezoe.net>
+Date:   Tue Mar 16 19:56:17 2010 +0900
+
+    Fix crash.
+    
+    We need to get xinput property if there is no gconf value for tapping time.
+    
+    Fix for #613022.
+
+diff --git a/modules/gpds-touchpad-ui.c b/modules/gpds-touchpad-ui.c
+index 3bbcda6..a1cd31b 100644
+--- a/modules/gpds-touchpad-ui.c
++++ b/modules/gpds-touchpad-ui.c
+@@ -1067,8 +1067,14 @@ set_tapping_time_from_preference (GpdsUI *ui, GtkBuilder *builder)
+         }
+     }
+ 
+-    if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value))
++    if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value) && !values) {
++        if (!gpds_xinput_ui_get_xinput_int_property(GPDS_XINPUT_UI(ui),
++                                                    GPDS_TOUCHPAD_TAP_TIME,
++                                                    &values, &n_values)) {
++            return;
++        }
+         value = values[0];
++    }
+ 
+     double_value = value;
+     object = gpds_ui_get_ui_object_by_name(GPDS_UI(ui), "tapping_time_scale");
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch
new file mode 100644
index 000000000000..341d96fc9b50
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch
@@ -0,0 +1,26 @@
+diff -Naur gpointing-device-settings-1.5.1.orig/configure.ac gpointing-device-settings-1.5.1/configure.ac
+--- gpointing-device-settings-1.5.1.orig/configure.ac	2010-02-05 00:38:20.000000000 +0100
++++ gpointing-device-settings-1.5.1/configure.ac	2013-12-17 15:00:08.394574115 +0100
+@@ -3,10 +3,9 @@
+ 
+ AC_INIT(gpointing-device-settings, 1.5.1,
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=GPointingDeviceSettings])
+-AM_INIT_AUTOMAKE([1.9 tar-pax])
+-AM_INIT_AUTOMAKE([foreign])
++AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_PROG_LIBTOOL
+@@ -146,9 +145,6 @@
+ 
+ GPDS_CFLAGS="$XINPUT_CFLAGS $GTK_CFLAGS"
+ GPDS_CFLAGS="$GPDS_CFLAGS $GCONF2_CFLAGS"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DGTK_DISABLE_DEPRECATED"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DGDK_DISABLE_DEPRECATED"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED"
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\""
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\""
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\""
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
new file mode 100644
index 000000000000..c92f0bd54c95
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
@@ -0,0 +1,22 @@
+Fixes build failnure on gnome-base/gnome-settings-daemon-3.2.2
+
+ gsd-pointing-device-plugin.c:59:1: warning: 'gsd_pointing_device_plugin_class_finalize' used but never defined [enabled by default]
+  CCLD   libpointing-device.la
+  ld: .libs/libpointing_device_la-gsd-pointing-device-plugin.o: relocation R_X86_64_PC32 against undefined symbol `gsd_pointing_device_plugin_class_finalize'
+
+Gentoo-bug: http://bugs.gentoo.org/384001
+Patch-by: battle.jerboa@gmail.com
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2012-02-02 13:32:20.000000000 +0400
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2012-02-02 13:32:04.000000000 +0400
+@@ -214,6 +214,11 @@
+     plugin_class->activate = activate;
+     plugin_class->deactivate = deactivate;
+ }
++
++static void
++gsd_pointing_device_plugin_class_finalize (GsdPointingDevicePluginClass *klass)
++{
++}
+ /*
+ vi:ts=4:nowrap:ai:expandtab:sw=4
+ */
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch
new file mode 100644
index 000000000000..f694556b74ec
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch
@@ -0,0 +1,35 @@
+diff -ru gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+--- gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2010-12-20 01:29:09.204274003 -0500
++++ gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2010-12-20 02:15:21.652274002 -0500
+@@ -96,19 +96,21 @@
+         XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev;
+ 
+         device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL);
+-        if (notify_event->devchange == DeviceEnabled) {
+-            GsdPointingDeviceManager *manager;
++        if (device_info) {
++            if (notify_event->devchange == DeviceEnabled) {
++                GsdPointingDeviceManager *manager;
+ 
+-            if (has_manager(plugin, device_info->name))
+-                return GDK_FILTER_CONTINUE;
++                if (has_manager(plugin, device_info->name))
++                    return GDK_FILTER_CONTINUE;
+ 
+-            manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
+-                                                      device_info->name);
+-            if (manager) {
+-                gsd_pointing_device_manager_start(manager, NULL);
+-                plugin->managers = g_list_prepend(plugin->managers, manager);
++                manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
++                                                          device_info->name);
++                if (manager) {
++                    gsd_pointing_device_manager_start(manager, NULL);
++                    plugin->managers = g_list_prepend(plugin->managers, manager);
++                }
++            } else if (notify_event->devchange == DeviceRemoved) {
+             }
+-        } else if (notify_event->devchange == DeviceRemoved) {
+         }
+     }
+ 
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch
new file mode 100644
index 000000000000..154c54728540
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch
@@ -0,0 +1,201 @@
+diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+index 8a2d98f..ac0bcf1 100644
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+@@ -124,7 +124,9 @@ add_device_presence_filter (GsdPointingDevicePlugin *plugin)
+ 
+     gint op_code, event, error;
+ 
+-    if (!XQueryExtension(GDK_DISPLAY(),
++    display = gdk_x11_get_default_xdisplay();
++
++    if (!XQueryExtension(display,
+                          "XInputExtension",
+                          &op_code,
+                          &event,
+@@ -132,8 +134,6 @@ add_device_presence_filter (GsdPointingDevicePlugin *plugin)
+         return;
+     }
+ 
+-    display = gdk_x11_get_default_xdisplay();
+-
+     gdk_error_trap_push();
+     DevicePresence(display, xi_presence, class_presence);
+     XSelectExtensionEvent(display,
+diff --git a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
+index 2038d53..f47e0a4 100644
+--- a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
+@@ -348,7 +348,9 @@ add_device_presence_filter (GsdPointingDeviceManager *manager)
+ 
+     gint op_code, event, error;
+ 
+-    if (!XQueryExtension(GDK_DISPLAY(),
++    display = gdk_x11_get_default_xdisplay();
++
++    if (!XQueryExtension(display,
+                          "XInputExtension",
+                          &op_code,
+                          &event,
+@@ -356,8 +358,6 @@ add_device_presence_filter (GsdPointingDeviceManager *manager)
+         return;
+     }
+ 
+-    display = gdk_x11_get_default_xdisplay();
+-
+     gdk_error_trap_push();
+     DevicePresence(display, xi_presence, class_presence);
+     XSelectExtensionEvent(display,
+diff --git a/src/gpds-xinput-pointer-info.c b/src/gpds-xinput-pointer-info.c
+index d38afad..ce9a952 100644
+--- a/src/gpds-xinput-pointer-info.c
++++ b/src/gpds-xinput-pointer-info.c
+@@ -55,7 +55,8 @@ gpds_xinput_utils_collect_pointer_infos (void)
+     XDeviceInfo *device_infos;
+     gint i, n_device_infos;
+ 
+-    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
++    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(),
++                                     &n_device_infos);
+ 
+     for (i = 0; i < n_device_infos; i++) {
+         GpdsXInputPointerInfo *info;
+diff --git a/src/gpds-xinput-utils.c b/src/gpds-xinput-utils.c
+index 0f7ceea..5a3e3a2 100644
+--- a/src/gpds-xinput-utils.c
++++ b/src/gpds-xinput-utils.c
+@@ -41,7 +41,8 @@ gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error)
+     XDeviceInfo *device_infos;
+     gint i, n_device_infos;
+ 
+-    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
++    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(),
++                                     &n_device_infos);
+ 
+     for (i = 0; i < n_device_infos; i++) {
+         if (device_infos[i].use != IsXExtensionPointer)
+@@ -68,7 +69,7 @@ gpds_xinput_utils_get_device_info_from_id  (XID id, GError **error)
+     XDeviceInfo *device_infos;
+     gint i, n_device_infos;
+ 
+-    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
++    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), &n_device_infos);
+ 
+     for (i = 0; i < n_device_infos; i++) {
+         if (device_infos[i].use != IsXExtensionPointer)
+@@ -125,7 +126,7 @@ gpds_xinput_utils_open_device (const gchar *device_name, GError **error)
+         return NULL;
+ 
+     gdk_error_trap_push();
+-    device = XOpenDevice(GDK_DISPLAY(), device_info->id);
++    device = XOpenDevice(gdk_x11_get_default_xdisplay(), device_info->id);
+     gdk_error_trap_pop();
+     if (!device) {
+         g_set_error(error,
+diff --git a/src/gpds-xinput.c b/src/gpds-xinput.c
+index d8bd1a2..66634b3 100644
+--- a/src/gpds-xinput.c
++++ b/src/gpds-xinput.c
+@@ -100,7 +100,7 @@ dispose (GObject *object)
+     g_free(priv->device_name);
+ 
+     if (priv->device) {
+-        XCloseDevice(GDK_DISPLAY(), priv->device);
++        XCloseDevice(gdk_x11_get_default_xdisplay(), priv->device);
+         priv->device = NULL;
+     }
+ 
+@@ -199,7 +199,8 @@ get_x_error_text (int x_error_code)
+ {
+     gchar buf[64];
+ 
+-    XGetErrorText(GDK_DISPLAY(), x_error_code, buf, sizeof(buf) - 1);
++    XGetErrorText(gdk_x11_get_default_xdisplay(), x_error_code,
++                  buf, sizeof(buf) - 1);
+ 
+     return g_strdup(buf);
+ }
+@@ -273,7 +274,7 @@ gpds_xinput_set_int_properties_by_name_with_format_type
+     }
+ 
+     gdk_error_trap_push();
+-    XChangeDeviceProperty(GDK_DISPLAY(),
++    XChangeDeviceProperty(gdk_x11_get_default_xdisplay(),
+                           device, property_atom,
+                           XA_INTEGER, format_type, PropModeReplace,
+                           (unsigned char*)property_data, n_properties);
+@@ -383,7 +384,8 @@ get_atom (GpdsXInput *xinput, const gchar *property_name, GError **error)
+     if (!device)
+         return -1;
+ 
+-    properties = XListDeviceProperties(GDK_DISPLAY(), device, &n_properties);
++    properties = XListDeviceProperties(gdk_x11_get_default_xdisplay(),
++                                       device, &n_properties);
+     for (i = 0; i < n_properties; i++) {
+         const gchar *name;
+ 
+@@ -427,9 +429,9 @@ gpds_xinput_get_int_properties_by_name (GpdsXInput *xinput,
+         return FALSE;
+ 
+     gdk_error_trap_push();
+-    status =  XGetDeviceProperty(GDK_DISPLAY(), device, atom, 0, 1000, False,
+-                                 XA_INTEGER, &actual_type, &actual_format,
+-                                 n_values, &bytes_after, &data);
++    status =  XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, atom,
++                                 0, 1000, False, XA_INTEGER, &actual_type,
++                                 &actual_format, n_values, &bytes_after, &data);
+     gdk_flush();
+     x_error_code = gdk_error_trap_pop();
+     if (status != Success || x_error_code != 0) {
+@@ -523,7 +525,7 @@ gpds_xinput_set_float_properties_by_name (GpdsXInput *xinput,
+         *(property_data + i) = (gfloat)properties[i];
+ 
+     gdk_error_trap_push();
+-    XChangeDeviceProperty(GDK_DISPLAY(),
++    XChangeDeviceProperty(gdk_x11_get_default_xdisplay(),
+                           device, property_atom,
+                           float_atom, 32, PropModeReplace,
+                           (unsigned char*)property_data, n_properties);
+@@ -594,7 +596,8 @@ gpds_xinput_get_float_properties_by_name (GpdsXInput *xinput,
+         return FALSE;
+ 
+     gdk_error_trap_push();
+-    status =  XGetDeviceProperty(GDK_DISPLAY(), device, property_atom, 0, 1000, False,
++    status =  XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device,
++                                 property_atom, 0, 1000, False,
+                                  float_atom, &actual_type, &actual_format,
+                                  n_properties, &bytes_after, &data);
+     gdk_flush();
+@@ -676,7 +679,8 @@ gpds_xinput_get_button_map (GpdsXInput *xinput,
+     *map = g_new0(guchar, *n_buttons);
+ 
+     gdk_error_trap_push();
+-    status =  XGetDeviceButtonMapping(GDK_DISPLAY(), device, *map, *n_buttons);
++    status =  XGetDeviceButtonMapping(gdk_x11_get_default_xdisplay(),
++                                      device, *map, *n_buttons);
+     gdk_flush();
+ 
+     x_error_code = gdk_error_trap_pop();
+@@ -705,7 +709,8 @@ gpds_xinput_set_button_map (GpdsXInput *xinput,
+         return FALSE;
+ 
+     gdk_error_trap_push();
+-    status =  XSetDeviceButtonMapping(GDK_DISPLAY(), device, map, n_buttons);
++    status =  XSetDeviceButtonMapping(gdk_x11_get_default_xdisplay(),
++                                      device, map, n_buttons);
+     gdk_flush();
+ 
+     x_error_code = gdk_error_trap_pop();
+diff --git a/test/test-xinput-utils.c b/test/test-xinput-utils.c
+index a06dcbc..f97f9d4 100644
+--- a/test/test-xinput-utils.c
++++ b/test/test-xinput-utils.c
+@@ -29,7 +29,7 @@ void
+ teardown (void)
+ {
+     if (device)
+-        XCloseDevice(GDK_DISPLAY(), device);
++        XCloseDevice(gdk_x11_get_default_xdisplay(), device);
+     g_clear_error(&error);
+     g_clear_error(&expected_error);
+ }
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch
new file mode 100644
index 000000000000..3e8612d96a53
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch
@@ -0,0 +1,107 @@
+commit 255334e6749ec4d4358e627dc6693b4159aaf912
+Author: Hiroyuki Ikezoe <poincare@ikezoe.net>
+Date:   Fri Mar 12 19:13:54 2010 +0900
+
+    mouse extension -> pointing device.
+    
+    Why did I use this weird name?
+
+diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+index db4dd8e..31dd336 100644
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+@@ -29,34 +29,34 @@
+ #include "gpds-gconf.h"
+ #include "gpds-xinput-pointer-info.h"
+ 
+-#define GSD_TYPE_MOUSE_EXTENSION_PLUGIN            (gsd_mouse_extension_plugin_get_type ())
+-#define GSD_MOUSE_EXTENSION_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdMouseExtensionPlugin))
+-#define GSD_MOUSE_EXTENSION_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass))
+-#define GSD_IS_MOUSE_EXTENSION_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN))
+-#define GSD_IS_MOUSE_EXTENSION_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN))
+-#define GSD_MOUSE_EXTENSION_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass))
++#define GSD_TYPE_POINTING_DEVICE_PLUGIN            (gsd_pointing_device_plugin_get_type ())
++#define GSD_POINTING_DEVICE_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdPointingDevicePlugin))
++#define GSD_POINTING_DEVICE_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdTracklassPointPluginClass))
++#define GSD_IS_POINTING_DEVICE_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN))
++#define GSD_IS_POINTING_DEVICE_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_POINTING_DEVICE_PLUGIN))
++#define GSD_POINTING_DEVICE_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdTracklassPointPluginClass))
+ 
+-typedef struct _GsdMouseExtensionPlugin GsdMouseExtensionPlugin;
+-typedef struct _GsdMouseExtensionPluginClass GsdMouseExtensionPluginClass;
++typedef struct _GsdPointingDevicePlugin GsdPointingDevicePlugin;
++typedef struct _GsdPointingDevicePluginClass GsdPointingDevicePluginClass;
+ 
+-struct _GsdMouseExtensionPlugin
++struct _GsdPointingDevicePlugin
+ {
+     GnomeSettingsPlugin parent;
+     GList *managers;
+ };
+ 
+-struct _GsdMouseExtensionPluginClass
++struct _GsdPointingDevicePluginClass
+ {
+     GnomeSettingsPluginClass parent_class;
+ }; 
+ 
+-GType gsd_mouse_extension_plugin_get_type (void) G_GNUC_CONST;
++GType gsd_pointing_device_plugin_get_type (void) G_GNUC_CONST;
+ G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+ 
+-GNOME_SETTINGS_PLUGIN_REGISTER(GsdMouseExtensionPlugin, gsd_mouse_extension_plugin)
++GNOME_SETTINGS_PLUGIN_REGISTER(GsdPointingDevicePlugin, gsd_pointing_device_plugin)
+ 
+ static void
+-gsd_mouse_extension_plugin_init (GsdMouseExtensionPlugin *plugin)
++gsd_pointing_device_plugin_init (GsdPointingDevicePlugin *plugin)
+ {
+     plugin->managers = NULL;
+ }
+@@ -104,10 +104,10 @@ collect_pointer_device_infos_from_gconf (void)
+ static void
+ activate (GnomeSettingsPlugin *plugin)
+ {
+-    GsdMouseExtensionPlugin *mouse_extension_plugin;
++    GsdPointingDevicePlugin *pointing_device_plugin;
+     GList *pointer_device_infos, *node;
+ 
+-    mouse_extension_plugin = GSD_MOUSE_EXTENSION_PLUGIN(plugin); 
++    pointing_device_plugin = GSD_POINTING_DEVICE_PLUGIN(plugin); 
+ 
+     pointer_device_infos = collect_pointer_device_infos_from_gconf();
+     for (node = pointer_device_infos; node; node = g_list_next(node)) {
+@@ -120,8 +120,8 @@ activate (GnomeSettingsPlugin *plugin)
+             continue;
+ 
+         gsd_pointing_device_manager_start(manager, NULL);
+-        mouse_extension_plugin->managers =
+-            g_list_prepend(mouse_extension_plugin->managers, manager);
++        pointing_device_plugin->managers =
++            g_list_prepend(pointing_device_plugin->managers, manager);
+     }
+     g_list_foreach(pointer_device_infos,
+                    (GFunc)gpds_xinput_pointer_info_free, NULL);
+@@ -129,7 +129,7 @@ activate (GnomeSettingsPlugin *plugin)
+ }
+ 
+ static void
+-stop_all_managers (GsdMouseExtensionPlugin *plugin)
++stop_all_managers (GsdPointingDevicePlugin *plugin)
+ {
+     GList *node;
+ 
+@@ -147,11 +147,11 @@ stop_all_managers (GsdMouseExtensionPlugin *plugin)
+ static void
+ deactivate (GnomeSettingsPlugin *plugin)
+ {
+-    stop_all_managers(GSD_MOUSE_EXTENSION_PLUGIN(plugin));
++    stop_all_managers(GSD_POINTING_DEVICE_PLUGIN(plugin));
+ }
+ 
+ static void
+-gsd_mouse_extension_plugin_class_init (GsdMouseExtensionPluginClass *klass)
++gsd_pointing_device_plugin_class_init (GsdPointingDevicePluginClass *klass)
+ {
+     GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS(klass);
+ 
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch
new file mode 100644
index 000000000000..1793bdfaa0a0
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch
@@ -0,0 +1,266 @@
+commit ff25a24d387887bc3bbacfb5bcaf2756695df096
+Author: Hiroyuki Ikezoe <hiikezoe@gnome.org>
+Date:   Sat Jun 26 19:55:40 2010 +0900
+
+    Watch DevicePresenceNotify event.
+    
+    Some devices are not reported by xserver at the time of startiung up
+    of gnome-settings-daemon, so we need to watch DevicePresenceNotify
+    event at that time.
+    
+    Fix for bug #609050.
+
+diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+index 31dd336..8a2d98f 100644
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+@@ -24,10 +24,13 @@
+ #include <gnome-settings-daemon/gnome-settings-plugin.h>
+ #include <glib/gi18n.h>
+ #include <gconf/gconf-client.h>
++#include <gdk/gdkx.h>
++#include <X11/extensions/XInput.h>
+ 
+ #include "gsd-pointing-device-manager.h"
+ #include "gpds-gconf.h"
+ #include "gpds-xinput-pointer-info.h"
++#include "gpds-xinput-utils.h"
+ 
+ #define GSD_TYPE_POINTING_DEVICE_PLUGIN            (gsd_pointing_device_plugin_get_type ())
+ #define GSD_POINTING_DEVICE_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdPointingDevicePlugin))
+@@ -61,44 +64,90 @@ gsd_pointing_device_plugin_init (GsdPointingDevicePlugin *plugin)
+     plugin->managers = NULL;
+ }
+ 
+-static GList *
+-collect_pointer_device_infos_from_gconf (void)
++static gboolean
++has_manager (GsdPointingDevicePlugin *plugin, const gchar *device_name)
+ {
+-    GConfClient *gconf;
+-    GSList *dirs, *node;
+-    GList *infos = NULL;
+-
+-    gconf = gconf_client_get_default();
+-    dirs = gconf_client_all_dirs(gconf, GPDS_GCONF_DIR, NULL);
+-
+-    for (node = dirs; node; node = g_slist_next(node)) {
+-        const gchar *dir = node->data;
+-        gchar *device_type;
+-        gchar *device_type_key;
+-
+-        device_type_key = gconf_concat_dir_and_key(dir, GPDS_GCONF_DEVICE_TYPE_KEY);
+-        device_type = gconf_client_get_string(gconf, device_type_key, NULL);
+-        if (device_type) {
+-            GpdsXInputPointerInfo *info;
+-            gchar *device_name, *unescaped_device_name;
+-
+-            device_name = g_path_get_basename(dir);
+-            unescaped_device_name = gconf_unescape_key(device_name, -1);
+-            info = gpds_xinput_pointer_info_new(unescaped_device_name, device_type);
+-            infos = g_list_prepend(infos, info);
+-            g_free(unescaped_device_name);
+-            g_free(device_name);
++    GList *node;
++
++    for (node = plugin->managers; node; node = g_list_next(node)) {
++        GsdPointingDeviceManager *manager = node->data;
++
++        if (g_str_equal(gsd_pointing_device_manager_get_device_name(manager), device_name))
++            return TRUE;
++    }
++
++    return FALSE;
++}
++
++static GdkFilterReturn
++device_presence_filter (GdkXEvent *xevent,
++                        GdkEvent  *event,
++                        gpointer   data)
++{
++    XEvent *xev = (XEvent *)xevent;
++    XEventClass class_presence;
++    int xi_presence;
++    GsdPointingDevicePlugin *plugin = GSD_POINTING_DEVICE_PLUGIN(data);
++
++    DevicePresence(gdk_x11_get_default_xdisplay(), xi_presence, class_presence);
++
++    if (xev->type == xi_presence) {
++        XDeviceInfo *device_info = NULL;
++        XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev;
++
++        device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL);
++        if (notify_event->devchange == DeviceEnabled) {
++            GsdPointingDeviceManager *manager;
++
++            if (has_manager(plugin, device_info->name))
++                return GDK_FILTER_CONTINUE;
++
++            manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
++                                                      device_info->name);
++            if (manager) {
++                gsd_pointing_device_manager_start(manager, NULL);
++                plugin->managers = g_list_prepend(plugin->managers, manager);
++            }
++        } else if (notify_event->devchange == DeviceRemoved) {
+         }
++    }
+ 
+-        g_free(device_type_key);
+-        g_free(device_type);
++    return GDK_FILTER_CONTINUE;
++}
++
++static void
++add_device_presence_filter (GsdPointingDevicePlugin *plugin)
++{
++    Display *display;
++    XEventClass class_presence;
++    gint xi_presence;
++
++    gint op_code, event, error;
++
++    if (!XQueryExtension(GDK_DISPLAY(),
++                         "XInputExtension",
++                         &op_code,
++                         &event,
++                         &error)) {
++        return;
+     }
+ 
+-    g_slist_foreach(dirs, (GFunc)g_free, NULL);
+-    g_slist_free(dirs);
+-    g_object_unref(gconf);
++    display = gdk_x11_get_default_xdisplay();
+ 
+-    return infos;
++    gdk_error_trap_push();
++    DevicePresence(display, xi_presence, class_presence);
++    XSelectExtensionEvent(display,
++                          RootWindow(display, DefaultScreen(display)),
++                          &class_presence, 1);
++    gdk_flush();
++    if (!gdk_error_trap_pop())
++        gdk_window_add_filter(NULL, device_presence_filter, plugin);
++}
++
++static void
++remove_device_presence_filter (GsdPointingDevicePlugin *plugin)
++{
++    gdk_window_remove_filter(NULL, device_presence_filter, plugin);
+ }
+ 
+ static void
+@@ -109,7 +158,10 @@ activate (GnomeSettingsPlugin *plugin)
+ 
+     pointing_device_plugin = GSD_POINTING_DEVICE_PLUGIN(plugin); 
+ 
+-    pointer_device_infos = collect_pointer_device_infos_from_gconf();
++    add_device_presence_filter(pointing_device_plugin);
++
++    pointer_device_infos = gpds_xinput_utils_collect_pointer_infos();
++
+     for (node = pointer_device_infos; node; node = g_list_next(node)) {
+         GsdPointingDeviceManager *manager;
+         GpdsXInputPointerInfo *info = node->data;
+@@ -133,6 +185,8 @@ stop_all_managers (GsdPointingDevicePlugin *plugin)
+ {
+     GList *node;
+ 
++    remove_device_presence_filter(plugin);
++
+     for (node = plugin->managers; node; node = g_list_next(node)) {
+         GsdPointingDeviceManager *manager = node->data;
+ 
+diff --git a/src/gpds-xinput-utils.c b/src/gpds-xinput-utils.c
+index 48dc2a5..0f7ceea 100644
+--- a/src/gpds-xinput-utils.c
++++ b/src/gpds-xinput-utils.c
+@@ -62,6 +62,33 @@ gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error)
+     return NULL;
+ }
+ 
++XDeviceInfo *
++gpds_xinput_utils_get_device_info_from_id  (XID id, GError **error)
++{
++    XDeviceInfo *device_infos;
++    gint i, n_device_infos;
++
++    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
++
++    for (i = 0; i < n_device_infos; i++) {
++        if (device_infos[i].use != IsXExtensionPointer)
++            continue;
++        if (device_infos[i].id == id) {
++            XFreeDeviceList(device_infos);
++            return &device_infos[i];
++        }
++    }
++
++    XFreeDeviceList(device_infos);
++
++    g_set_error(error,
++                GPDS_XINPUT_UTILS_ERROR,
++                GPDS_XINPUT_UTILS_ERROR_NO_DEVICE,
++                _("No device found for %d."), (int)id);
++
++    return NULL;
++}
++
+ gshort
+ gpds_xinput_utils_get_device_num_buttons (const gchar *device_name, GError **error)
+ {
+diff --git a/src/gpds-xinput-utils.h b/src/gpds-xinput-utils.h
+index 9cc4564..74e491a 100644
+--- a/src/gpds-xinput-utils.h
++++ b/src/gpds-xinput-utils.h
+@@ -38,6 +38,8 @@ typedef enum
+ GQuark       gpds_xinput_utils_error_quark              (void);
+ XDeviceInfo *gpds_xinput_utils_get_device_info          (const gchar *device_name,
+                                                          GError **error);
++XDeviceInfo *gpds_xinput_utils_get_device_info_from_id  (XID id,
++                                                         GError **error);
+ XDevice     *gpds_xinput_utils_open_device              (const gchar *device_name, GError **error);
+ Atom         gpds_xinput_utils_get_float_atom           (GError **error);
+ gshort       gpds_xinput_utils_get_device_num_buttons   (const gchar *device_name, GError **error);
+diff --git a/test/test-xinput-utils.c b/test/test-xinput-utils.c
+index 29b3f4e..a06dcbc 100644
+--- a/test/test-xinput-utils.c
++++ b/test/test-xinput-utils.c
+@@ -6,6 +6,7 @@
+ void test_exist_device (void);
+ void test_get_float_atom (void);
+ void test_get_device_info (void);
++void test_get_device_info_from_id (void);
+ void test_open_device (void);
+ void test_open_no_device (void);
+ void test_get_device_num_buttons (void);
+@@ -49,7 +50,7 @@ test_get_float_atom (void)
+ void
+ test_get_device_info (void)
+ {
+-    XDeviceInfo *device_info = NULL; 
++    XDeviceInfo *device_info = NULL;
+     device_info = gpds_xinput_utils_get_device_info(DEVICE_NAME, &error);
+     cut_assert(device_info);
+ 
+@@ -57,6 +58,19 @@ test_get_device_info (void)
+ }
+ 
+ void
++test_get_device_info_from_id (void)
++{
++    XDeviceInfo *device_info = NULL;
++    device_info = gpds_xinput_utils_get_device_info(DEVICE_NAME, &error);
++    cut_assert(device_info);
++
++    gcut_assert_error(error);
++
++    device_info = gpds_xinput_utils_get_device_info_from_id(device_info->id, &error);
++    cut_assert_equal_string(DEVICE_NAME, device_info->name);
++}
++
++void
+ test_open_device (void)
+ {
+     device = gpds_xinput_utils_open_device(DEVICE_NAME, &error);
diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
new file mode 100644
index 000000000000..5fe0cde0a667
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
+HOMEPAGE="https://wiki.gnome.org/Attic/GPointingDeviceSettings"
+SRC_URI="mirror://sourceforge.jp/gsynaptics/45812/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# recent enough x11-base/xorg-server required
+RDEPEND="
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-2.14.0:2
+	>=gnome-base/gconf-2.24:2
+	>=gnome-base/gnome-settings-daemon-2.28
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libX11-1.2.0
+	!<=x11-base/xorg-server-1.6.0
+	!gnome-extra/gsynaptics
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35.5
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-crash.patch" \
+		"${FILESDIR}/${P}-plugin.patch" \
+		"${FILESDIR}/${P}-reboot.patch" \
+		"${FILESDIR}/${P}-gtk22.patch" \
+		"${FILESDIR}/${P}-gsd-crash.patch" \
+		"${FILESDIR}/${P}-gsd-3.2-fix.patch" \
+		"${FILESDIR}/${P}-fix-build.patch"
+
+	# Disable gsd plugin as it's incompatible since 3.8, bug #514672
+	sed -i -e 's/ gnome-settings-daemon-plugins//' modules/Makefile.am || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/gnome-extra/gpointing-device-settings/metadata.xml b/gnome-extra/gpointing-device-settings/metadata.xml
new file mode 100644
index 000000000000..39015a1f00d8
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge-jp">gsynaptics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
new file mode 100644
index 000000000000..268f18a8fb8f
--- /dev/null
+++ b/gnome-extra/gtkhtml/Manifest
@@ -0,0 +1,7 @@
+DIST gtkhtml-4.10.0.tar.xz 1050628 SHA256 ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3 SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0 WHIRLPOOL 2c4e2bbb97d31b751ebd05a9f2e898ac1ce5242826d025978f878e9a6e3266aff32e6256f42eb05007d3a9c13f05347029b9c9d4a67eb78789762a7163cd1d33
+DIST gtkhtml-4.8.5.tar.xz 1049900 SHA256 2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d SHA512 c35d67b22254570a92739c73a610230659a2ac63ab5e5a135a634655e679b39ad876cdf6abec4adabd0a9ba9ef87834745d03c7e0c005372bfe5485adff5ade3 WHIRLPOOL 665ab2d5319f3824ac26328b012bce0419b0c031b982ed0ef380679f8966f485c2813c2ea0e3a56688c610e1e3fc663592ab7c16cd546292c88254dd9e716d61
+EBUILD gtkhtml-4.10.0.ebuild 967 SHA256 865dc18d499976a84d65a7186da7462218d40c289a3926fee5f4cd9b6a755439 SHA512 ebe33d0bf84e225175dc740cca9e02960f8bb18d7943a91d4ad8c10d320beeb0edb76d18572a2fcf337c92af0217660aa33c7f26ff84b0f1463d167d096cd752 WHIRLPOOL 3335d5ca22bcea261531b820a6d3def4f441b3746bc1c06d71c5ecefdc3331f43f66a8af03448c5c7994426bd6e755f44dcb531742e29e3df3136a2d3dd88b73
+EBUILD gtkhtml-4.8.5.ebuild 967 SHA256 865dc18d499976a84d65a7186da7462218d40c289a3926fee5f4cd9b6a755439 SHA512 ebe33d0bf84e225175dc740cca9e02960f8bb18d7943a91d4ad8c10d320beeb0edb76d18572a2fcf337c92af0217660aa33c7f26ff84b0f1463d167d096cd752 WHIRLPOOL 3335d5ca22bcea261531b820a6d3def4f441b3746bc1c06d71c5ecefdc3331f43f66a8af03448c5c7994426bd6e755f44dcb531742e29e3df3136a2d3dd88b73
+MISC ChangeLog 2896 SHA256 f11cd7515c4f06829f50272516eee890b901083b0fd9f46a8261b827f70a7b0e SHA512 9f978f5af349656445822df997f3776526764f91cf8a728cfa1c11a1451116d5c010dccf2ca1c7d5531d8970382c14190ab7318cd85b0559e52b7c9938ec0f70 WHIRLPOOL f1d743e2aeb3a459df0fdf9e40adac0a663a0c8504ebc060fcf38eeaf469ad257ade74e3e38669be341592039551e4dc034ca27c456e0308f2e570f737638486
+MISC ChangeLog-2015 41783 SHA256 91ee8492259861641456944871361c9059eaf70a69808a8cc8365e75776b1594 SHA512 a9d3b218bd7aa8e5b58e6bed6b06c1d0269b718bef77775f7f1b0299327404b162059d5ac2f8b93a2a35b4f82ee964dbc880dbe8129fa382c86bfd2919d9cf93 WHIRLPOOL 9630f192b8d9272e4f634a376d98f5a8e35d3dd96cbac66fa183f3cf0fb8abe58a4742c5d8311ead8094b9acc1191b880fbf670da55a318a6df8efa62c1c8044
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
new file mode 100644
index 000000000000..2020a0d68e8d
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="4.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+# orbit is referenced in configure, but is not used anywhere else
+RDEPEND="
+	>=x11-libs/gtk+-3.2:3
+	>=x11-libs/cairo-1.10:=
+	x11-libs/pango
+	>=app-text/enchant-1.1.7:=
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/iso-codes-0.49
+	>=net-libs/libsoup-2.26.0:2.4
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Don't collide with 3.14 slot
+	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
new file mode 100644
index 000000000000..2020a0d68e8d
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="4.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+# orbit is referenced in configure, but is not used anywhere else
+RDEPEND="
+	>=x11-libs/gtk+-3.2:3
+	>=x11-libs/cairo-1.10:=
+	x11-libs/pango
+	>=app-text/enchant-1.1.7:=
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/iso-codes-0.49
+	>=net-libs/libsoup-2.26.0:2.4
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Don't collide with 3.14 slot
+	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
+}
diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gtkhtml/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
new file mode 100644
index 000000000000..c453159a0df8
--- /dev/null
+++ b/gnome-extra/gucharmap/Manifest
@@ -0,0 +1,12 @@
+AUX gucharmap-3.4.1.1-fix-doc.patch 348 SHA256 ae7f68febd1d5a711d2b27d8c5cc7bee284a2300a217be717b27d8cffe2c846f SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27 WHIRLPOOL 40facbc9ec88d0c15dab45a7a4a1e9d7ae7821a7e392e8f391744297153bc912849cdec977b3930052272269eb9932d9bb2d9a59094c54955cc3dbed883e94ac
+DIST gucharmap-10.0.0.tar.xz 1034780 SHA256 401ffec9f2d5646912055af100be5f38235abe877fa8246aafcb4203f4a2f33c SHA512 e097e54cfd4e6a8fd47992d163128bc8e87c0c6aa81718f900d7367fa6d88a528815c7bb87bfcaddd145aaa8b1c8068fdf6da6fe2a1c90381ff555b43712f33a WHIRLPOOL 02365f8a74a44552251d2e9528e426e17e8e4bd58b27d291fab99d27c83a42bf1435fddf1313e0da4ac5ade7c3b8e93849f85b7a3b86a477007332bbf740ac18
+DIST gucharmap-3.0.1.tar.bz2 3275481 SHA256 948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1 WHIRLPOOL 6c9aaaaf31428db5257f98da741513c192ca32371b5d19952471d09586900186b269192b8ae6902e430e7fb3116bccc7d6ed4bca050ad0ca58eb14d7817d569a
+DIST gucharmap-9.0.2.tar.xz 1023120 SHA256 723ea92c8e877beae3986432b8e002807c6c2d1140590dff1c5bff34bb6ed265 SHA512 33fa2989e263ba30bc430b8181009dd5d491dd2b453f6047369dc49dafb4f58be67dd9f1320b7005325236519a794eb4564fbd39a1d976133001f4f983ae1370 WHIRLPOOL 2119761dddc9cfc6288aaca282ed37e299c30c772cbaa86e699421a9de077ebb1b35540254098a7f47f26fc1aea704c7900f3caf32fc23d8bb96a1f31b0f0ffc
+DIST gucharmap-9.0.4.tar.xz 1029684 SHA256 1588b2b183b843b24eb074fd0661bddb54f18876870ba475d65f35b7a9c677a0 SHA512 2d2ce94796cb40bcaf14930624ddd788af1c49d464be1fc5d4ab8112df14054ce1324c86eaf028921266494f9fbb41d29a7b40db810fb15280d470fd26be6df2 WHIRLPOOL a4c79996f65aec3ce6715971ccc5b7888b1689f5109519b66d19617208c4a42dc5b5d25c2df3d6e8986b12edf0a5706d4de3fbade24105c27951305cab1a7be6
+EBUILD gucharmap-10.0.0.ebuild 1657 SHA256 2b9a23963b2cf5ba2c1563cecc38cc019d934fd448087f4aeb58f519020ec801 SHA512 21f017c0ed58fa0f39fa4a575aae66f93438a933bc3ef83e92f4153e4472dbd41758e82572976181dd68d006abd282da0ab70082a84a570660174c04505f201c WHIRLPOOL f5b8b806dfde25b34d1d7d9db57c2702e73cfa56afa95a42d9888609bff0597d507848199e967705e462a02b82e7baee7bc028d69073b5e2dc56d5a6e2252a17
+EBUILD gucharmap-3.0.1-r200.ebuild 1470 SHA256 d46995ed96ec47f977dc3a4dc680c4d40e08bef2ee3169cc56fecacd9fed9a3a SHA512 254fec449e286c8df0f273f5cde96d1571baebc0384a8e5ac69e17808ce14f7a49fdabd44b0d5f584c7935a33c7eb395c34db2df315d4ba9ae155471499bda65 WHIRLPOOL 2f7d27780a27044c27af42a526bb790db4194ced6fa3a942d7e6da7685c4cf311ed302d199e41ba6b55af0dbb19a8bbd126099462826355f2d070776dba33dfb
+EBUILD gucharmap-9.0.2.ebuild 1649 SHA256 d4f2258cc53f435b177ac10212773e403d57225a602af0f45108394180432857 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe WHIRLPOOL de033910b69bb69b5d725d1873e3dc233fd0ffa783a1073fe5e6a12d11edec4c208608e6fdf332a7e7cf4d448e597bf0b27458fe1043dabf0bbf15528c7211f0
+EBUILD gucharmap-9.0.4.ebuild 1657 SHA256 2b9a23963b2cf5ba2c1563cecc38cc019d934fd448087f4aeb58f519020ec801 SHA512 21f017c0ed58fa0f39fa4a575aae66f93438a933bc3ef83e92f4153e4472dbd41758e82572976181dd68d006abd282da0ab70082a84a570660174c04505f201c WHIRLPOOL f5b8b806dfde25b34d1d7d9db57c2702e73cfa56afa95a42d9888609bff0597d507848199e967705e462a02b82e7baee7bc028d69073b5e2dc56d5a6e2252a17
+MISC ChangeLog 7535 SHA256 2a412fc869c1c5a4207a5e83b1c49d65610b90ecf4d1175ec0aafe58bce9fbee SHA512 19c6ec2335782f316a996ea81afc4f6da0b43f8c2f6415066d7bc383d6f698643a01f0e3923341cd63b1e99a69803d0b5e3c5792593844e1d0042559e8bdda4b WHIRLPOOL 08755c3ba1c3bdea5d90e4e149e55ee784f29acc999f3135abf2ee638ef3a03f38ee1be6f5e662ddd139dd97ee27ee6a364fcf32281486020a74a5828da4619a
+MISC ChangeLog-2015 29571 SHA256 62d9427ba11952cb54a4e4ce9bd787e0a43051bac156404b12b7bd1e54950b5e SHA512 36df9d62a84cdc33392c93a3d731e4236ececb48e2bb2f8daa4aa750b84f712b97eea8a73d1c1620d5001cda6b992f624f50abe645e9b588277aec2b7c5ec685 WHIRLPOOL 1bfbaf8727fff6723bf364b33c9e43374ecb55ae8be35e9fbee9789d01077617ef35e89730fd131c07b448c762677a79f224feb5bdf609dfab633882ad23bbaf
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch b/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
new file mode 100644
index 000000000000..52696b5128a8
--- /dev/null
+++ b/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
@@ -0,0 +1,9 @@
+--- a/docs/reference/gucharmap-docs.sgml
++++ b/docs/reference/gucharmap-docs.sgml
+@@ -21,6 +21,5 @@
+     <xi:include href="xml/gucharmap-script-codepoint-list.xml"/>
+     <xi:include href="xml/gucharmap-chapters-view.xml"/>
+     <xi:include href="xml/gucharmap-unicode-info.xml"/>
+-    <xi:include href="xml/gucharmap.xml"/>
+   </chapter>
+ </book>
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
new file mode 100644
index 000000000000..b701e7d0a464
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala versionator
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+UNICODE_VERSION=$(get_version_component_range 1-2)
+
+COMMON_DEPEND="
+	=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/pango-1.2.1[introspection?]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gucharmap-3:0
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (	app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# prevent file collisions with slot 0
+	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
+		-i configure.ac configure || die "sed configure.ac configure failed"
+
+	# avoid autoreconf
+	sed -e 's/-Wall //g' -i configure || die "sed failed"
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# unihan is not really conditional
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
+	gnome2_src_configure \
+		--disable-static \
+		--with-unicode-data=/usr/share/unicode-data \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
new file mode 100644
index 000000000000..14bb204f238c
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="Unicode character map viewer library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="cjk debug doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.16.3:2
+	>=x11-libs/pango-1.2.1[introspection?]
+	>=x11-libs/gtk+-2.14.0:2[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# .desktop and schema files are only needed for the gucharmap program
+	sed -e 's:desktop_DATA\s*=.*:desktop_DATA = :' \
+		-e 's:schema_DATA\s*=.*:schema_DATA = :' \
+		-i Makefile.* || die "sed Makefile.* failed"
+
+	eapply "${FILESDIR}/${PN}-3.4.1.1-fix-doc.patch" # bug 436710, fixed in 3.6
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-gtk=2.0 \
+		--disable-charmap \
+		--disable-gconf \
+		$(use_enable cjk unihan) \
+		$(use_enable debug) \
+		$(use_enable introspection)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version "gnome-extra/gucharmap:2.90" ; then
+		ewarn "Note: ${PF} includes only the gucharmap-2 library."
+		ewarn "If you need the gucharmap program, emerge gucharmap:2.90"
+	fi
+}
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
new file mode 100644
index 000000000000..edc765ed8bfe
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala versionator
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+
+IUSE="debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+UNICODE_VERSION=$(get_version_component_range 1-2)
+
+COMMON_DEPEND="
+	=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/pango-1.2.1[introspection?]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gucharmap-3:0
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (	app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# prevent file collisions with slot 0
+	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
+		-i configure.ac configure || die "sed configure.ac configure failed"
+
+	# avoid autoreconf
+	sed -e 's/-Wall //g' -i configure || die "sed failed"
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# unihan is not really conditional
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
+	gnome2_src_configure \
+		--disable-static \
+		--with-unicode-data=/usr/share/unicode-data \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
new file mode 100644
index 000000000000..b701e7d0a464
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala versionator
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+UNICODE_VERSION=$(get_version_component_range 1-2)
+
+COMMON_DEPEND="
+	=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/pango-1.2.1[introspection?]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gucharmap-3:0
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (	app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# prevent file collisions with slot 0
+	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
+		-i configure.ac configure || die "sed configure.ac configure failed"
+
+	# avoid autoreconf
+	sed -e 's/-Wall //g' -i configure || die "sed failed"
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# unihan is not really conditional
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
+	gnome2_src_configure \
+		--disable-static \
+		--with-unicode-data=/usr/share/unicode-data \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/gnome-extra/gucharmap/metadata.xml b/gnome-extra/gucharmap/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/gucharmap/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
new file mode 100644
index 000000000000..a10a963ad2c6
--- /dev/null
+++ b/gnome-extra/libgda/Manifest
@@ -0,0 +1,10 @@
+AUX libgda-4.99.1-control-center-icon-collision.patch 2266 SHA256 dc52049ea4706fc8a8a91bc7c572abc275a312f7e0df15cf1b82c73ef8e4f63e SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5 WHIRLPOOL f766d52e6c9591b4a7040105f0765df63412da92e7aa60aa4921cedf2f05ba60a732d72f443358ab78735c9dd44e51ce8e12ca5c3892b9e077f04b0772412650
+AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 SHA256 d89d44e62a1a483cd77f13c723f0541f39a71a5f0651197d3e25d1093567d78c SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353 WHIRLPOOL c4f2b570f5fb486a4f1a6d3575e0849a13c78fcc1d05d2b64d4cb15f0af83a54bb8d184ec14ce501ee7e7dcc10f4b3a6c32c1d458e312c13716bde7752ff71c6
+AUX libgda-5.2.4-format-security.patch 1003 SHA256 231c32dfe355f391ca4aed49ab7116aa7ddf0d9dd91b7512e80f6e18d4152f22 SHA512 b723fff823b4de0ed79883d8b2c9e44e3ae26bac919992afe2eb055aaac972ee188bc28865497e3b6b0e613e8b7977061151e489fef31c99b5ce783928e9f42f WHIRLPOOL 585afe80cd23f7616931d6a52e238075ac9c07186e2ebde54f233b3e371c83f014bbb52071334f7d8d55575c9b0f823d1e22a8016ee8494b513c274bc3717395
+AUX libgda-5.2.4-jre18.patch 450 SHA256 37fd175e18d41348473d9596c2a1bd299df9d6c4a2f45997dd2a3449d58c7d06 SHA512 4280b18ac16a1831aac433a2dc64f0713f8668b31d18465877861e0c0e2dd5eb2bc2aa70cdf0d742da4b6c48f2b7ec7bd7f109de99436f84c5d155c2dc4fed94 WHIRLPOOL 323077d5eae83bc90fd348a05ca9a1b9f608a9ae64faafea0edaeb851983fdc96ff485a0723fd2a253d9381d11c6d28bdad7487b942cff63a6d4431238b4866c
+AUX libgda-5.2.4-vala-check.patch 920 SHA256 c75ee112cb6542988446aeb5051482adef4f2f46d1b9324f3f4a75d46275109f SHA512 dba082bdae037d4b9e021085166c4b5e8791c461cfbd9b0668731651b07f931bae8405b8b7d3c7f0cf51ddbfa23b03a265abd8ab3603e90933e0c99a299b53a0 WHIRLPOOL 6c1f667061b904487b45735cb42b5d62efa1a066f143972159f0a05f6f1fd423129a8985e3580223a3e1f44bb116d81077b9433ba012220bdd442ce45d1031bf
+DIST libgda-5.2.4.tar.xz 12320228 SHA256 2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc WHIRLPOOL fee9884ed9edb48603f0ce924316f00d2f38d490147d8c48e512cfd8f1282bd555f1767a56160afc2781b84c1a33466f42a12d4c5115e70af481c54c037bf519
+EBUILD libgda-5.2.4-r2.ebuild 4925 SHA256 a1aa9c8ae47ee6dbb2c231ddba16b04c6b8c3d943b2e9fe56614a0931ad909a9 SHA512 c03a97df0b0aeeeba44410c367e5bff172ac3b66c7baf1ca030d96243fcf7ef3a538c16c9cb60a20b136bb81e2a9d907b539fb72778833e83af6d4811fd23487 WHIRLPOOL 012b912cb329641bf276d3296995dec06caae879de7032c736d82515c8593896cd9a0c089b762165f9f31521a85be03077db9fa2f66e8ed630c55160407fcc29
+MISC ChangeLog 4507 SHA256 08a030d79dd58e1f8fa67935df6483b242915a120c23e82d39dc49ddd66fdacb SHA512 ea0b87f528cc4812daf43f5c24155dd84b7b13ff488cdb85f40940057a0023dabbadb1550d2000520df442e7347a1c9c26852e35f41cbd33d2775c1d0f8b0bec WHIRLPOOL 202618bfa667e8d4163168dd333095610a4e1cbb943d9e69b5e76209c939462381ed21ed24fcae943140f0356be6c8deedaed6c655be371dd07a3e7089f6a644
+MISC ChangeLog-2015 35915 SHA256 a751966673c79522db69674a5c9edca0e8937aec557857454bb7052bf37e9e5c SHA512 dcb586fe2a74cb560e89ba0c903387b43df2365e73850ccb84ef9f6771c9ed60234ee2aa35048639dfc725a56c96de87b3ca1d8f7a014bea0c23cf92b89117bc WHIRLPOOL fcbf587b2ea03d9463b56aae182f09bab26a340d1de912ea478f7636f1c444bf99027a6ffff408b9218cc4495efe33453bb00a1a0499275df266e9b470bcb6b5
+MISC metadata.xml 782 SHA256 cae0c8e9079cd10a8cfd47360a51a88b4abacd62f908a8b2a57480e9f691d6e1 SHA512 4878da46ea580bdc1063c6937a5b5e437bf29bd6132cb6867c103253ef96b20a80f46dab6b8016cea3bfefc186d8e36d4a400980fe5da47ce5f7e877944a4ecb WHIRLPOOL d457f9874d2dae45b767ff38ce30dfa01e5224ab54c10a83c82a2911e59b3505d84461d6e4ce12ccf61b815a64f9862876993f4b7707763d15f59c89739b5fc7
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
new file mode 100644
index 000000000000..fe814a730490
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
@@ -0,0 +1,55 @@
+From 6ec47f4cf542ad9f7c4d30d557e4813b5c6f31d5 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sat, 4 Jun 2011 05:45:35 -0400
+Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons
+
+---
+ control-center/data/Makefile.am                    |   12 ++++++------
+ ... hicolor_apps_16x16_gda-control-center-5.0.png} |  Bin 833 -> 833 bytes
+ ... hicolor_apps_22x22_gda-control-center-5.0.png} |  Bin 1157 -> 1157 bytes
+ ... hicolor_apps_24x24_gda-control-center-5.0.png} |  Bin 1144 -> 1144 bytes
+ ...icolor_apps_256x256_gda-control-center-5.0.png} |  Bin 33543 -> 33543 bytes
+ ... hicolor_apps_32x32_gda-control-center-5.0.png} |  Bin 1867 -> 1867 bytes
+ ... hicolor_apps_48x48_gda-control-center-5.0.png} |  Bin 3144 -> 3144 bytes
+ control-center/gda-control-center-5.0.desktop.in   |    2 +-
+ 8 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am
+index 03fa362..862ec88 100644
+--- a/control-center/data/Makefile.am
++++ b/control-center/data/Makefile.am
+@@ -5,12 +5,12 @@ public_icons_themes = \
+ 	$(NULL)
+ 
+ public_icons = \
+-	hicolor_apps_16x16_gda-control-center.png \
+-	hicolor_apps_22x22_gda-control-center.png \
+-	hicolor_apps_24x24_gda-control-center.png \
+-	hicolor_apps_256x256_gda-control-center.png \
+-	hicolor_apps_32x32_gda-control-center.png \
+-	hicolor_apps_48x48_gda-control-center.png \
++	hicolor_apps_16x16_gda-control-center-5.0.png \
++	hicolor_apps_22x22_gda-control-center-5.0.png \
++	hicolor_apps_24x24_gda-control-center-5.0.png \
++	hicolor_apps_256x256_gda-control-center-5.0.png \
++	hicolor_apps_32x32_gda-control-center-5.0.png \
++	hicolor_apps_48x48_gda-control-center-5.0.png \
+ 	$(NULL)
+ 
+ private_icons = \
+diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in
+index 6fd5b58..429787d 100644
+--- a/control-center/gda-control-center-5.0.desktop.in
++++ b/control-center/gda-control-center-5.0.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Database access control center
+ _Comment=Configure your database access environment
+-Icon=gda-control-center
++Icon=gda-control-center-5.0
+ Exec=gda-control-center-5.0
+ Terminal=false
+ Type=Application
+-- 
+1.7.5.3
+
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
new file mode 100644
index 000000000000..2fd31ab7d1de
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
@@ -0,0 +1,28 @@
+From bfb0d952d111929174c3326dbc69ab65a808a235 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sat, 4 Jun 2011 05:59:46 -0400
+Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files
+
+---
+ tools/browser/doc/Makefile.am                      |    2 +-
+ ...browser-docs.sgml => gda-browser-5.0-docs.sgml} |    0
+ ...r-sections.txt => gda-browser-5.0-sections.txt} |    0
+ .../{gda-browser.types => gda-browser-5.0.types}   |    0
+ 4 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am
+index 971fa79..cf6637a 100644
+--- a/tools/browser/doc/Makefile.am
++++ b/tools/browser/doc/Makefile.am
+@@ -3,7 +3,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+ 
+ # The name of the module.
+-DOC_MODULE=gda-browser
++DOC_MODULE=gda-browser-5.0
+ 
+ # The top-level SGML file.
+ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+-- 
+1.7.5.3
+
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
new file mode 100644
index 000000000000..81c7804c512c
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
@@ -0,0 +1,29 @@
+From 68af249e1c36cbac2e39903b0fc357e3ad2bf1ee Mon Sep 17 00:00:00 2001
+From: Vivien Malerba <malerba@gnome-db.org>
+Date: Wed, 16 Apr 2014 14:59:50 +0200
+Subject: [PATCH] Markup message correction
+
+---
+ libgda-ui/demos/ddl_queries.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
+index a47630f..4b29377 100644
+--- a/libgda-ui/demos/ddl_queries.c
++++ b/libgda-ui/demos/ddl_queries.c
+@@ -475,9 +475,9 @@ show_sql (G_GNUC_UNUSED GtkButton *button, DemoData *data)
+ 		else
+ 			msg = g_strdup_printf ("<b>SQL:</b>\n%s", sql);
+ 
+-		dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window),
+-							  GTK_DIALOG_MODAL,
+-							  msg_type, GTK_BUTTONS_CLOSE, msg);
++		dlg = gtk_message_dialog_new (GTK_WINDOW (data->top_window),
++					      GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_CLOSE, NULL);
++		gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dlg), msg);
+ 		g_free (sql);
+ 		g_free (msg);
+ 
+-- 
+1.9.0
+
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
new file mode 100644
index 000000000000..f66fa8f95846
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
@@ -0,0 +1,14 @@
+--- libgda-5.2.2/configure.orig	2014-05-17 14:58:33.206028742 +0200
++++ libgda-5.2.2/configure	2014-05-17 14:58:45.937790443 +0200
+@@ -23200,6 +23259,11 @@
+ 		    JTYPE="Sun JRE 1.7"
+ 		    JFLAGS="-Xlint:unchecked -Xlint:deprecation"
+ 		    ;;
++                JRE1.8.*)
++		    try_java=true
++		    JTYPE="Sun JRE 1.8"
++		    JFLAGS="-Xlint:unchecked -Xlint:deprecation"
++		    ;;
+                 JREgcj-4*)
+ 		    try_java=true
+ 		    JTYPE="GCJ"
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
new file mode 100644
index 000000000000..c586d49356d0
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
@@ -0,0 +1,35 @@
+From e72c59062f39e89569524f4556cbddb8d00119f4 Mon Sep 17 00:00:00 2001
+From: Vivien Malerba <malerba@gnome-db.org>
+Date: Sun, 7 Feb 2016 20:49:07 +0100
+Subject: Re-correction for bug #761424
+
+Automatic detection of API version
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 152f676..9898a32 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -571,13 +571,13 @@ fi
+ vala_api="No Vala bindings will be generated"
+ if test "x$enable_vala" = "xyes"
+ then
+-	AM_PROG_VALAC([0.26.0])
++	AM_PROG_VALAC()
+ 	if test "x$VALA_API_VERSION" = "x"
+ 	then
+-		VAPIGEN_CHECK([0.26.0],[0.26],,no)
+-		vala_api="0.26 (Default)"
++		VAPIGEN_CHECK(,,,no)
++		vala_api="`pkg-config --modversion vapigen` (Default)"
+ 	else
+-		VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
++		VAPIGEN_CHECK(,$VALA_API_VERSION,,no)
+ 		vala_api=$VALA_API_VERSION
+ 	fi
+ else
+-- 
+cgit v0.12
+
diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
new file mode 100644
index 000000000000..478c37175488
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+	reports? ( ${PYTHON_REQUIRED_USE} )
+	canvas? ( gtk )
+	graphviz? ( gtk )
+	sourceview? ( gtk )
+	vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2
+	dev-libs/libxslt
+	sys-libs/readline:0=
+	sys-libs/ncurses:0=
+	berkdb? ( sys-libs/db:* )
+	firebird? ( dev-db/firebird )
+	gnome-keyring? ( app-crypt/libsecret )
+	gtk? (
+		>=x11-libs/gtk+-3.0.0:3
+		canvas? ( x11-libs/goocanvas:2.0= )
+		sourceview? ( x11-libs/gtksourceview:3.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	http? ( >=net-libs/libsoup-2.24:2.4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	json? ( dev-libs/json-glib )
+	ldap? ( net-nds/openldap:= )
+	mdb? ( >app-office/mdbtools-0.5:= )
+	mysql? ( virtual/mysql:= )
+	postgres? ( dev-db/postgresql:= )
+	reports? (
+		${PYTHON_DEPS}
+		dev-java/fop
+		dev-python/reportlab )
+	ssl? ( dev-libs/openssl:= )
+	>=dev-db/sqlite-3.6.22:3=
+	vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.9
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )
+	vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+	test
+	firebird? ( bindist )
+"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix compilation with -Werror=format-security (from 'master')
+	eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+	# Support JRE 1.8 (from Fedora)
+	eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+	# Fix vala test,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=761424
+	eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
+
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	use reports ||
+		sed -e '/SUBDIRS =/ s/trml2html//' \
+			-e '/SUBDIRS =/ s/trml2pdf//' \
+			-i libgda-report/RML/Makefile.{am,in} || die
+
+	# Prevent file collisions with libgda:4
+	eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+	eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+	# Move files with mv (since epatch can't handle rename diffs) and
+	# update pre-generated gtk-doc files (for non-git versions of libgda)
+	local f
+	for f in tools/browser/doc/gda-browser* ; do
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+			-i ${f} || die "sed ${f} failed"
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in control-center/data/*_gda-control-center.png ; do
+		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+			die "mv ${f} failed"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+	java-pkg-opt-2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myconf=( )
+	if use introspection ; then
+		myconf+=( $(use_enable gtk gdaui-gi) )
+	else
+		myconf+=( --disable-gdaui-gi )
+	fi
+	if use vala ; then
+		myconf+=( $(use_enable gtk gdaui-vala) )
+	else
+		myconf+=( --disable-gdaui-vala )
+	fi
+
+	gnome2_src_configure \
+		--with-help \
+		--disable-default-binary \
+		--disable-static \
+		--enable-system-sqlite \
+		$(use_with berkdb bdb /usr) \
+		$(use_with canvas goocanvas) \
+		$(use_enable debug) \
+		$(use_with firebird firebird /usr) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with graphviz) \
+		$(use_with gtk ui) \
+		$(use_with http libsoup) \
+		$(use_enable introspection) \
+		$(use_enable introspection gda-gi) \
+		"$(use_with java java $JAVA_HOME)" \
+		$(use_enable json) \
+		$(use_with ldap) \
+		$(use_with mdb mdb /usr) \
+		$(use_with mysql mysql /usr) \
+		$(use_with oci8 oracle) \
+		$(use_with postgres postgres /usr) \
+		$(use_enable ssl crypto) \
+		$(use_with sourceview gtksourceview) \
+		$(use_enable vala) \
+		$(use_enable vala vala-extensions) \
+		${myconf[@]}
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	java-pkg-opt-2_pkg_preinst
+}
+
+src_install() {
+	gnome2_src_install
+	if use reports; then
+		for t in trml2{html,pdf}; do
+			python_scriptinto /usr/share/libgda-5.0/gda_${t}
+			python_doscript libgda-report/RML/${t}/${t}.py
+		done
+	fi
+}
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
new file mode 100644
index 000000000000..aae12a8f52cf
--- /dev/null
+++ b/gnome-extra/libgda/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
+    <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
+    <flag name="json">Enable support for JSON format</flag>
+    <flag name="mdb">Enable support for Microsoft Access database using 
+		<pkg>app-office/mdbtools</pkg></flag>
+    <flag name="reports">Install tools for generating graphical reports</flag>
+    <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
new file mode 100644
index 000000000000..82fd1eea85f4
--- /dev/null
+++ b/gnome-extra/libgsf/Manifest
@@ -0,0 +1,5 @@
+DIST libgsf-1.14.41.tar.xz 616944 SHA256 150b98586a1021d5c49b3d4d065d0aa3e3674ae31db131af5372499d2d3f08d3 SHA512 e3892500288e5d1d9e46cdd3940d872ae2504fe54babe2dc085218c3e1a5aff5a7220c88bde730239af4a56c340a22f47337280b8892f0ab31e1e751adea9bc3 WHIRLPOOL ba632c383b95131ad9d684245a5265a414e2e6b96e183c12ddc37598d58d6b919d0d8ab3a725bf2b3ef56cdac5e11d7bd1f60229e0b907fdde70618ebd50234a
+EBUILD libgsf-1.14.41-r1.ebuild 1004 SHA256 badeb77e0214f0d98461c33244bb4936d54a647e574f3995d178db8f79c81ba0 SHA512 852c7872d67ac45243fb75986064db62e2022bacd714cecbb9613d5f7fc0fd961ffef89c13ad4f57de89791d9df12db1f76e030d9536262edaaae2b8fb13db0c WHIRLPOOL 742262fca4304a975ad4b62a37a9fc59ba7240d88543747ac8c3df1e05f756d53fc72ab1c42472385631a66a5e2cd4e452732683d61f354dd9712e8b07f8d32c
+MISC ChangeLog 7627 SHA256 863ae89d0177c088ba753978a662475c188d89b7732cca3c98a63dc8fb03daf6 SHA512 730d5f968c2b6ece1290d9980e58d6451ede4b709995ba9ad7d0be66869751aa6763cbd1640d4b01f56a6380937e0d976fe09b370245e17ccabac7c74b14ad55 WHIRLPOOL 25d81fcbde789d6dc7055685fd9939cf58f68eaa9201888fae1b6fda54f3112708762497afe94dac494b520a4c824f9ab8d982980eceddf934a8b251c06911b2
+MISC ChangeLog-2015 32717 SHA256 52507ffb38fceb54a172a0543711b8285a32bd237a54fe1c03b8abe52958d3e0 SHA512 5309c1ca616a156aab2a7a686e78633fc3b1367d67f8ef9ab3440362574fa51d03fe0c7ece39fd09ea9fdc32f03f64045a14d19411dff836fa3f88aff42548ec WHIRLPOOL 96062d9e44f1796c9842f677113bc2b1478b28369cfabbe62423c2d070bb62c53f6170032093882f01079c239128fa41e103fb79649b379646fd47f411336a00
+MISC metadata.xml 320 SHA256 11a8fb75e3fe88a5ce29b7cdb92b689012af0f6d322b1257a4d56872a2db143b SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0 WHIRLPOOL 2f42683d1b84611029a68e98d3ece27cd07e55afcfa762daada89ef37d6371bf1fcc399b108ec08ea4d60074f623fcc47614b869649969d6176e0a5f4207de1e
diff --git a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
new file mode 100644
index 000000000000..24145aa1ebba
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="The GNOME Structured File Library"
+HOMEPAGE="https://developer.gnome.org/gsf/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/114" # libgsf-1.so version
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 gtk +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libxml2-2.4.16:2
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		virtual/imagemagick-tools
+		)
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35.0
+	dev-libs/gobject-introspection-common
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_with bzip2 bz2) \
+		$(use_enable introspection) \
+		$(use_with gtk gdk-pixbuf)
+}
diff --git a/gnome-extra/libgsf/metadata.xml b/gnome-extra/libgsf/metadata.xml
new file mode 100644
index 000000000000..88797e4b6d00
--- /dev/null
+++ b/gnome-extra/libgsf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="gtk">Enable use of gdk in thumbnailer</flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/metadata.xml b/gnome-extra/metadata.xml
new file mode 100644
index 000000000000..a7fd28d99930
--- /dev/null
+++ b/gnome-extra/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The gnome-extra category contains additional non-core GNOME packages.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie gnome-extra enthält zusätzliche GNOME-Pakete die nicht
+		Teil des Basissystems sind.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría gnome-extra contiene paquetes adicionales de GNOME.
+	</longdescription>
+	<longdescription lang="ja">
+		gnome-extraカテゴリーにはGNOMEのコアなし拡張パッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De gnome-extra categorie bevat optionele extra's voor de GNOME desktopomgeving.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm gnome-extra chứa các gói GNOME bổ sung, không thuộc về các gói cốt lõi.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria gnome-extra contiene pacchetti vari per GNOME.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria gnome-extra contém pacotes adicionais de GNOME.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria gnome-extra zawiera dodatkowe pakiety dla środowiska GNOME.
+	</longdescription>
+</catmetadata>
+
diff --git a/gnome-extra/mousetweaks/Manifest b/gnome-extra/mousetweaks/Manifest
new file mode 100644
index 000000000000..3d7dda98c395
--- /dev/null
+++ b/gnome-extra/mousetweaks/Manifest
@@ -0,0 +1,5 @@
+DIST mousetweaks-3.12.0.tar.xz 287236 SHA256 c0db478ccb390665e3201e9d1ce08b1c6573a697b797c9e828debb94b1ae3b97 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0 WHIRLPOOL 7bc760d7e851ec95038ccb303c694b710fa920a9ed85fca68b5df25daf80fc5f45cf7f2694cef3fcac65b28e2e973a7e638403e9151e6548550353bb5b59dedf
+EBUILD mousetweaks-3.12.0.ebuild 613 SHA256 aa65965dcdd5f33756cf631d93b12a7ba3a554b762c0c79b91c74d0f1dbc7875 SHA512 eecf107a61829cec3dce73c205b6c143137f86226b139f1b8db85285a7b147ff576a69b800ba5b31038cbd4cd77e466a981f81b38334ce05fe395a789ec04ffd WHIRLPOOL 221d65b9029ec2a1a556b8fe3602a6af785f22eace7abe396cdb4346ba72705bfd668b45edbf9884256dab0ea2cc4b47ad2b55df3cfd3f006d53ffeb5ca13e89
+MISC ChangeLog 2794 SHA256 63e051eca8b8ce5cf13b20d604c992e26c006a26d30d4e25a1ca56edc5c54952 SHA512 4089b04886be4b92ea062aafb9913a1d5a428588ca0839fd966f4c8f7569cc25d2c6c8f2c79b6c6aa616e1a135590705155bee820acf16a2cc5ae743f9c8d8d0 WHIRLPOOL 6bab6b6e8a441a6835b996a11da479a34996e2edcf8113799c1fc814649f90d58a5cc03dc5d3a05f039495793cb149da19f873719caf0ab9e4cf73c2cda33b36
+MISC ChangeLog-2015 11816 SHA256 69fb0b0643257cfd42f18e11df864131e8ac261f9e12b39d5227636eedf70e5c SHA512 aeaec0f19d2c97c07acbb1f0cb6e85cd488398db0fd0bc1a0e5b07a02083014cc968ccd609045163e48ac92e8c8068d08d6fc1f06a488b5d4d429f2bdfcb6492 WHIRLPOOL ee00d902862471bb0b10ecc055ea0a6a75569ed94011e27371eb7625ebe42f4ff510eb79f85129382a55baa78d12ba2b3c176193908782bc1a30a356e8607043
+MISC metadata.xml 978 SHA256 484c5a0639354ae81f495a0f58fe4da50263b9b527966ea017f63dc0a14892ed SHA512 558452bca815b89fb3dacc7afb8a4964eb4091bfa0df57d56053ce19a5125a61300de8dc762056abdc093f761c472f3f4ba9e898327d490284036586b9146fdf WHIRLPOOL e0f4d3f1d1d33a8f3b2b183713237ad266fcfdba5c0c86cfd989a01830ea7e30c6c2041188b6550626d28ede4e75a20b2e3c0a3f6a2b60e4089eea8e7a05b973
diff --git a/gnome-extra/mousetweaks/metadata.xml b/gnome-extra/mousetweaks/metadata.xml
new file mode 100644
index 000000000000..6e38a49d0b0e
--- /dev/null
+++ b/gnome-extra/mousetweaks/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<longdescription lang="en">
+Mousetweaks is an Accessibility Software whose developement started as a GSoC
+2007 project under Ubuntu. It brings additional fonctionalities to the pointer
+that allow a user to:
+
+    * open the contextual menu by clicking and holding the left button; it is
+	* for example useful for users that can manipulate only one button
+    * perform the 4 click types (left click, double click, drag click and
+	* right click) by software; it is for example useful for users that are
+	* not able to manipulate any button
+	* to lock the pointer temporarily into an area on the screen; it is
+	* for example useful for people that have to use their pointing
+	* hardware not only for the computer
+</longdescription>
+</pkgmetadata>
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
new file mode 100644
index 000000000000..72ef40bdea12
--- /dev/null
+++ b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop"
+HOMEPAGE="https://live.gnome.org/Mousetweaks/Home"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.25.9:2
+	>=x11-libs/gtk+-3:3[X]
+	>=gnome-base/gsettings-desktop-schemas-0.1
+
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXfixes
+	x11-libs/libXcursor
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/nautilus-actions/Manifest b/gnome-extra/nautilus-actions/Manifest
new file mode 100644
index 000000000000..7d1ba64e024b
--- /dev/null
+++ b/gnome-extra/nautilus-actions/Manifest
@@ -0,0 +1,7 @@
+DIST nautilus-actions-3.2.3.tar.xz 8238308 SHA256 e2469e656fe3a246263c0c77cd99e2403dc519af357f3af5b79b9f2df753412a SHA512 1b9e4e622ef66b1a05b0a9426fd0de929d8d890a836c4fe83cd127e94e07b33652d6087c9c556e0b56b7724c5f7e328a7e56df3aad517f4add940a96f460ff45 WHIRLPOOL 22d371653b644f67f2258f0a2fbea92539c538bb361d3e7195d12f8f2cb911d132a548d0950c997ab9dfa259c404d69c19f6c8f524674eb6b71133ba02ccbfd1
+DIST nautilus-actions-3.2.4.tar.xz 5148812 SHA256 10206c952ed3e916241168ebffd7ade9b9bcc18429ab33dfe24d9517a7371567 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0 WHIRLPOOL b8d9f8bef9138157c48ab0e3c8388108d242ef0ac0e5aaca74ac3d3ee92d8f84964e47ef19b805974da5630b7a6f6f5188204b5606c0e0fc113b5ac517221018
+EBUILD nautilus-actions-3.2.3.ebuild 1220 SHA256 e82821b73c9610650322e9875f4ed7051545fc6027399c66117d03e8dfb99de9 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298 WHIRLPOOL e12c40bbe097c12f702245bb831748b44c30252b3d39a5618b4804e338d0f669ae1819504a6a6ea5fec53a371a81dcbb2c03153da015d614b7bd65c9561c1ef2
+EBUILD nautilus-actions-3.2.4.ebuild 1220 SHA256 e82821b73c9610650322e9875f4ed7051545fc6027399c66117d03e8dfb99de9 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298 WHIRLPOOL e12c40bbe097c12f702245bb831748b44c30252b3d39a5618b4804e338d0f669ae1819504a6a6ea5fec53a371a81dcbb2c03153da015d614b7bd65c9561c1ef2
+MISC ChangeLog 2527 SHA256 4bc22c26c43e80723acc9017ff06095f95f2b97472fe0dcf33d73177daebcb35 SHA512 de5479d5530ea269c42c06baa682fc31eed943bc3854bbf505d941ddc00e59c4aaeae86201061afcaf0dabe94c880b9ab3566eeec74755b5f1e747698b3bf16f WHIRLPOOL 7f99cd485d2cd6b2e57c7be870409c5dc52399002ef506458343a18d6a947247d202b729d9d435fd8d15b172c7f8e39ef4458f3473a0b708f37882d819f7efbd
+MISC ChangeLog-2015 2327 SHA256 362bf8e7d653109f707c2141f91bf0e4c21828f266982f5650b7a9e554a496b0 SHA512 968c4916f73e6b1647c2c187da1ac56c1a39b3b70fdd5555c00ca9d8ae2abbcfc6a869dd568898f385d039bbc0de31a4b2b51e47a69db955eba58efb14670a3d WHIRLPOOL 9a34ec661114ac5de951c3f33e42cb03768415bb967288773d30fa87e878c4ac52622ea8e1e5b905abaf7fdbfd9e320a8a3a164ab59b92d5e235679081cd5ed1
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/nautilus-actions/metadata.xml b/gnome-extra/nautilus-actions/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/nautilus-actions/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
new file mode 100644
index 000000000000..e26c5a7c91ab
--- /dev/null
+++ b/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
+HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
+
+LICENSE="GPL-2 FDL-1.3"
+SLOT="3"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.30:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libunique:3
+	>=gnome-base/libgtop-2.23.1:2
+	>=gnome-base/nautilus-3
+	sys-apps/util-linux
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	>=x11-libs/libSM-1
+
+	!gnome-extra/nautilus-actions:2
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# install docs in /usr/share/doc/${PF}, not ${P}
+	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
+		Makefile.{am,in} \
+		docs/Makefile.{am,in} \
+		docs/nact/Makefile.{am,in} || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-deprecated \
+		--disable-gconf \
+		--with-gtk=3
+}
+
+src_install() {
+	gnome2_src_install
+	# Do not install COPYING
+	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
+}
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
new file mode 100644
index 000000000000..e26c5a7c91ab
--- /dev/null
+++ b/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
+HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
+
+LICENSE="GPL-2 FDL-1.3"
+SLOT="3"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.30:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libunique:3
+	>=gnome-base/libgtop-2.23.1:2
+	>=gnome-base/nautilus-3
+	sys-apps/util-linux
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	>=x11-libs/libSM-1
+
+	!gnome-extra/nautilus-actions:2
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# install docs in /usr/share/doc/${PF}, not ${P}
+	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
+		Makefile.{am,in} \
+		docs/Makefile.{am,in} \
+		docs/nact/Makefile.{am,in} || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-deprecated \
+		--disable-gconf \
+		--with-gtk=3
+}
+
+src_install() {
+	gnome2_src_install
+	# Do not install COPYING
+	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
+}
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
new file mode 100644
index 000000000000..69f938b6836b
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -0,0 +1,6 @@
+AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 SHA256 f8c6add8d61b73ac8083a79177705a172005a16f1f0738f37e09ce5daddc3702 SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb WHIRLPOOL 75f33c78b99b923da61a2dc926e0c4a62973cc61e36e7c5bd0a52fa840757b876fd9badf158ba1e78a42094023f76eaedf0fa72ba6795acd90bc3dd30683d9e6
+DIST nautilus-dropbox-1.6.2.tar.bz2 354408 SHA256 63d53109c7d0efc0e83f36ac47be3be923115eaf0be56cfc9a1aa8e2ecc633e4 SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3 WHIRLPOOL b6e7f91674d5a9163ab7b46f95ffdcbdaa5815e9f7e16e37f8da38ab9028eaa09076afc49978465d8547bbf20971825b2dbd356766e99ed756ba96b79aeda649
+EBUILD nautilus-dropbox-1.6.2.ebuild 2150 SHA256 e8c7c323bf927326abeb2fbc7dbc81de0c0d56c15029185bffe3e98d90525edb SHA512 7cded3d67c5e412bf293a7aa6034c573de63632231ecc113c43ab5f70db17c304cbed7ea8def39008cec94b4fb6af4bfaf4dfabd7c68df819653cc50b54032c5 WHIRLPOOL 6f2fa4990acddb73de2de4ffa69892bddf582bdb870afa3707a7c09e3406a4c99834656fba15b2f71221125bb357a24c3d9ed7c18b0c1485c77e2f4e1a8dd405
+MISC ChangeLog 2606 SHA256 74b344b64d4d77e6910c802d3fd2447d2dd4cfaab1bacfef94c9f41f2f3414c8 SHA512 95193945c7734272f0a0eba34489e31a4b97fe27e16bcbe273605a2326dbe7ac375af7f11fe2cae1fe90464bb2b9c0a0545b6f28da6e87c1c9d73c1981476dc6 WHIRLPOOL 91defe4b60b4897140f1df56f4db4f6b9be234cbf480a859e0d885286dc5d78ea49652cf2047cbf1a4f94547d7ad59acd3befed08016e06a6f690cbadaf148e5
+MISC ChangeLog-2015 5010 SHA256 571e6690ecd06d0da27063704e7654170746bada1b793e39e572b6a4a8b8f635 SHA512 a5850adf1f810976b7caa282b42a772bbf99bc37d1c3dac1b60670a12b7eab337e376286e76e46391f7d625d14933a0cda31b46bc48508f573eda5c26951501f WHIRLPOOL 38236bbe1be97074d6a0419c0c1d669c9792009e5097e15bfe0d410abee1015b57562b08ec1ce68932ef83fe66216a98a34e966f4018065c0d2178c445a35dbe
+MISC metadata.xml 168 SHA256 9f5073e4f4682efd1d4fda14feb67df188972340a55fa9e06ee82b66e24f8cc8 SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 WHIRLPOOL 3ec0b2fcfb36e82c8f9dd8877875a38095bc9b11aff96d69a7919ee610efe27f65318c974161f6ba135150ad361a8c108938841c3d48c42f5a92d1762858d898
diff --git a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
new file mode 100644
index 000000000000..ea0053b4bbb6
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
@@ -0,0 +1,13 @@
+Index: nautilus-dropbox-0.7.0/configure.in
+===================================================================
+--- nautilus-dropbox-0.7.0.orig/configure.in
++++ nautilus-dropbox-0.7.0/configure.in
+@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
+ 
+ AC_PATH_PROG([PYTHON], [python])
+ 
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
++AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
+ AC_SUBST(RST2MAN)
+ 
+ # define module checking macro
diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
new file mode 100644
index 000000000000..1b2becffa26c
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
new file mode 100644
index 000000000000..87e244368cf4
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-r1 linux-info gnome2 readme.gentoo user
+
+DESCRIPTION="Store, Sync and Share Files Online"
+HOMEPAGE="http://www.dropbox.com/"
+SRC_URI="http://www.dropbox.com/download?dl=packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gnome-base/nautilus
+	dev-libs/glib:2
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	net-misc/dropbox
+	x11-libs/gtk+:2
+	x11-libs/libnotify
+	x11-libs/libXinerama"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup () {
+	check_extra_config
+	enewgroup dropbox
+
+	DOC_CONTENTS="Add any users who wish to have access to the dropbox nautilus
+		plugin to the group 'dropbox'. You need to setup a drobox account
+		before using this plugin. Visit ${HOMEPAGE} for more information."
+
+	python_export_best
+}
+
+src_prepare() {
+	G2CONF="${G2CONF} $(use_enable debug) --disable-static"
+
+	gnome2_src_prepare
+
+	# use sysem dropbox
+	sed \
+		-e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
+		-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
+		-i dropbox.in || die
+	# us system rst2man
+	epatch "${FILESDIR}"/${PN}-0.7.0-system-rst2man.patch
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+}
+
+src_install () {
+	gnome2_src_install
+
+	local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
+	[ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir"
+
+	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D
+	extensiondir="${extensiondir#${EPREFIX}}"
+
+	use prefix || fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.so
+	fperms o-rwx "${extensiondir}"/libnautilus-dropbox.so
+
+	readme.gentoo_create_doc
+
+	python_replicate_script "${ED}"/usr/bin/dropbox
+}
+
+pkg_postinst () {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
new file mode 100644
index 000000000000..72ac14c19b48
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -0,0 +1,7 @@
+DIST nautilus-sendto-3.8.4.tar.xz 380180 SHA256 51065c6e2601560a8bc507c7aee8e967dc6c6f355c6a05a1d4e7e1fe76b908e7 SHA512 e6ba8fbb4646dce710119e2720b3482ecdb7e99f1fd53528de97ed015519aaf8bfe2339091630813e7feaf2d2d9a9a8495568c294fc00472046370c4e097df86 WHIRLPOOL 71765fed70cb1cf0347d973d0c14062667a6f91715f6e25021efd835dc825091d7d6b41e2f196fc1aa20693db241be1c78e9ca2ebfd65acd32b9f9bfe7780c5a
+DIST nautilus-sendto-3.8.5.tar.xz 382440 SHA256 8c6a2889e00edefbe13f2443512447e3e9ee87a707f483e096e3c0079ba90901 SHA512 d9b504d5615e761f19b7b4610d394ac9b928023163b3e416aca114f168330d3b35617ee8e80338cce2248151096a6e2094576e7978b80076d5eedb9bb847bfa3 WHIRLPOOL bfc8c4ffbeae66d889c362e11d17cb07a021690d22321285026a7b305af5504186d60500664997ef139c82aa24bdf952e50480dd3d956d1266149819b21c4e2d
+EBUILD nautilus-sendto-3.8.4.ebuild 818 SHA256 abfafc6e41570e462d350b397d7573a3b20cae5121a2bce6de37533d18db6423 SHA512 bb9289bfa58116ec876ced8c02fbb57d09e74dac8bf11703cd0ab6aac62ad2d02de0327b2b6ce874c9178be5ca3d1b0d0e2eedd565d153b13ea415f74890109a WHIRLPOOL 9151ac9b52e94d701743c6437d0beb4fd1705e41b70f214e5f7faf01b2bc9434da19a4132c5040f7179f35270d75f79bc174fab39863ecb10c7d577c002aae66
+EBUILD nautilus-sendto-3.8.5.ebuild 999 SHA256 7eacb1cc2ebb9d8031f7318423415cd3d905601ada4246637fd084185e329f64 SHA512 56a2660f19deabf82ae84d86acb280a62c894e9c8be2ce786503b998931a0a98ce69a2af96a222f619f9620f1d0cab9b2eea96bdb32664c2dc07ea10a08a44b2 WHIRLPOOL 68f31663bd8acc4fd03f3e788e372f435571a7a41987b370274d9aef0a9b0211743fe0e32293602d3504684e0d42d13fd0511a8222676aee7461fabb2338d49d
+MISC ChangeLog 4992 SHA256 9873f2a5593e9e78f595e27ab2eee38f1a18073be34be685022079868ca9507b SHA512 3972f860298887b4db51b350a7ac4a9335c03a3852cde127d4d3e986903a58419d2f34859f1e0d18db74bbd61c93beaf78f099e08efacc3ee5d89f2b189a8310 WHIRLPOOL fb27399d8dff6de0e77b719a11ae83feb43f93a44c417ef6355396dbf62eacfbd36216ce04ab00aa11c647e74a66701e1dcee323c9e99880e93a83afd2a46fce
+MISC ChangeLog-2015 15984 SHA256 d2c78de60c093b85955c8b73aa20addf09e709b695803c3fc59851a4370ceee8 SHA512 22764251f86be44f7e960cd57775d0dcd77198b63bec2f8b24b3ba83027f69cc9e323e19daad36303fb5a5b38bc6344ca3aae1c4dba9fbb660e1757e45e5d8f8 WHIRLPOOL 8128bc9a98607919fb325e84788468cb490fa7b7c5b4ab9eef8056eb1e300086cfd4c14996a281fb0cebcc9bbbe2c83e559b159bdb91806bc375f61da59c5612
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/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 type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild
new file mode 100644
index 000000000000..859cac8f1e20
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A nautilus extension for sending files to locations"
+HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="debug"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.90.3:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Needed for eautoreconf
+#	>=gnome-base/gnome-common-0.12
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Does not require introspection at all, bug #561008
+	sed -i -e 's/\(^ \+enable_introspection\)=yes/\1=no/' configure || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ')
+}
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild
new file mode 100644
index 000000000000..e9154f9ba50a
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A nautilus extension for sending files to locations"
+HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.90.3:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Needed for eautoreconf
+#	>=gnome-base/gnome-common-0.12
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Does not require introspection at all, bug #561008
+	sed -i -e 's/\(^ \+enable_introspection\)=yes/\1=no/' configure || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ')
+}
+
+pkg_postinst() {
+	if ! has_version "gnome-base/nautilus[sendto]"; then
+		einfo "Note that ${CATEGORY}/${PN} is meant to be used as a helper by gnome-base/nautilus[sendto]"
+	fi
+}
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
new file mode 100644
index 000000000000..f39356843f36
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/Manifest
@@ -0,0 +1,10 @@
+AUX 0.12.5-Makefile 759 SHA256 0899d00cce355cef1dd93c8d7da0fb68a461184e904c817e4109f51e123786fb SHA512 57731bd3626b33c34f10f84cbe21654eedb2bbee7a374f78ae2015e9bfaf273f7cf797d5a5a7e31ab7ebfb6a8e7241dc7735126634ce455dc57f057158b21b8d WHIRLPOOL 18e66e7695aa2892ea91c70dcee187fc52bd9a89ffa5e86a735dab822549084ea94e01d760d656213eacb428708559e830a5522e2729f2b9ea4e5a6299857678
+DIST tracker-1.10.5.tar.xz 5033992 SHA256 3b8488f0e372054790f2fd4207227c5b15425bf1ab829d76928ac0b32de9c5b7 SHA512 e26f394681d0da28fb28536655f3c584de4aa7ce38c5a9762f81c9bfd21185d8df542b8d72ab337fb63ab91a1df9c733053fb6fa02cdffdc4edd873e0f70b800 WHIRLPOOL 0ab0a66cee2eb14b7893dd3719b0095e3cb3f49cb4db8bebcaa4f5174e726fb7db5f5706a635ffc71d89ab05494f991d4e8b2e62077c5cf2db85f5d9d7a3f4f8
+DIST tracker-1.12.2.tar.xz 5047740 SHA256 ebeb42ef982d0e45c8b8eea8440dcd1c06cd04c7974440a2012942552882bffd SHA512 32765d5a186b54e691b749af0be9a052d6edf367b759cd9236efb5af84e05e62301ca0d50303ca6d97b92b59e99a3934d3e6444701c07938638d5784f4155dec WHIRLPOOL 5ce2bfb1645e99ba3163811ec44b8b93a18c4387bfd09850462abec4ada3c3ef73edf62e716c48d6c99e68fb7ffffefbf3a36de5b0ee436fd936bbc3ac757a36
+DIST tracker-1.12.3.tar.xz 5053768 SHA256 23ce943878c1165c3f52fe97150c71708ebfbb5da3020e9a7247ad4f5120f8d6 SHA512 4c2155a295bc431740e52394885edfa2fd8487ef2f4b6749b9392a82ac355a440fb34381267a8793414fe750501fed7e1b1d0c5b06a766282513de78adde41d3 WHIRLPOOL 100b054f9aa5fc84284084dddc3e0ca0e296c3ce98e595b2c8b338d24c5be4977b55ac9a9c028341c71eb418eb9b3385a7760b892aa7a559587623eb61fdc06e
+EBUILD nautilus-tracker-tags-1.10.5.ebuild 969 SHA256 a1f27a1151759df672acf0c2cf82be658d2f8643427cbb52c419f493cc8ecbc0 SHA512 e5bca77ccf67c817d48c6490f7bbdc3d5b056c47847e973409299053bf5f35057bdac1e6bd90f542811cec5a75689bd571c93b67a82b8fba0dc09b2f62cfaaf1 WHIRLPOOL f632c1437a8572e9279c7997066757346739de6b405304f8dcad42251d93ee1d0486ab42c6c7c39d976105fa8b6647cac03ea332083395aee5bedcbe5a8bf1db
+EBUILD nautilus-tracker-tags-1.12.2.ebuild 971 SHA256 84ea48203e5872d1f34ac611d24df8c1787db07634e14b70fc608b95dfb225d2 SHA512 b547817dce67e54fb266277f9fc9e251d88ed49586c9366ce75ce03e83865d5a35043205e6a7e4ac3d95895427617bf84d6df5bf3f5367e1b1baa34bb7cc8987 WHIRLPOOL b2c66e7a6c63c6c97ef8ba6083cafc13474d0e0e25201ca3960f7655d4c0755503b179c7fefc7468ed3dfc81673bd56a7cd0f1ea2b252898f1f379c492ae8f2b
+EBUILD nautilus-tracker-tags-1.12.3.ebuild 971 SHA256 84ea48203e5872d1f34ac611d24df8c1787db07634e14b70fc608b95dfb225d2 SHA512 b547817dce67e54fb266277f9fc9e251d88ed49586c9366ce75ce03e83865d5a35043205e6a7e4ac3d95895427617bf84d6df5bf3f5367e1b1baa34bb7cc8987 WHIRLPOOL b2c66e7a6c63c6c97ef8ba6083cafc13474d0e0e25201ca3960f7655d4c0755503b179c7fefc7468ed3dfc81673bd56a7cd0f1ea2b252898f1f379c492ae8f2b
+MISC ChangeLog 6477 SHA256 a941c2588f9097f25fd3b231f1319a6e6eaf6a1b896783a125a868d45d7dd21b SHA512 3c8244387fdfacb2604dd77fa8fcf6bd3dc6ec237599879c5f2970f6efe07d7bb1c969b8e46146bc0b400f24fe50a3b6e1aca4a186ccb881b8e8c9827295c172 WHIRLPOOL 8d3eade74ef7a4fb1008263841d2ef08bc4d3351a55f9649855aed2906969f2ba0b83ba42c1fb6d2037b9ecd1afecfe7b586dce5d6285db394126641d566454d
+MISC ChangeLog-2015 7286 SHA256 9096f8847df9f1600235acde721f6bab52b7ca23c0c08bfe82e86b700c115f06 SHA512 405d8bd989723d8ea1277f13708d831a399e5add459b6bd2ff5da4613180c5d1f9c678c91099f74914d34375e21fb435f5da2c29bf0155a9af747df19d5025bc WHIRLPOOL f3db3ee2e91daa146096282c2c09f6343ec4fd8118e82d85e5cfe2b75a527bc3f4cffe18970955c6352e4949f02d28da282f6f134f7203c66c7a6a4b572db514
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile b/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile
new file mode 100644
index 000000000000..c2aececf863d
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile
@@ -0,0 +1,15 @@
+EXTENSIONDIR := $(shell pkg-config --variable=extensiondir libnautilus-extension)
+CFLAGS := -fPIC $(CFLAGS) $(shell pkg-config --cflags glib-2.0 gtk+-3.0 libnautilus-extension tracker-sparql-$(TRACKER_API))
+LIBS := $(shell pkg-config --libs glib-2.0 gtk+-3.0 libnautilus-extension tracker-sparql-$(TRACKER_API))
+RPATH := $(shell pkg-config --variable=libdir tracker-sparql-$(TRACKER_API))/tracker-$(TRACKER_API)
+INSTALL = install
+
+object_files = tracker-tags-extension.o tracker-tags-utils.o tracker-tags-view.o
+
+libnautilus-tracker-tags.so: $(object_files)
+	$(CC) -shared -Wl,-rpath=$(RPATH) -Wl,-soname=$@ $(LDFLAGS) $^ $(LIBS) -o $@
+
+install: libnautilus-tracker-tags.so
+	$(INSTALL) -d $(DESTDIR)$(EXTENSIONDIR)/
+	$(INSTALL) $^ $(DESTDIR)$(EXTENSIONDIR)/
+
diff --git a/gnome-extra/nautilus-tracker-tags/metadata.xml b/gnome-extra/nautilus-tracker-tags/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.10.5.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.10.5.ebuild
new file mode 100644
index 000000000000..c3c94b391c37
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.10.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="tracker"
+
+inherit gnome.org toolchain-funcs
+
+DESCRIPTION="Nautilus extension to tag files for Tracker"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+COMMON_DEPEND="
+	~app-misc/tracker-${PV}
+	>=dev-libs/glib-2.44:2
+	>=gnome-base/nautilus-2.90
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-misc/tracker-0.12.5-r1[nautilus]
+"
+# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
+DEPEND="${COMMON_DEPEND}"
+
+S="${S}/src/plugins/nautilus"
+
+pkg_setup() {
+	tc-export CC
+	export TRACKER_API=1.0
+}
+
+src_prepare() {
+	default
+	cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
+	# config.h is not used, but is included in every source file...
+	sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
+}
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.2.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.2.ebuild
new file mode 100644
index 000000000000..43327e4aa8f4
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="tracker"
+
+inherit gnome.org toolchain-funcs
+
+DESCRIPTION="Nautilus extension to tag files for Tracker"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	~app-misc/tracker-${PV}
+	>=dev-libs/glib-2.44:2
+	>=gnome-base/nautilus-2.90
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-misc/tracker-0.12.5-r1[nautilus]
+"
+# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
+DEPEND="${COMMON_DEPEND}"
+
+S="${S}/src/plugins/nautilus"
+
+pkg_setup() {
+	tc-export CC
+	export TRACKER_API=1.0
+}
+
+src_prepare() {
+	default
+	cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
+	# config.h is not used, but is included in every source file...
+	sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
+}
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.3.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.3.ebuild
new file mode 100644
index 000000000000..43327e4aa8f4
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="tracker"
+
+inherit gnome.org toolchain-funcs
+
+DESCRIPTION="Nautilus extension to tag files for Tracker"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	~app-misc/tracker-${PV}
+	>=dev-libs/glib-2.44:2
+	>=gnome-base/nautilus-2.90
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-misc/tracker-0.12.5-r1[nautilus]
+"
+# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
+DEPEND="${COMMON_DEPEND}"
+
+S="${S}/src/plugins/nautilus"
+
+pkg_setup() {
+	tc-export CC
+	export TRACKER_API=1.0
+}
+
+src_prepare() {
+	default
+	cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
+	# config.h is not used, but is included in every source file...
+	sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
+}
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
new file mode 100644
index 000000000000..2d65c1138428
--- /dev/null
+++ b/gnome-extra/nemo/Manifest
@@ -0,0 +1,13 @@
+DIST nemo-2.8.7.tar.gz 1413445 SHA256 79ca0e28b43ebb701a6449424be1be4224e9014bf1bb3b722d77b23ecb3afab9 SHA512 5daf57f30c3eb9bfaf6eab80e71f84763bad1ca707ecc96194ae9ce5899d33b4fb1e0f784c237741ba06d80b2c6247d3d0d1a6146fb954c5d6a6e18583322f7c WHIRLPOOL d65e1eda923b107a89dca3ebb60a68fe5c71ee9f9aeec3ba6e4d1c52266be91724ff1ead1354fe6998e92f06faaa2a1e4554e28cf59ac2e0dc1e6375b2be8e20
+DIST nemo-3.0.6.tar.gz 1363302 SHA256 3a2704e110a30625f9e807d21df44a577606d383c1eaf1ef4dae0e4dd321cdec SHA512 a2741b13dd258c843a2b9096f6b3aca3cb22647e2d5e6b18013857bbbb4e9aceccbc80713365aff0d25faa31727ff86ec4a86dac2dd8a556cb0a6dc3346f7be2 WHIRLPOOL 9044e85af7e9fadb9ce56f33d0ba63c5f39cbcf8dce2df4850474f03fde440c8ed1e52bc50e92804f4269e2d3c4563760512a23323e1120db3b7ea39d37ed211
+DIST nemo-3.2.0.tar.gz 1365508 SHA256 84c5b0a1999c1b2ab08bd6933aa7c5bc18bb2805e52f2d7fdf2af644cd7cc8ac SHA512 0f238dca5849c9ad333592772588fd7ef5b572056f74794940c2ed6cd099f98587edea364221d5c5281918df21622780567993c051fc4f6adaf8e09ed63356b9 WHIRLPOOL 798856f8d014f1dfacd833a68f465795e33a48ebbabe9cc8ec9ff7c8851bc62576f28a75cbda8460002d01d115cc765ea40a4260a8274c7d3eee3f7d8ed3d0a2
+DIST nemo-3.4.4.tar.gz 1417650 SHA256 1ed1c4263c6c436bacbf70e2093c66f27c5ea9338d1b793df4dacd84993a9742 SHA512 f2056653a2ac1e26cd8da2226acbc05046988f2f051b72ed267f572ad010a6bd4d7d1ef39ee732cebb7a05dd3d88053bfe2cdc3aee31c20eac29a8f659bcd67b WHIRLPOOL 563a8b81b742b44e39d30dd642f0c428167c13aa2b78fa3e1f73663276ae3be60178a8ac7a5308206bacb797419970187447ddc33dfcbd26d80fc4b20c2ddc22
+DIST nemo-3.4.7.tar.gz 1422209 SHA256 73ca1cd22eaa229bcd87a74fdcf32ba58f1eb1e0376f12775870b6d1260550a1 SHA512 75f84e4c4f60c01a003ec413493107fa0ff02d3dcdb5772dd31b726905de1d49679b294e4760e5806b982c8a9e3fcd6411dc7deb3091545d74b688afaae39bbe WHIRLPOOL 923d52c297ebd870f334eae52a8913ff8f4c923bb320103e43e3ff75f6713074b18022d85eb3a9ab5b73459a9f8bba801f5a8a390b97d95e217b17c5437fc9bd
+EBUILD nemo-2.8.7.ebuild 2057 SHA256 d92800488ef0a718f1885d58da7e33b1814bf5dfd0b7e53e93e422ae1b09b1d4 SHA512 9c2925464ee3029a9422df959736ddcf59164445805fabdeb46b03cdb65f42dc54feb893a8121b80e0c81335b86d89297a1c9e18cca24eb761ac46d411f571c7 WHIRLPOOL a1365fdd6dc09df4cf552b18b3fb18efdc2e45d77001bfd6e489d4dab9c1f4ac94c5fb1e1d838892679081f7061afe391739ed8a6b36abc1c01e7752bc0310a0
+EBUILD nemo-3.0.6.ebuild 2057 SHA256 d92800488ef0a718f1885d58da7e33b1814bf5dfd0b7e53e93e422ae1b09b1d4 SHA512 9c2925464ee3029a9422df959736ddcf59164445805fabdeb46b03cdb65f42dc54feb893a8121b80e0c81335b86d89297a1c9e18cca24eb761ac46d411f571c7 WHIRLPOOL a1365fdd6dc09df4cf552b18b3fb18efdc2e45d77001bfd6e489d4dab9c1f4ac94c5fb1e1d838892679081f7061afe391739ed8a6b36abc1c01e7752bc0310a0
+EBUILD nemo-3.2.0.ebuild 2037 SHA256 46a29f22827853be948fa702aff299db47a79248d3a90d6d87855c3d221dcc3d SHA512 192ccd9436b6e402d0631b32e35955f371136204e46357108805f4c14a455d2a6389beb553cd07b35de28e6c34c42434b1b1a6776d46af75622dcd167d335a30 WHIRLPOOL 161314a51d2f544f68d269abce725e81b6d61afefcc1aaae5262a32e8f5cde8adffc5d5651eef25d192d9694be1fac645744921f21df3dce61141f5c65cc693a
+EBUILD nemo-3.4.4.ebuild 2058 SHA256 90d4c8f92cbce78f8d007210898397ddd9af9f2a373cabc50920ff139a2fa8d7 SHA512 9708445f2223b2d856636fded2268a1da8fc0cf040b2e18380facceb8f74e44703da7cf2069ed8685d014ae5b39dd181e88f601f83db3c0ba98f26edc55fe179 WHIRLPOOL 298fde64711db29026f1e142cc766233b5d050a9b908b5040637d9f4d1fd377155bb2643325f662cab50568445f428592ed69de7ca1352b0e5dfaf1fab8faee9
+EBUILD nemo-3.4.7.ebuild 2058 SHA256 90d4c8f92cbce78f8d007210898397ddd9af9f2a373cabc50920ff139a2fa8d7 SHA512 9708445f2223b2d856636fded2268a1da8fc0cf040b2e18380facceb8f74e44703da7cf2069ed8685d014ae5b39dd181e88f601f83db3c0ba98f26edc55fe179 WHIRLPOOL 298fde64711db29026f1e142cc766233b5d050a9b908b5040637d9f4d1fd377155bb2643325f662cab50568445f428592ed69de7ca1352b0e5dfaf1fab8faee9
+MISC ChangeLog 5902 SHA256 b55c8cd9f92f99616aa8ac3c3d54906b5953ec02def675448e71096d225041f5 SHA512 47c675866974263ba6a05f650952bf465d690e2f9c06a1e9d49265dc2703063018c9112d12eedb53452a89142f97994806623e5551d0c856c8f0a371aaac8251 WHIRLPOOL ee0a1bf1f409f76f48e2f0934c3d0d2c88c0af350b3662e9665a3a8a0a70a7fb5fe24cb949135a3377db8b864cb84b74b8ba28e3fc113b701bdd827d8d5a19c2
+MISC ChangeLog-2015 3714 SHA256 fea801d33a918b2ec26fd5fb7738d5ff45d660402ce4796902c4583c5250dd2f SHA512 ca2fe0dec1019b22350e59d8cc29f390b1566106746c01e89ca5278f49d5d01e47df89fc4a65b9b1663f642dd0f2e18184b672bbf86f834985955f8d1868fec2 WHIRLPOOL aa5b7c5115815fec78ac1df22514bd2b202456fe850c96395b62f36a19b04cda70198e56110e547961cdb35ad772512b7306c5bdc8bfee5984ff8edee7a6ad19
+MISC metadata.xml 539 SHA256 1f5925285bdd56dfa202a19de72aa9da334b4f0793b8e4cf3ed11b483ffdd640 SHA512 289c4ce4c117298edbfb90af9f468e1e944b2992a50aa8fd937fa3db9cdca2958f99105a481a0ffced036e94fd626faabbe3b487b42ebc278abd7350284f6832 WHIRLPOOL 2d540c03cc6eb8b5809be12ee611cefc3e54170ca4d764e2882c2a23c6135a091fa75d8067ba3c23cccdfbfb999c6eb76ecd3299a8d3d8636320c2692381c7de
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
new file mode 100644
index 000000000000..d6f98f80633e
--- /dev/null
+++ b/gnome-extra/nemo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<use>
+		<flag name="packagekit">Use packagekit to search for programs to open
+		unknown file types</flag>
+		<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">linuxmint/nemo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/nemo/nemo-2.8.7.ebuild b/gnome-extra/nemo/nemo-2.8.7.ebuild
new file mode 100644
index 000000000000..1de930b387b7
--- /dev/null
+++ b/gnome-extra/nemo/nemo-2.8.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
+}
diff --git a/gnome-extra/nemo/nemo-3.0.6.ebuild b/gnome-extra/nemo/nemo-3.0.6.ebuild
new file mode 100644
index 000000000000..1de930b387b7
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.0.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
+}
diff --git a/gnome-extra/nemo/nemo-3.2.0.ebuild b/gnome-extra/nemo/nemo-3.2.0.ebuild
new file mode 100644
index 000000000000..acb9b63c9b0a
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.2.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
+}
diff --git a/gnome-extra/nemo/nemo-3.4.4.ebuild b/gnome-extra/nemo/nemo-3.4.4.ebuild
new file mode 100644
index 000000000000..2b85d70f926a
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.4.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+	sys-libs/libselinux
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
+}
diff --git a/gnome-extra/nemo/nemo-3.4.7.ebuild b/gnome-extra/nemo/nemo-3.4.7.ebuild
new file mode 100644
index 000000000000..2b85d70f926a
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.4.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+	sys-libs/libselinux
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
new file mode 100644
index 000000000000..67815097d7f0
--- /dev/null
+++ b/gnome-extra/nm-applet/Manifest
@@ -0,0 +1,11 @@
+AUX 1.4.6-CVE-2017-6590.patch 8963 SHA256 c84dd9f0d6e000fd86c01ee46b70b1bd6a8c7aea0cc5b0d570fd630267d225e8 SHA512 7798b5f62b971c505e0d1569ea9daabe0683e6aadd2ecb6e653e7927e14f47fb0e672aee874f5125eff50aa56916f74bd0756f9433cfa0b040723bcc4a2b9532 WHIRLPOOL f7930a8e60081e623adb9d76a7c14978087546b9605273ef2af57515c7518c228e2254e6036bdf0d878f9316cb06304c05c0fd564cb28011355e121f6aeb25a2
+AUX 1.4.6-fix-nma-bindings.patch 1350 SHA256 42477482064651fc86983f90c5600795a06db618ae2b08ef5f694719d794fa72 SHA512 a2237c8fd94260c1681e97aabe6a8c203acb5e743996c280e6e7f8890cf4ccf1525c7d61d768e3418915258ef2a9416614a41eee6d223e4db11f1f168c17cf4f WHIRLPOOL 7047916553fd89a08f6ce13029572b9a716734e687a6f9f7ad1136303cc1028c1707cff32109bb8dfcbb0499343c48990dd1224a21037a8aa4e913f2c406777b
+AUX 1.4.6-fix-translations-in-g-c-c.patch 4530 SHA256 6c75497a045085b05ff79e06dd5283ce0bf08f07eeefaa49a5a5a56668e3557b SHA512 3af403696d1e647bfdf5a2316c17064b7fd4eb07c4ccce6d23fb0b6ce59143a90ba5b37377ed559d3abbe7fbe06642958c8a59b39cb67c19541dd6dd81831f7d WHIRLPOOL 370e9d3725cb900ec1003f38ae63a70757c147233bd921f8d240b822406dcf373bbecce9284b47aed407b8bc5695c0e596d58671bac07c3d2ba2463ed3ffccae
+AUX 1.4.6-improved-certfile-error-msg.patch 1481 SHA256 605c782fc9a98c960d1c2129621e1c13f1b1bb9f781bcd81f36efd3cc2344010 SHA512 dce3cbd0e8184d2558ffc63b068b7d1d396473f428fdba60c566eb1c5aae8c2519ee427516efebd63e69518ca55cac86c21db18a3753dd2780f0db2743d80bad WHIRLPOOL d476bfc2ab0155f0f3902fcf495143572ef6d0eb818d91f0c3974df024f4d357895d6c3544aaf392f80cc183e3eba341594051677988601ed248a44230833b19
+DIST network-manager-applet-1.4.6.tar.xz 1388916 SHA256 10a6fcfe8c6206cf18ec78a522a716b5ec9d0b7ca1e7d234c638725b316fec76 SHA512 f0eab5c50739c2309fa19336e23ead6603dc953b62fff0600a91988df8d41c2f300c22ebd4d5be8654a3fd7bac38dacc23be149f1a7085f10bb55e1830d9472f WHIRLPOOL f04c5bcf0796539b37fc1b83f81151be2fa68bb078209555196840617332ac8e624cc5911c9932b1768764c2bd696c613c760681d543f8e8e28d0f7f0bc7e221
+DIST network-manager-applet-1.8.2.tar.xz 1445920 SHA256 3e57e9cf545a336da7035af1ba6171900ebc023ef19a594fe170da64af84c925 SHA512 1e9019ca17a55138e08eaf34c7889b7d5f531e918412bf025c0e03eb0794dc323b59f0d3521f14e93b6a94756f8e2a52139c76117ed430c73bcd1366eeffb5c9 WHIRLPOOL 1f711907c0f0265b25b79b17681c8c666129699362d0dec11eac0413b0f9d9be322f4a0e2a760d586cb769c5446eb1fc191d4459be45a39f3c37e11ee738d495
+EBUILD nm-applet-1.4.6-r1.ebuild 1663 SHA256 83ecf1d487c8d765251e535e2eebc00e52fb96807684555284de6917e1c7eb7d SHA512 5179f190a8383b3c31e730f5bd58e298774996d8ecffddd99b933ffec712a476c55ff8d1b5a029e0ffb7daec0ae8f9fbbf15faef2df48ff665c4c51d0135efce WHIRLPOOL 08bb7bae947f38a8a10e4e3b753a8fbebfe170376027e7ed8df6b740456f33fd95a87dc940921249c44acee0864d6526b35c315f84bde7d7b74daf5d74c2fa07
+EBUILD nm-applet-1.8.2.ebuild 1522 SHA256 c0d8f9c2f2ac11ba905fe26cd66b982df5e61d013f8faacafa7d99f64d46a718 SHA512 9f6382da7112978a74cb6cb74d17d9494a9325d3610204e383f2f3e53cba69ae684d50b1fd5baeef523e80e6a15aed1d7fcb74245c53ecd60336e270c26795fa WHIRLPOOL d98896fa028ce52ac54df24d2dd20458d715e7c162567ed14b0674ceb0623fa37317f97af91f30a04672c5f69798af2533914315f733b26df1843629998465b3
+MISC ChangeLog 5652 SHA256 2157798f2974c9274f974f1381080cfb96aa3df9754f09cc0cdc8b59db09e200 SHA512 866b018bb3273d983e900c7776696307b36be3f5aaf9d61c3b7b16c5d13fcdc7de6405874669f4ba40f66b4a6c5281fea667670f9ed916f33fd5350a1633fd9e WHIRLPOOL f83d6091a9b96dcfe8676f22af36008e4c1823fbb2c826d52b7286bb1dffbd08e0549d2e5894b23e1a61377da1f723e4ced1a474d730aa88391d69b9d9ab4654
+MISC ChangeLog-2015 22254 SHA256 c13843558bd5a842cd5efe597448f8fea89d758a66affe0bd7d1db6e5263b822 SHA512 de6d997e857d78dca63957bcdbf7f6490b61d3c1f0c20a6256fd93b02a9cae4a7982bc99a4a98c7ed5764f386a31645ee52ab594e1ab7d1a9ae7bf0e8821da1e WHIRLPOOL 6ba379206076202296ccf3a95245d55a1a8ceaa23ea4ec075a9d6e98b35585b547e858d813a2a2ccc14afe1409706d335d4e2442f397671cc8bf11a94319163e
+MISC metadata.xml 548 SHA256 6fcdd2cd93e693b097a48e5c10fcca24f5b7c8e8cca26aaf703131a112ac8886 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067 WHIRLPOOL 4ece8ef258cf9c9cc923e85351abbb9357581a5a1a22973350cdd504093d9b747ac1570fee2d13fdde5f4d3a42fc986272466fb57c3385cbd5ae642df3bca743
diff --git a/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch b/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch
new file mode 100644
index 000000000000..25270e1f4c83
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch
@@ -0,0 +1,253 @@
+This is a squashed to one diff of the following 3 upstream commits:
+
+From d1ebd01abfad506d9a8797a252d4549c2df2045a Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain@orangesquash.org.uk>
+Date: Fri, 3 Mar 2017 12:27:23 +0000
+Subject: [PATCH 1/3] applet: check permissions before showing 802.1x wifi
+ dialog (CVE-2017-6590)
+
+In most places, we (or NM) check permissions before performing actions.
+One place we don't is when we need more information when connecting to
+and 802.1x network. In that case we pop up a dialog to ask for more
+information before initiaing the connection.
+
+The dialog contains a GTK+ filechooser. We don't want unprivileged users
+to have access to this as it allows opening files.
+
+Check for MODIFY_SYSTEM or MODIFY_OWN before showing the dialog for
+802.1x connections. If the user doesn't have or can't get it, don't show
+the dialog. They wouldn't have been able to create the connection
+anyway.
+
+This fixes CVE-2017-6590.
+
+https://mail.gnome.org/archives/networkmanager-list/2017-March/msg00032.html
+https://bugs.launchpad.net/bugs/1668321
+
+[bgalvani@redhat.com: changed commit subject line, added links]
+
+(cherry picked from commit 523d0439c9d5633daccc77474f793c82cbd731ee)
+
+From f1f61ade24296b93044b9719fb2de1b561955e83 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Tue, 14 Mar 2017 14:18:06 +0100
+Subject: [PATCH 2/3] applet-device-wifi: remove unused functions
+
+They are not needed since commit 9b002809514a ("applet: remove usage
+of dbus-glib and private session D-Bus API").
+
+(cherry picked from commit d1c7f4d61f2eca23d90078c587059e4d8d11d3fc)
+
+From 7a582c5e6536b9e9a542d4791ae38a9d2840936b Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Tue, 14 Mar 2017 14:37:19 +0100
+Subject: [PATCH 3/3] applet-device-wifi: return FALSE on failure of
+ new_auto_connection() method
+
+If the permission check fails, we never run the callback: return FALSE
+so that the caller can free resources.
+
+(cherry picked from commit 38303e04cefb56a0a2176c5e30b399b14f21fc05)
+
+diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
+index 7b8fa6e..cd44e05 100644
+--- a/src/applet-device-wifi.c
++++ b/src/applet-device-wifi.c
+@@ -40,12 +40,6 @@ static void wifi_dialog_response_cb (GtkDialog *dialog, gint response, gpointer
+ 
+ static NMAccessPoint *update_active_ap (NMDevice *device, NMDeviceState state, NMApplet *applet);
+ 
+-static void _do_new_auto_connection (NMApplet *applet,
+-                                     NMDevice *device,
+-                                     NMAccessPoint *ap,
+-                                     AppletNewAutoConnectionCallback callback,
+-                                     gpointer callback_data);
+-
+ /*****************************************************************************/
+ 
+ typedef struct {
+@@ -292,74 +286,6 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet)
+ 		gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE);
+ }
+ 
+-static void
+-dbus_8021x_add_and_activate_cb (GObject *client,
+-                                GAsyncResult *result,
+-                                gpointer user_data)
+-{
+-	GError *error = NULL;
+-	NMActiveConnection *active;
+-
+-	active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
+-	if (error)
+-		g_warning ("Failed to add/activate connection: (%d) %s", error->code, error->message);
+-
+-	g_clear_object (&active);
+-	g_clear_error (&error);
+-}
+-
+-typedef struct {
+-	NMApplet *applet;
+-	NMDevice *device;
+-	NMAccessPoint *ap;
+-} Dbus8021xInfo;
+-
+-static void
+-dbus_connect_8021x_cb (NMConnection *connection,
+-                       gboolean auto_created,
+-                       gboolean canceled,
+-                       gpointer user_data)
+-{
+-	Dbus8021xInfo *info = user_data;
+-
+-	if (canceled == FALSE) {
+-		g_return_if_fail (connection != NULL);
+-
+-		/* Ask NM to add the new connection and activate it; NM will fill in the
+-		 * missing details based on the specific object and the device.
+-		 */
+-		nm_client_add_and_activate_connection_async (info->applet->nm_client,
+-		                                             connection,
+-			                                     info->device,
+-			                                     nm_object_get_path (NM_OBJECT (info->ap)),
+-		                                             NULL,
+-			                                     dbus_8021x_add_and_activate_cb,
+-			                                     info->applet);
+-	}
+-
+-	g_object_unref (info->device);
+-	g_object_unref (info->ap);
+-	memset (info, 0, sizeof (*info));
+-	g_free (info);
+-}
+-
+-gboolean
+-applet_wifi_connect_to_8021x_network (NMApplet *applet,
+-                                      NMDevice *device,
+-                                      NMAccessPoint *ap)
+-{
+-	Dbus8021xInfo *info;
+-
+-	info = g_malloc0 (sizeof (*info));
+-	info->applet = applet;
+-	info->device = g_object_ref (device);
+-	info->ap = g_object_ref (ap);
+-
+-	_do_new_auto_connection (applet, device, ap, dbus_connect_8021x_cb, info);
+-	return TRUE;
+-}
+-
+-
+ typedef struct {
+ 	NMApplet *applet;
+ 	NMDeviceWifi *device;
+@@ -514,17 +440,28 @@ done:
+ 	gtk_widget_destroy (GTK_WIDGET (dialog));
+ }
+ 
+-static void
+-_do_new_auto_connection (NMApplet *applet,
+-                         NMDevice *device,
+-                         NMAccessPoint *ap,
+-                         AppletNewAutoConnectionCallback callback,
+-                         gpointer callback_data)
++static gboolean
++can_get_permission (NMApplet *applet, NMClientPermission perm)
+ {
+-	NMConnection *connection = NULL;
+-	NMSettingConnection *s_con = NULL;
++	if (   applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_YES
++	    || applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_AUTH)
++		return TRUE;
++	return FALSE;
++}
++
++static gboolean
++wifi_new_auto_connection (NMDevice *device,
++                          gpointer dclass_data,
++                          AppletNewAutoConnectionCallback callback,
++                          gpointer callback_data)
++{
++	WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
++	NMApplet *applet;
++	NMAccessPoint *ap;
++	NMConnection *connection;
++	NMSettingConnection *s_con;
+ 	NMSettingWireless *s_wifi = NULL;
+-	NMSettingWirelessSecurity *s_wsec = NULL;
++	NMSettingWirelessSecurity *s_wsec;
+ 	NMSetting8021x *s_8021x = NULL;
+ 	GBytes *ssid;
+ 	NM80211ApSecurityFlags wpa_flags, rsn_flags;
+@@ -532,9 +469,13 @@ _do_new_auto_connection (NMApplet *applet,
+ 	MoreInfo *more_info;
+ 	char *uuid;
+ 
+-	g_assert (applet);
+-	g_assert (device);
+-	g_assert (ap);
++	g_return_val_if_fail (dclass_data, FALSE);
++	g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
++	g_return_val_if_fail (NM_IS_ACCESS_POINT (info->ap), FALSE);
++	g_return_val_if_fail (NM_IS_APPLET (info->applet), FALSE);
++
++	applet = info->applet;
++	ap = info->ap;
+ 
+ 	connection = nm_simple_connection_new ();
+ 
+@@ -590,6 +531,15 @@ _do_new_auto_connection (NMApplet *applet,
+ 	 * Dialog Of Doom.
+ 	 */
+ 	if (s_8021x) {
++		if (!can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) &&
++		    !can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN)) {
++			const char *text = _("Failed to add new connection");
++			const char *err_text = _("Insufficient privileges.");
++			g_warning ("%s: %s", text, err_text);
++			utils_show_error_dialog (_("Connection failure"), text, err_text, FALSE, NULL);
++			g_clear_object (&connection);
++			return FALSE;
++		}
+ 		more_info = g_malloc0 (sizeof (*more_info));
+ 		more_info->applet = applet;
+ 		more_info->callback = callback;
+@@ -606,24 +556,10 @@ _do_new_auto_connection (NMApplet *applet,
+ 		/* Everything else can just get activated right away */
+ 		callback (connection, TRUE, FALSE, callback_data);
+ 	}
+-}
+ 
+-static gboolean
+-wifi_new_auto_connection (NMDevice *device,
+-                          gpointer dclass_data,
+-                          AppletNewAutoConnectionCallback callback,
+-                          gpointer callback_data)
+-{
+-	WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
+-
+-	g_return_val_if_fail (device != NULL, FALSE);
+-	g_return_val_if_fail (info->ap != NULL, FALSE);
+-
+-	_do_new_auto_connection (info->applet, device, info->ap, callback, callback_data);
+ 	return TRUE;
+ }
+ 
+-
+ static void
+ wifi_menu_item_activate (GtkMenuItem *item, gpointer user_data)
+ {
+diff --git a/src/applet.h b/src/applet.h
+index 41e95a1..b28dfa2 100644
+--- a/src/applet.h
++++ b/src/applet.h
+@@ -285,9 +285,6 @@ GdkPixbuf * nma_icon_check_and_load (const char *name,
+                                      NMApplet *applet);
+ 
+ gboolean applet_wifi_connect_to_hidden_network (NMApplet *applet);
+-gboolean applet_wifi_connect_to_8021x_network (NMApplet *applet,
+-                                               NMDevice *device,
+-                                               NMAccessPoint *ap);
+ gboolean applet_wifi_create_wifi_network (NMApplet *applet);
+ gboolean applet_wifi_can_create_wifi_network (NMApplet *applet);
+ 
diff --git a/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch b/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch
new file mode 100644
index 000000000000..2a04a5327394
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch
@@ -0,0 +1,38 @@
+From 58e47dc92d38974141e1053b25cae02d7c8414b0 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Tue, 7 Mar 2017 09:43:03 +0100
+Subject: [PATCH] libnma/pygobject: libnma/NMA must use libnm/NM instead of
+ legacy libraries
+
+libnma uses libnm, and not libnm-util/libnm-glib. Hence, the python bindings
+must load "NM" and not "NMClient"/"NetworkManager".
+
+As it was, the generated bindings for libnma were unusable and loading
+them would fail with
+
+    libnm-ERROR **: libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported
+
+https://bugzilla.gnome.org/show_bug.cgi?id=779153
+
+Fixes: 76a12beac4e8692f30071169e11e2b521ec4eab7
+(cherry picked from commit 7a59d41e5f6666d0da51f1f7aae7518befdb1182)
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a57e15f..e76c9ba 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -532,7 +532,7 @@ pkgconfig_DATA += src/libnma/libnma.pc
+ 
+ if HAVE_INTROSPECTION
+ src/libnma/NMA-1.0.gir: src/libnma/libnma.la
+-src_libnma_NMA_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
++src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
+ src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
+ src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
+ src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
+-- 
+2.10.1
+
diff --git a/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch b/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch
new file mode 100644
index 000000000000..8a1fe825e38e
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch
@@ -0,0 +1,80 @@
+From 718b24286559169ba29f89536c3f6c81dcfe6e30 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Mon, 13 Mar 2017 21:57:28 +0100
+Subject: [PATCH] libnma,libnm-gtk: use package-aware gettext() macro
+
+gettext("str") expands to dcgettext(NULL, "str") which gets
+translations from the last used domain, while _("str") is equivalent
+to g_dgettext(GETTEXT_PACKAGE, "str") which uses the library's
+translations.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=772362
+(cherry picked from commit 9df10e2e758a7b78aa5a69a15900030f45e48fff)
+---
+ src/libnm-gtk/nm-ui-utils.c | 10 +++++-----
+ src/libnma/nma-ui-utils.c   | 10 +++++-----
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
+index e92ff80..eec9a5f 100644
+--- a/src/libnm-gtk/nm-ui-utils.c
++++ b/src/libnm-gtk/nm-ui-utils.c
+@@ -642,7 +642,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
+ 	                                   icon_name_table[item]);
+ 	gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
+ 	                                 GTK_ENTRY_ICON_SECONDARY,
+-	                                 gettext (icon_desc_table[item]));
++	                                 _(icon_desc_table[item]));
+ 
+ 	/* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
+ 	 * Unfortunately, making GtkEntry insensitive will also make the icon
+@@ -843,12 +843,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
+ 	g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
+ 	g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
+ 	group = NULL;
+-	item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
++	item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
+ 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
+-	item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
+-	item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
++	item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
++	item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
+ 	if (with_not_required)
+-		item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
++		item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
+ 
+ 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
+ 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
+diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
+index 99e2e97..418ef5f 100644
+--- a/src/libnma/nma-ui-utils.c
++++ b/src/libnma/nma-ui-utils.c
+@@ -76,7 +76,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
+ 	                                   icon_name_table[item]);
+ 	gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
+ 	                                 GTK_ENTRY_ICON_SECONDARY,
+-	                                 gettext (icon_desc_table[item]));
++	                                 _(icon_desc_table[item]));
+ 
+ 	/* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
+ 	 * Unfortunately, making GtkEntry insensitive will also make the icon
+@@ -277,12 +277,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
+ 	g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
+ 	g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
+ 	group = NULL;
+-	item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
++	item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
+ 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
+-	item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
+-	item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
++	item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
++	item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
+ 	if (with_not_required)
+-		item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
++		item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
+ 
+ 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
+ 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
+-- 
+2.10.1
+
diff --git a/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch b/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch
new file mode 100644
index 000000000000..e83d4c34ca0e
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch
@@ -0,0 +1,39 @@
+From 3609f9687728f2f7f8cdb33723c1d44660b81004 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Thu, 23 Mar 2017 12:28:12 +0100
+Subject: [PATCH] c-e: improve error message for non-existing certificate file
+
+When the connection references a certifiate file that does not exist,
+the GUI's file picker button shows an "(None)", however the "Save"
+button is disable with message:
+
+  "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: unspecified error validating eap-method file"
+
+Slightly improve that by showing instead
+
+  "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: file "..." does not exist"
+
+The solution is not optimal because the GUI shows file "(None)",
+with is some hidden information that makes the connection invalid.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=780423
+(cherry picked from commit b603844fc50679fc8683227bfa0f3b6c8e77c2c7)
+---
+ src/wireless-security/eap-method.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
+index cb733e8..b5c6609 100644
+--- a/src/wireless-security/eap-method.c
++++ b/src/wireless-security/eap-method.c
+@@ -237,6 +237,7 @@ eap_method_validate_filepicker (GtkBuilder *builder,
+ 
+ 	if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+ 		success = FALSE;
++		g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("file \"%s\" does not exist"), filename);
+ 		goto out;
+ 	}
+ 
+-- 
+2.10.1
+
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
new file mode 100644
index 000000000000..7cb30b744ca5
--- /dev/null
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></flag>
+		<flag name="modemmanager">Enable support for mobile broadband devices
+			using <pkg>net-misc/modemmanager</pkg></flag>
+		<flag name="teamd">Enable teamd configuration editor</flag>
+	</use>
+</pkgmetadata>
diff --git a/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..ba43bc8b6e54
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection +modemmanager teamd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+
+RDEPEND="
+	app-crypt/libsecret
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/dbus-glib-0.88
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-3.4:3[introspection?]
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?]
+	net-misc/mobile-broadband-provider-info
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	virtual/freedesktop-icon-theme
+	virtual/libgudev:=
+	modemmanager? ( net-misc/modemmanager )
+	teamd? ( >=dev-libs/jansson-2.3 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.0
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig
+"
+
+PDEPEND="virtual/notification-daemon" #546134
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-nma-bindings.patch # NMA bindings fix to be usable in python etc
+	"${FILESDIR}"/${PV}-fix-translations-in-g-c-c.patch # g-c-c == gnome-control-center
+	"${FILESDIR}"/${PV}-CVE-2017-6590.patch # bug 613768
+	"${FILESDIR}"/${PV}-improved-certfile-error-msg.patch # bug 613646
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--without-appindicator \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		$(use_enable introspection) \
+		$(use_with modemmanager wwan) \
+		$(use_with teamd team)
+}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild
new file mode 100644
index 000000000000..a937ab737f58
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection gcr +modemmanager selinux teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-crypt/libsecret-0.18
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/dbus-glib-0.88
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-3.4:3[introspection?]
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
+	net-misc/mobile-broadband-provider-info
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	virtual/freedesktop-icon-theme
+	virtual/libgudev:=
+	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.3 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.0
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig
+"
+
+PDEPEND="virtual/notification-daemon" #546134
+
+src_configure() {
+	local myconf=(
+		--without-appindicator
+		--disable-lto
+		--disable-ld-gc
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		$(use_enable introspection)
+		$(use_with gcr)
+		$(use_with modemmanager wwan)
+		$(use_with selinux)
+		$(use_with teamd team)
+	)
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/gnome-extra/office-runner/Manifest b/gnome-extra/office-runner/Manifest
new file mode 100644
index 000000000000..6257cc0dacd6
--- /dev/null
+++ b/gnome-extra/office-runner/Manifest
@@ -0,0 +1,5 @@
+DIST office-runner-1.0.2.tar.xz 562660 SHA256 ea42d84960773bd3ec7bb412df61cbfb617a42f69db09ed337eef91ff94a8a97 SHA512 a840af75f014147d30e950a4bc8628c97a79c8161eab3d0f658f5e4f5200df5baaa761d4ea27dc1bc70c6a467fc2536ac0aa473c338ffcbfc48689ba1ec13177 WHIRLPOOL e0b1594da951646917fc15610b9c1bb9361301d86e0c073c74deeef66189845ca90db2aac910d9f96f70720ebc262c66259950a55ff2cefbf3369eac0d3284c3
+EBUILD office-runner-1.0.2.ebuild 878 SHA256 c58e38a3993f65de311d10bc0326c794ec3263dcd2d1f803c23f13c7ca7e258e SHA512 920d5eae8032228f0cb2c8661d2f2f14e9e5b087272a4e3508f714062a183eb7a2157f0110c07597ef04253ddb1c4e24ef3d40946a5da7195cf7b2e9a7a27572 WHIRLPOOL 72e7ed2a07dc18b19815e7ab7808bbb0f7c5ee5f117fdb8b7700829c5cadc8dd85acf81883ffe3d8dc68a8f877651f544277a7494d6cf944289468f7467a122b
+MISC ChangeLog 2448 SHA256 4e31f896d3d5d8f2c84dcf0dbb0e0b353f816d71e33c7f7b7842d43bc8d121d3 SHA512 e7117ce9778ac046f802f4d88a76e02e9a395ca66c622fba607a92eacb6d82e2a44248d9319f65da263d0629bda7a45ab80743dd14d53774e0eb246637f93cae WHIRLPOOL ab53ab76acb5a744b320a3e0b7a034204997b29c14845096de8626e4b7c7628dcf4145b483f513da4e06a0551cd09bc59c064576ff10870cf3714f4e760446ef
+MISC ChangeLog-2015 1624 SHA256 a96349f73090c99b67ee2f7d746cb55dfc1690b9d8f9152dd9de7dcca8bef42f SHA512 a805ffe20332e3ada67cc374b3e133e07424bb77537c274ac021d1431206153ef95c2ab6c9876c6b9daaf4c59d53dae8f27dbde4873fa885261220b335701d56 WHIRLPOOL 8087c5d79bc2385534163bd1fb0fc7141249003ec064b0bf5d9483724cb445b1983325b16ae3d8eb0f56a2f883cd3b17b010b41aa4b05e01f80868f4b68bafce
+MISC metadata.xml 511 SHA256 c611f2aab51093cd7add8816877ec6c98fa07b19228aad894e6aa5026a3f4222 SHA512 533588530a9d364711e14cbb38e5e7ded118441129fb02cd7efa08c3f2cb1d7e241726446c08f6e46eb671e948bbc199c8e07eac013229bae976b31a221c0ed2 WHIRLPOOL 50aa54636ff4d8f2a71a83a16d388ff495ab8ef3a8de2eaebeacd7d45194948db828112ea4535c6ccca546324decfbad58b38989500cb7d49ef0f13402a2ec84
diff --git a/gnome-extra/office-runner/metadata.xml b/gnome-extra/office-runner/metadata.xml
new file mode 100644
index 000000000000..11ae369033d5
--- /dev/null
+++ b/gnome-extra/office-runner/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<longdescription lang="en">A tool in the form of a lighthearted game that
+  temporarily inhibits GNOME's default suspend on lid close behavior,
+  allowing the user to move his laptop with the lid closed without dropping
+  network connections.
+</longdescription>
+</pkgmetadata>
diff --git a/gnome-extra/office-runner/office-runner-1.0.2.ebuild b/gnome-extra/office-runner/office-runner-1.0.2.ebuild
new file mode 100644
index 000000000000..d9bcef381725
--- /dev/null
+++ b/gnome-extra/office-runner/office-runner-1.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="Lighthearted tool to temporarily inhibit GNOME's suspend on lid close behavior"
+HOMEPAGE="http://www.hadess.net/search/label/office-runner"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=gnome-base/gnome-settings-daemon-3.0
+	>=x11-libs/gtk+-3.8:3
+"
+# requires systemd's org.freedesktop.login1 dbus service
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/systemd-190
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+DOC_CONTENTS="${PN} inhibits suspend on lid close only for 10 minutes"
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
new file mode 100644
index 000000000000..4cb9ee190bb0
--- /dev/null
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -0,0 +1,5 @@
+DIST polkit-gnome-0.105.tar.xz 310876 SHA256 1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369 SHA512 eae2504959bca6f2b53dbad1b743fc0414b82897e62623af80ee74c4080a10d6b07a4c90151ee1264891f27373321b8697ac8a747cba5254c765b4cd9161bd42 WHIRLPOOL d750b35f51cea440974949a820421d2d07a57a45108ea1b560de3e6ae42db47e0b05709a8bb0d4566a248d3828cb4d2e480a0bde240a069e1a1efdb4f9ccf048
+EBUILD polkit-gnome-0.105-r1.ebuild 1089 SHA256 d8e91434b89ea32047eed86d0831f502eda818260ee98355113025a8ee0bf9e4 SHA512 db286471057eb3db927037c4a09a6271f992e7eb78fa5a5a41487f03111fff1fecc7e33f086ce33056c76f1b85e77d605451c25aea5b7f29fc85250eb20dd309 WHIRLPOOL 37d80e65ca40a62ba626ac57ebe42d7ec2ebdd060e999031c40e1d577778d9ffd816e1ba10f40abd9e4817d0312d2420fbbf28cdb9bf50896c2e1e3630fa92a7
+MISC ChangeLog 3926 SHA256 325dc6c23d14e85d4dcd5bbc3f5d7c0dcb9e9544a8555756750646a6af73cbc0 SHA512 1cd76604775c1790931bbe7e0f6769efba39c4e67869e6d8274e929065bb3fe2e0a0f5614d3fc8232d3924a9f610031d189b1d92a0eb11a8c0f5d64380087f65 WHIRLPOOL aa2f9b575ac7775d3bccbdbbaaba282a52de7222fc152b6d8d04f5129ef8a6112022b0ab089f0a2e31c824d75ac5168945be555b784e455d9ecb5457eb17fc43
+MISC ChangeLog-2015 9983 SHA256 42157bb8904f318a4d2c0551daae39bd7b9515c22c954fcfa13939b51e54af2a SHA512 724cae657b052f41b4558be2ee47290c0603a647cd12a4103a2ffe3862833ee5da3880f238c1aa8746e5c0ebd2ca3a94c2b238e046af4847e794ac61e9edb9d7 WHIRLPOOL a6a30c2c29da417154276d8f8570d299562e4a9015619a7334a38d6cd318a4701ece0fa1bbd59849526cab35b7384d049fe9f3550635cd70806af963e157b83b
+MISC metadata.xml 266 SHA256 0fb19dc343b6776658fa3cd1d69453b5d65c5ac4e13c9d88bf6c5ca749fe7bcf SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b WHIRLPOOL 7c2830d8f128d2b7a7144d8f4fb5c605ced98690ac6e2fea8b4f2f6710e3bdc719cc9fdad142a104a5c68ca9ba8e659c51475056df35edc2e2ee1a3255c1d55d
diff --git a/gnome-extra/polkit-gnome/metadata.xml b/gnome-extra/polkit-gnome/metadata.xml
new file mode 100644
index 000000000000..d80c2d3fce7b
--- /dev/null
+++ b/gnome-extra/polkit-gnome/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 type="project">
+	<email>freedesktop-bugs@gentoo.org</email>
+	<name>Gentoo Freedesktop Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
new file mode 100644
index 000000000000..5013ca8e3219
--- /dev/null
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit gnome.org
+
+DESCRIPTION="A dbus session bus service that is used to bring up authentication dialogs"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.30
+	>=sys-auth/polkit-0.102
+	x11-libs/gtk+:3
+	!lxde-base/lxpolkit"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS HACKING NEWS README TODO )
+
+src_install() {
+	default
+
+	cat <<-EOF > "${T}"/polkit-gnome-authentication-agent-1.desktop
+	[Desktop Entry]
+	Name=PolicyKit Authentication Agent
+	Comment=PolicyKit Authentication Agent
+	Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+	Terminal=false
+	Type=Application
+	Categories=
+	NoDisplay=true
+	NotShowIn=MATE;KDE;
+	AutostartCondition=GNOME3 if-session gnome-fallback
+	EOF
+
+	insinto /etc/xdg/autostart
+	doins "${T}"/polkit-gnome-authentication-agent-1.desktop
+}
diff --git a/gnome-extra/seahorse-nautilus/Manifest b/gnome-extra/seahorse-nautilus/Manifest
new file mode 100644
index 000000000000..6f9fd0250785
--- /dev/null
+++ b/gnome-extra/seahorse-nautilus/Manifest
@@ -0,0 +1,5 @@
+DIST seahorse-nautilus-3.11.92.tar.xz 395304 SHA256 70374f9bb46a0adfbd154f4094e7a05b7766abfe60845a0a49463b4d15f17f92 SHA512 d3815bfaaf2a5e96beb94abe01fb3f7733e867a04681d4bed540fce58f6556c62534d3217ec0bf1452e848551a42ec703ec241029486d3dcd966c16ff27b87f2 WHIRLPOOL f1c8b6f798c10b0b947e660a16bc8d3a5dcc53c987acef612fd8e21c9eca0e3802c934caa7d691ac74e76e747cb90e6a663199c830d219918e23fb64e6d8212f
+EBUILD seahorse-nautilus-3.11.92.ebuild 1252 SHA256 b85c041bc79e7c2830544de0457532062c62dfcc37e203d42314e377686e8607 SHA512 a76cea1dcfbfd7131017883a2b93353619b5cfcc6d74e42a6ce65d12bdb31fae876f99285072e20f9dfb0657d671bd0d44af3b6952c0d04a1ca11b6365463fc3 WHIRLPOOL 603eac9ce2869f8c4a2fc02151714c3295808f9d23bd2db99eb32d47b9ace0ecfa3240803693e252b1fd4d08bb47000d6f4caa7dbc4382534ab2507092e64761
+MISC ChangeLog 2538 SHA256 6c51c47b0e9f2d9bcbdc87d2671e40e082f5985b09012714db98e6e097f92fab SHA512 3508bda2ea97c43be665a5b4c8ccbc4b4ac03e7c19e4fd145b819d33abd0300ea2f1ae83e9d87d98873dcd93edbd4a7bf164987d5dfc6d03abea48ea724f1791 WHIRLPOOL 21ff5d948e41d226c62dbd94f52784be76209893905de29733b406280cc8d6787b04f648a6f187bb2988754c5027f4718615b9c656c4dc557723f4da46943fdc
+MISC ChangeLog-2015 2792 SHA256 9055b2b17f708c399212e0efe874e9ecc221ad338280333941a9fbe82577fc23 SHA512 cbb75b7a233da1c714384fd9dd52b5ba9f1f74052f2802a458a5f455384b7643141a1f6b0a5913c8ce2f22b68600accdf17f875603fdb85c5845482084e94269 WHIRLPOOL 000a071a46be30330cceda7ab04966280b42c235e3e9dc3a7662120543323222a82453d178598b6c09e35ccaa49a9b0682d9ee947b4799358c4175c0cfde177c
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/seahorse-nautilus/metadata.xml b/gnome-extra/seahorse-nautilus/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/seahorse-nautilus/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
new file mode 100644
index 000000000000..5c84f7204542
--- /dev/null
+++ b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Nautilus extension for encrypting and decrypting files with GnuPG"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Seahorse"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.0.0
+	>=app-crypt/gcr-3.4[gtk]
+	>=dev-libs/dbus-glib-0.35
+	>=dev-libs/glib-2.28:2
+	gnome-base/gnome-keyring
+	>=gnome-base/nautilus-3
+	x11-libs/gtk+:3
+	>=x11-libs/libcryptui-3.9.90
+	>=x11-libs/libnotify-0.3:=
+	>=app-crypt/gnupg-1.4
+"
+# seahorse-nautilus was formerly part of seahorse-plugins
+RDEPEND="${COMMON_DEPEND}
+	!app-crypt/seahorse-plugins[nautilus]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not let configure mangle CFLAGS
+	sed -e '/^[ \t]*CFLAGS="$CFLAGS \(-g\|-O0\)/d' -i configure.ac configure ||
+		die "sed failed"
+
+	# Fix icon location, upstream bug #719763
+	sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
+		tool/seahorse-notification.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gpg-check \
+		--enable-libnotify
+}
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
new file mode 100644
index 000000000000..6e885d869c82
--- /dev/null
+++ b/gnome-extra/sushi/Manifest
@@ -0,0 +1,5 @@
+DIST sushi-3.24.0.tar.xz 297332 SHA256 f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48 SHA512 b49e9c1ef1dc4c74ae06f6da9a2f428ed4ee3ec1ca3ba04c483ddb1bd976e6981466456d27a641048756a1ea0bf2fe033883059895e889950d0d0f340535b29b WHIRLPOOL 6ba2977eaf003897f56dcd413d62fc3e7f80c9412e400b175b87e3a9feb069ed24ff2294e2249c973b9125602f112e6b10e3a517339bf9816e71df12de7df050
+EBUILD sushi-3.24.0.ebuild 1397 SHA256 b20e5218bf541e72bb0f6ed583f192ac498a5a07474e92216cea51cdd7a98959 SHA512 0dc8e816b550fc5ab58beeec4f379442adb23e9fbdb164551a4ab5551e604e3171abb4c0c5ee49f54ebf4ac3d7397d085fbc12006aa4693fe620e196351be130 WHIRLPOOL 80e1011f338dd3e50cd80c8619a96f04ebf3c14d8ac0acf2557eb38b4f4625f4d21d0726ae91fb03c5be6c599ba3a710a5491cd26f1889745556dbd2bde0d247
+MISC ChangeLog 4516 SHA256 e68bcec7d04ee6ba14e8a1e100b879a20ae2593acbc7c452791c406ae189702a SHA512 03edf5c1ff0f67f57144f0685c052d845f0dd7ccf36709133025e12eef6d8ec16cb4498d6db6c49dc87d076a1dfd0a4ef2d083c2c82af729f2038ff905cd52e6 WHIRLPOOL c923c97370f8ff57ae960eb7b9571dd4b6b1046f3de9212cad81cdd3d488a481e0c0426332066313f899bc802a7726ab30041e9afdb5fb3cff14249188adf253
+MISC ChangeLog-2015 3599 SHA256 1e9d5e3372af26a07524d5a6a4134250dd6bd5d3ad3f6dd26d6485acd003f713 SHA512 a501cab0ff318049094eabd8b3588797d4d17539a1d418322ff3975729a790b6f481c4f177d6fa50e0c0cca181d0d4b8a4f8d4f15312fcb2fe9b32f6e15edcb1 WHIRLPOOL b20605283a52e1220980e67b4cd8f3c0b85864683a313c06e8a94e4e57e5cdd1b8c242d2cd04e3481c15b236e6d6a34c0da7318ea24494f608195e3ff6738bf9
+MISC metadata.xml 384 SHA256 58583fdefda01aa27d9e24c481034249347cda3d7e161f91103dcb7a6eb85ecc SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651 WHIRLPOOL e4d403f8e5807eb0435f8b94fb7a13fba1667432c5459342daa78d889ad2cc015c551652635f426f8cf51365c8958755a95cb783d30ef30750ab3afd6194e460
diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
new file mode 100644
index 000000000000..367fae8e3eae
--- /dev/null
+++ b/gnome-extra/sushi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="office">Support viewing file formats such as generated by
+			<pkg>app-office/libreoffice</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/gnome-extra/sushi/sushi-3.24.0.ebuild b/gnome-extra/sushi/sushi-3.24.0.ebuild
new file mode 100644
index 000000000000..3a0f5d975093
--- /dev/null
+++ b/gnome-extra/sushi/sushi-3.24.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="https://git.gnome.org/browse/sushi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="office"
+
+# Optional app-office/unoconv support (OOo to pdf)
+# freetype needed for font loader
+# gtk+[X] optionally needed for sushi_create_foreign_window(); when wayland is more widespread, might want to not force it
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.23[introspection]
+	>=dev-libs/gjs-1.40
+	>=dev-libs/glib-2.29.14:2
+	>=dev-libs/gobject-introspection-0.9.6:=
+	>=media-libs/clutter-1.11.4:1.0[introspection]
+	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
+	>=x11-libs/gtk+-3.13.2:3[X,introspection]
+
+	>=app-text/evince-3.0[introspection]
+	media-libs/freetype:2
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	>=media-libs/harfbuzz-0.9.9:=
+	media-libs/clutter-gst:3.0[introspection]
+	media-libs/musicbrainz:5=
+	net-libs/webkit-gtk:4[introspection]
+	x11-libs/gtksourceview:3.0[introspection]
+
+	office? ( app-office/unoconv )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/nautilus-3.1.90
+"
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
new file mode 100644
index 000000000000..8b9c590e6074
--- /dev/null
+++ b/gnome-extra/synapse/Manifest
@@ -0,0 +1,5 @@
+DIST synapse-0.2.99.2.tar.xz 444156 SHA256 fbef056a788b0ee713a3f4dcf024d214b0128e8a64dd7c601345f5e478d59611 SHA512 e4b6e0399a83fc7880d786e8cff6360850d5ce1ac2eabccb5ce6d3989e4356c42adf1155905b39bb6b10887c02844dad01cdf8d556bc4bd6c7cd11956f8116c7 WHIRLPOOL b5228e4952072f426180c4db7c2f8b6b45912157835b42e0ff57c7fbd5e662aae29cd51dd0647607178003f08bb037498757c070c84b72bcfbb8eda7e72a8668
+EBUILD synapse-0.2.99.2.ebuild 1379 SHA256 db105446567509815b9d94358ed02c89b5ac576b44b8414615ac814820e18db0 SHA512 920c7dd3a09658163aa87d46ed015e3eabeb6e85bf01312285da704b4a033f3f4f23154b51bd46f8cb38aca9041e464699047757290edc0f47949742e5ec2650 WHIRLPOOL fdfafb24afddae9a87226d01b1965a0d854213f8d8f5322ad04b952555b97d0307f7055aded3e3ea163b527a03929d98a9167dc8923b1ab44fa7ac8915d9460d
+MISC ChangeLog 5123 SHA256 dd9d76e7de88ca3a1853031b5de47748623d1ba46a0b3af4f376929d2812c673 SHA512 c60c262d29a1b078780d912a50d2835fb3f14b15deca29b4aacf207a5f55464162918f0c7efe4c49f1cf93cf20747fe849e5b5c34761065fcc525e63f0e34b98 WHIRLPOOL 8e9a76c246c1b6c03a9300c36a395afd48e18cd4a9f9378d6cb23c49c83cc8c597d2a916a83db613186a1832e730fac2d035dc0083cb040742afe9633dd039c6
+MISC ChangeLog-2015 4145 SHA256 57ac0e9f179c262fd03dd0d4cbf4e8ab938ce70c80b1f6982cb932ab5b80cce0 SHA512 b6f9692532b3fd5859b8b5dd29dc59e942d8c17e8ff75578c76c06c2b49e4c70df880bf3d286eb9e4efa6851541741083628cc42304bad454ed01dcbbc46e796 WHIRLPOOL 99f19c171aa2831751045487067a81605b688ddae3a37bb5fb6f2f1d3d850b794f16f75fa08197d7b2bdcfbb86d6f465801df17b37be3cc9125da2fcb6862a9d
+MISC metadata.xml 540 SHA256 573c8fa34deeba93c02c349b772fb04037c79c1d6cc1b0057fdd5e11ad43b8d8 SHA512 db221d32a0e7ac3ef54e1e253a104da7e396d33d25f4f30439a91d27bc79b249a556cfa5bae88eb44dbade1c7c362569c049b9af052d54d0d6ee3a10e7484a03 WHIRLPOOL 9e0d81a9c0da9ed7a7cbf5d90dff0651ebb2a8a83d0acf19aca65fa81ad57daec2358f815c7c15982b5c4bb69cd9827bdfca64e02f7793d95ec4f7463b326720
diff --git a/gnome-extra/synapse/metadata.xml b/gnome-extra/synapse/metadata.xml
new file mode 100644
index 000000000000..2648fe7f7e66
--- /dev/null
+++ b/gnome-extra/synapse/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
+  <use>
+    <flag name="plugins">Build support for plugins using librest</flag>
+    <flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">synapse-project</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/synapse/synapse-0.2.99.2.ebuild b/gnome-extra/synapse/synapse-0.2.99.2.ebuild
new file mode 100644
index 000000000000..ffbd527b6a9f
--- /dev/null
+++ b/gnome-extra/synapse/synapse-0.2.99.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GCONF_DEBUG="no" # gnome2_src_configure is not being used
+AUTOTOOLS_AUTORECONF=true
+
+inherit gnome2 autotools-utils vala
+
+DESCRIPTION="A program launcher in the style of GNOME Do"
+HOMEPAGE="https://launchpad.net/synapse-project/"
+SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+# "ayatana" support pending on GTK+-3.x version of synapse wrt #411613
+IUSE="plugins +zeitgeist"
+
+RDEPEND="
+	dev-libs/libgee:0.8
+	>=dev-libs/glib-2.28.0:2
+	dev-libs/json-glib
+	dev-libs/keybinder:3
+	dev-libs/libunique:1
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtkhotkey
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/libnotify
+	x11-libs/pango
+	x11-themes/adwaita-icon-theme
+	plugins? ( >=net-libs/rest-0.7 )
+	zeitgeist? (
+		dev-libs/libzeitgeist
+		>=gnome-extra/zeitgeist-0.9.14[fts]
+		)"
+	#ayatana? ( dev-libs/libappindicator )
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
+	vala_src_prepare
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-indicator=no
+		$(use_enable plugins librest yes)
+		$(use_enable zeitgeist)
+		)
+	autotools-utils_src_configure
+}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
new file mode 100644
index 000000000000..743f0a15513c
--- /dev/null
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -0,0 +1,5 @@
+DIST yelp-xsl-3.20.1.tar.xz 568400 SHA256 dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0 SHA512 7ea22c3180261917d1a277a9b5023f9b2b22346bc3f55cdb1c61c4ae8f78411da93058b55f99c25c9a1bedad21ffa6c3dc460e1ee98614a84a4efa2c2449baac WHIRLPOOL fcda77d337bf081b82ad89c2756f79cb5ce1b4151ccd37819b616891bf30325d2ff60506ce773365ffe9288077c93b6b5d87837d8201af78c71333b89f0a442e
+EBUILD yelp-xsl-3.20.1.ebuild 604 SHA256 24b5fa0a7005c2cf5e2d22d3212e980229d9a1345fe5d098ebc0e17953e6e4f9 SHA512 29a05a50de4e884a2f3de7a2c4c51aeb7edbd52f1e9b9c2a3be42c1ac2ff4485e8273330ef4d807fe36a7b2cdcfdde7e53e486bcab6c753864f599df06c5b2af WHIRLPOOL 649923fdbcdabcf3ab136a53adb1f3f56d4af3ab21c8613a0a4126de9e4258342a7f9280776808940145e4bda78383ef5d858dba5dbb216cd36266a571c630e0
+MISC ChangeLog 6737 SHA256 66b46bd9dbd13552d7917f35024a348ebd0ecdfd40c64e71aa2a090b1c7ace70 SHA512 84f638baacb0029740870b261e655bf5f0bc3575559f4c527bd2eacccea06f333e159318646b0362508f2ceace06a8d760a52f405b557aed2402da7991d86424 WHIRLPOOL 54c5ddc649eb7e37b66a48866e08c6db171c979ae047499681bded96d487821da121d20759d701113b247971eeb46df271fe070a0d36935a5daf7f72a5e12499
+MISC ChangeLog-2015 9796 SHA256 edb6edeecc0d83cf5a8907cc54df5f959e129daa98cf89ef2a5e00b5b41a17c4 SHA512 21372c2e48b8b43ad5cd2cf66d52788b9dea293a991fd7034d568249c8d08593f582b6a17e2a2917852cb88eb2bb4e0754e041f7005bbe2fe3f7eefb818aa6a8 WHIRLPOOL 94fae9e59af378f40ae87ff417fb3d2bdffa1b817e11cd5cb1dce1898cf42a31337011cc030122e0a5f97273049433f7645ffb3635fd272f07058c32e11b6921
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/yelp-xsl/metadata.xml b/gnome-extra/yelp-xsl/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/yelp-xsl/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
new file mode 100644
index 000000000000..feb7c898189e
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/itstool-1.2.0
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
new file mode 100644
index 000000000000..521f1766d81e
--- /dev/null
+++ b/gnome-extra/yelp/Manifest
@@ -0,0 +1,6 @@
+AUX yelp-3.20.0-man-compatibility.patch 4229 SHA256 9bf59df06271faddd505da64d79ad1073107075e80dedb2d84ebf8fec5f5e01f SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d WHIRLPOOL 6fa33682251dce1b88d59eaf2f0a080a765f330c18ac152d326c712b8ad244a4651eb16e4c66cf3beb11cd5678228018f235290a4d41972617383b7f6710ede8
+DIST yelp-3.22.0.tar.xz 1383500 SHA256 8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e SHA512 ba31c7801fc4642d9c4dcf34d4b8c02005f2ebfab4ecfe4e726685c5fb95f05311fc3a481f9b2d2e8b211395e4c932adba0e68b57d264cd1f6065402d9143d32 WHIRLPOOL 40227288b1f3788bb8740872f9e960f97765caf595d56ecb02cac451e08c155f15c47d086e00fc8f32c4e665ed8fb67da76312b7ef4d4c6f1c047d83687c2e86
+EBUILD yelp-3.22.0.ebuild 1198 SHA256 31b942ee0feb36e2494eb620f2068c4237eaf2c81a81b00e845d0fbdaf97a335 SHA512 2fe74f622210a48a7b1624ebc8ee5b7f03fde480869a040e74d670a6f34afb9df9fa6b8267891813e089609ef8c2f309cd144fa535a2c14de6425aa16f280901 WHIRLPOOL 7c33bc9abf8446377de3c4ed3626285be11d0845a1e411085382848e642fdc31becb213b45e75ba10ce3f56164ccda427132c3cc3d25d440411637d73058f134
+MISC ChangeLog 5153 SHA256 805354295bca2dc43029dbec0f852cea1157b667398c858b48859d39e65134c8 SHA512 88154f952df478d555d4ccdad6e6a7743f274734abc7b2f175d4611f666079cd4152b8b4b2b95e810bb15aa8b4cda543fecaf94fae4e24210e4cf9c8a05fa47e WHIRLPOOL 04bd625ab1f69c61ea80f6880b8f5bcae38fa945f927173285c038a31a732f8187e3052281fe1bdf7c26b6fb9f69c2af692fd50a74c09a35450ee840b5302a83
+MISC ChangeLog-2015 42089 SHA256 d04081bc8ab4c427871c2da73c23c4087676f02e4511c54aa10a278188e33d74 SHA512 213e785c28e076dc86b83b5928fa77a4246c0ef01402da37a71120944cc5d93429ffe5ba00b45110f3d9039c77a69af465c65fe48f6626c55b5a3ad6d93d1d33 WHIRLPOOL c0402c5a6a75109884209520287e4306a0313b2db35b3728d59bd4a56f2bfa38e4dbc0887f93e984420f4e3167eb8a7044af1a0fc199e9cfc20923046b032a4a
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch
new file mode 100644
index 000000000000..b756b67462bc
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch
@@ -0,0 +1,117 @@
+From b7f00d9fc5f4c948b3b412fa22488517e71a2987 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sun, 27 Mar 2016 17:11:59 +0200
+Subject: [PATCH] Enable compatibility with traditional man (#648854)
+
+As of commit 46a82ade3e6f0fac8f08b18e7fc23d8665f6f728, Yelp runs
+"man -Z -Tutf8 -EUTF-8 [FILE]" to obtain the groff intermediate format
+of the man page. However, the only implementation of man that accepts
+these options is man-db (used by Debian, Fedora, SUSE & Ubuntu).
+The traditional Linux man used by other distros and man implementations
+on non-Linux Unixes (FreeBSD, Solaris) do not have command-line options
+for outputting groff intermediate format.
+Therefore, on systems that do not use man-db, we need to manually
+uncompress the nroff source file and feed it to groff. This is best done
+using a small shell script (/usr/libexec/yelp-groff), both for for
+clarity and for ease of modification on systems with weird man setups.
+
+Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
+Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
+---
+ Makefile.am               |  2 ++
+ libyelp/yelp-groff        | 49 +++++++++++++++++++++++++++++++++++++++++++++++
+ libyelp/yelp-man-parser.c |  2 +-
+ 3 files changed, 52 insertions(+), 1 deletion(-)
+ create mode 100755 libyelp/yelp-groff
+
+diff --git a/Makefile.am b/Makefile.am
+index 30eba2c..b87f2b2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,6 +6,7 @@ BUILT_SOURCES = \
+ 	$(nodist_libyelp_libyelp_la_SOURCES)
+
+ lib_LTLIBRARIES = libyelp/libyelp.la
++libexec_SCRIPTS = libyelp/yelp-groff
+
+ libyelp_libyelp_la_SOURCES = \
+ 	libyelp/yelp-bookmarks.c \
+@@ -58,6 +59,7 @@ libyelp_libyelp_la_CFLAGS = \
+
+ libyelp_libyelp_la_CPPFLAGS = \
+ 	-DDATADIR=\""$(datadir)"\" \
++	-DLIBEXECDIR=\"$(libexecdir)\" \
+ 	-DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\" \
+ 	-DYELP_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/"web-extensions\" \
+ 	-I$(top_builddir)/libyelp
+diff --git a/libyelp/yelp-groff b/libyelp/yelp-groff
+new file mode 100755
+index 0000000..5348024
+--- /dev/null
++++ b/libyelp/yelp-groff
+@@ -0,0 +1,49 @@
++#!/bin/sh
++#
++# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@gmail.com>
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of the
++# License, or (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public
++# License along with this program; if not, write to the
++# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
++#
++###
++#
++# Process the requested compressed source nroff file and output groff
++# intermediate format.
++#
++
++filename=$1
++
++if [ -z ${filename} ] ; then
++    echo "Usage: yelp-groff [FILE]" >&2
++    echo "Process a man FILE and output groff intermediate format."
++    exit 1
++fi
++
++# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that.
++man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0
++
++# Otherwise, manually uncompress the file ...
++cat="cat"
++case ${filename} in
++    *.bz2)      cat="bzip2 -c -d" ;;
++    *.gz)       cat="gunzip -c" ;;
++    *.lzma)     cat="unlzma -c -d" ;;
++    *.xz)       cat="unxz -c" ;;
++    *.Z)        cat="zcat" ;;
++esac
++
++# ... and run groff to get the intermediate format; preprocess with tbl
++# unless MANROFFSEQ is defined.
++${cat} ${filename} | groff -${MANROFFSEQ:-t} -man -Z -Tutf8
+diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c
+index 46073a2..792e695 100644
+--- a/libyelp/yelp-man-parser.c
++++ b/libyelp/yelp-man-parser.c
+@@ -369,7 +369,7 @@ get_troff (gchar *path, GError **error)
+ {
+     gint ystdout;
+     GError *err = NULL;
+-    const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL };
++    const gchar *argv[] = { LIBEXECDIR "/yelp-groff", path, NULL };
+     gchar **my_argv;
+
+     /* g_strdupv() should accept a "const gchar **". */
+--
+2.7.4
+
diff --git a/gnome-extra/yelp/metadata.xml b/gnome-extra/yelp/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/yelp/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/yelp/yelp-3.22.0.ebuild b/gnome-extra/yelp/yelp-3.22.0.ebuild
new file mode 100644
index 000000000000..2d8c34372950
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.22.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.12
+	>=net-libs/webkit-gtk-2.7.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	eapply "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/gnome-extra/zeitgeist-explorer/Manifest b/gnome-extra/zeitgeist-explorer/Manifest
new file mode 100644
index 000000000000..36d7f201e213
--- /dev/null
+++ b/gnome-extra/zeitgeist-explorer/Manifest
@@ -0,0 +1,6 @@
+DIST zeitgeist-explorer-0.2.tar.gz 25503 SHA256 ac12e520713e86606f15335a182b5b5d3fbf6b132a0137940505e0af62153423 SHA512 05e16e4c6980ce0dd23fb3f74d0c45aad6e5a31d5b8982d04d20781c3527e4e1b768e75e67664fe5731202a3682c972fd759a71d58b420b31f72e3eb2dce7788 WHIRLPOOL 3a174ed5fc39f18a9ddb614f2cd1d75fd1a9988e85c2d73e0c862430b1e2c89f36399f02adf76a36ff2a0f9dd877e44d44a323ba08be8f8e98483616dd290ff0
+EBUILD zeitgeist-explorer-0.2-r1.ebuild 681 SHA256 ee55273db99e336d7dbf6641ddbfbdf941f6dd3975b33cb19c69560aeb9da478 SHA512 9f5bc87a5283ae8283723847bd8f8078965af58e330b9ff28bb84dd531de5719c2081d0c7f40c6f7b6272709137daf6a395a06fc19a710acd715432188ed3383 WHIRLPOOL 46c1fb1b081102dacda09285c4f437fbddd4436bcb25c5ab043c6879800a25e2cad8790783e1a2c4ad927e089fbce96aea8c97e012c0cf0f40a8abb9f9446fa1
+EBUILD zeitgeist-explorer-0.2-r2.ebuild 761 SHA256 a6afcd00254446678606c5b1b897ea9f92bca0304b47ad35a56532869ecbb5af SHA512 dd042d244537af39d3b9397b1034bd0bc4b5d6b5c54babdb0c6217dcb6bd9538949410601fe84c9c575e46852339a73b6bd7527d921a9d86fdf2619fbd4b36e8 WHIRLPOOL 64b9287f2a80838e5e77fcfb5a903d2fc83a7257e632a04b35f0443dccd20add9189508ac0139354af4810b90c40dda598eae14eb568dcf30b00ad3f566ef0cd
+MISC ChangeLog 2936 SHA256 793878c8d34c5c52752086e7c9a3f430fd5dc4a92a9d0f5fe279e68b6def638d SHA512 9b6e4c6a4a0374848e343749be20bec7123549384c9b02a3fd14ab85250ad40ce442cbe3e00d0c03290df334e19406319d11ca2b281752c16376f99c7845d7ab WHIRLPOOL e0d7bea79692f6bb7262f7efc0f0d7e465e0a3a746a0b0514b7473af330c08f253f6bf5101a3a56c6bf4bc1e1e2c6cb7fb2bb03d3311d7b3e0db6c81b40bb76e
+MISC ChangeLog-2015 1433 SHA256 5e52e31bd251f3f125a151a56693a9da2b1e4614079d9c50278edd4e46f022d8 SHA512 df75491ab371de24914ff673c4e90c9f793bcdecf3908552eab6967b7e03b8343df1387195e4225cb76139b67f2c79c66b911077c789af20cba2c6e8e6eefcaf WHIRLPOOL bfed89349e614f71fdfb68e83b3a16dfbe288fe4f500ae1cee0190671962625d4c45b6ab1b4e33e6927306bf8381c66df6f3bc983e51a4649022d5d1500ead85
+MISC metadata.xml 652 SHA256 7faa38e81716364e6affc8668ff3e24f3604ca3bf21a1158ad49de94ff7985b0 SHA512 41c21eb81de4f03343de4fee248428c4cf8088c3847c87c88064798aa2106c70570d2b8e72190968d69475ec6becc5a55d8c60693bffe9d3c4d0924d6e6125de WHIRLPOOL 3a7e96fcdfa7052b4d27d8b76b1813e2eb9c80e79aefebf77242111956dcd08f0e4f1cbbad30e1f8a9c957e780047c1e23c50c33aea0d94d416587e618991631
diff --git a/gnome-extra/zeitgeist-explorer/metadata.xml b/gnome-extra/zeitgeist-explorer/metadata.xml
new file mode 100644
index 000000000000..d7b6f1962458
--- /dev/null
+++ b/gnome-extra/zeitgeist-explorer/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription>
+Zeitgeist explorer is a tool which can be used to monitor and explore the 
+events logged by zeitgeist. In the monitor mode is can show the events logged
+in real-time just like wireshark. In explore mode, it can fetch already 
+logged events for a specific template
+</longdescription>
+  <upstream>
+    <remote-id type="launchpad">zeitgeist-explorer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
new file mode 100644
index 000000000000..bd1ec759fa81
--- /dev/null
+++ b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1 versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Monitor and inspect Zeitgeist's log at a low level - developer tool"
+HOMEPAGE="https://launchpad.net/zeitgeist-explorer/"
+SRC_URI="https://launchpad.net/${PN}/0.x/${MY_PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	gnome-extra/zeitgeist
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
diff --git a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r2.ebuild b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r2.ebuild
new file mode 100644
index 000000000000..ba7cae4032b4
--- /dev/null
+++ b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# gnome-extra/zeitgeist doesn't have python3 support, bug #622084
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Monitor and inspect Zeitgeist's log at a low level - developer tool"
+HOMEPAGE="https://launchpad.net/zeitgeist-explorer/"
+SRC_URI="https://launchpad.net/${PN}/0.x/${MY_PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	gnome-extra/zeitgeist[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
new file mode 100644
index 000000000000..1d5489735582
--- /dev/null
+++ b/gnome-extra/zeitgeist/Manifest
@@ -0,0 +1,9 @@
+AUX zeitgeist-0.9.15-python-detection.patch 1071 SHA256 e542b2e42a1de5751e3590939d9a0fe214c4f4f4bd34d73fce4ca226f501f20a SHA512 9a85ffe42af9b3c15888a12dd9a44c5c9a1cfcbbaf1a04b9810e4d613ecbae66ea4ef7f8e29535ab4290d64737115de973b63f27a28b4f6707232973358917ec WHIRLPOOL 382ced1219c43b9cdeb09b1d319e0c9c42e3cb88e0c4c0f6a2e581b22ba935992a9ddf5fc921ab59b5a1ca89bfdc87363cc1c4af05063f461e08faf231afb9b0
+AUX zeitgeist-1.0-python-detection.patch 1075 SHA256 a3f8305e471581922360c1d46800ae1441007bcf33d18f683967a2a018df147c SHA512 c2424da4c4b5918db4f09870e92f55fea3d2ff13ecee79074cc7cbf7f04b0c99606884c0dad848bf3c3b930df834194c3430f2a421ac7ecf9745a77f19cc0738 WHIRLPOOL 1eb4ad466a122e140b001a17d5876c92e14faa709b8ff54f8b358ba9893e9439b89f36512bd2ed7767f5cf4a7bbc404424411fd19d6d968da2a3eb75a412f9e3
+DIST zeitgeist-0.9.16.tar.xz 807092 SHA256 6ed3e60d0cd82ea58ee134c19beccafac10eb0f71977f3848755dacbf0927d3a SHA512 eb28215c937b71c8cec12f55236db4281ad529b2854ecb3c093477d45cd8348c6ea764e2cf00a99d41645b27b685a5325f0631b318409735b578a5871087b0f1 WHIRLPOOL 7ad3f528ffa938d14e9fbfe3f4e94ac5ad06bc48b13e261a0e8f43b88a9750a41d5e9212da7cc492f7c0197a4b12391d58e3f51a2a18a85b2663414332434c9b
+DIST zeitgeist-1.0.tar.xz 848740 SHA256 5ff508508f7a7b46acc9fbf1cf73fecb1aec214e18d9d22325aae8c2c2e8ddc8 SHA512 e8fa4db7202c5dceb6cb960775651624bdcd7fc2005019ff6491d7c139ccf036e865977adbd98ae3c9b97b22e5cf28534b64f01fde58b7bc89c0f0f8d13383e8 WHIRLPOOL 5c1cd4bb37221243726c7872d3a419cfe7523c053d6ac4dcced95c4ed1731110bea822b612c9fe9017bfeb35f37326dc9b810a2560b94324842d51a671ced462
+EBUILD zeitgeist-0.9.16.ebuild 2413 SHA256 8b0f671694d011255005462917f8c6fd426224246d9ba42a931efad20c1b0dc6 SHA512 bcb8ee413d707cb11dc173c4de894c4c2b1beb8048717bdac623722d8f9c9ebccabea5eda07ef06f586bf7cf747bebef07d19839cab5aeb7fe7a6f72ed76fc6a WHIRLPOOL 89ebf15a86350ebc88afcc14397ce91a10bb3a18a42462ae0b7593f746971fa21e3f07fddbeb15fbff918900978fc1d0539de878fc7aae1caf48bf66253fb6cc
+EBUILD zeitgeist-1.0.ebuild 2213 SHA256 5ad5268b86db9cb083c80aa698c7f6e343291d05a1295d3541d5200a8eff33a7 SHA512 d87ca5e3b59592fdfe4ff1201432ea08e9e033a3a423db92db4d04b0dc9571e2d48514002527b6ed4d9253e082bc46e0c6357139e9fd484b93aedaf5ef075083 WHIRLPOOL 2ccff88436e3e774ea139f8cef62f535c1a2803726c962376f6d643ee030069895485fd42bb48327ca07df2fcda96d31b6f57df4dd7effaac783055e8aa9e05b
+MISC ChangeLog 4939 SHA256 8816c191ae48f1619f8cb45d0f53db5f7783d7e1527b391a008d7e658a794fe4 SHA512 576c8ba7be1e18616452d5ac0d67fb4df22901e742fdaa84d6d15837d6035c76740a22c4d179644861cd79de80d1ad5e1ca5d0d86ecd384d6c52d4620a0a1d18 WHIRLPOOL 14fd8fe70e0fb5670c1a348ca94fd7a25bab4f77af55103d4d6fc30714fba5066d8441fb0bba2c74adb8a943c672e9afbf96066ef8c2b09db5db6b586b4008f9
+MISC ChangeLog-2015 8256 SHA256 53773176e802e3fa27c39375e4518db62fd0ab75d0f3b66fa127b75210f0cd17 SHA512 cd1e6217a0840b39c906b65d77016a9561f5d545316533392b14dfa4074dac7be9d013b83d8b1e7104ca5eb990304bb3189008fafa3c4a1395d1d3daebdec331 WHIRLPOOL 45f039fdd08679593263b49f3b757d1565669f82007a38f7f72d33670225584175e3c08c00475abb1d9d9ab4536829ebddf3bf3658143ab4e0e2c14a0cd10071
+MISC metadata.xml 959 SHA256 ecc82d05f85bad10e806d18c1c080ede715d66d6d853faa0e6d09034a9e1d499 SHA512 e8737f7180350fa2112afeee3b50e20604b8b6ba2b350fe2c73ab62f77ac1d0f3755a9046cd1cac3fad816135dad8b5850451f5a5168c719c2472c59781c65e0 WHIRLPOOL f933474c60013c147bdea3dcdcda117c684e523783db98892001535399aad21c3d4509adb687f6ae5cc09b73ad835decf3535e237d91277f059890dba5190daa
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch
new file mode 100644
index 000000000000..79184f70a2ba
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch
@@ -0,0 +1,38 @@
+From dd46d6f8db69ee8d291d63251d841e73070cd526 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 4 Jan 2015 00:09:14 +0100
+Subject: [PATCH] Make python module detection match detected python
+
+Some distribution might provided multiple python and configure can know
+about which exactly though AM_PATH_PYTHON.
+---
+ configure.ac | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index acf7daa..6136ad6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -269,13 +269,14 @@ if test "x$HAVE_RAPPER" = "xno"; then
+ fi
+ 
+ # check for python-rdflib
++AM_PATH_PYTHON([2.7])
++
+ AC_MSG_CHECKING([for python-rdflib])
+-echo "import rdflib" | python - 2>/dev/null
+-if test $? -ne 0 ; then
+-  AC_MSG_FAILURE([failed.  Please install the python-rdflib package.])
+-else
++AS_IF([$PYTHON -c "import rdflib" 2>/dev/null], [
+   AC_MSG_RESULT([yes])
+-fi
++], [
++  AC_MSG_FAILURE([failed.  Please install the python-rdflib package.])
++])
+ 
+ #################################################
+ # Summary
+-- 
+2.3.0
+
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch b/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch
new file mode 100644
index 000000000000..c82db10ec3c5
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch
@@ -0,0 +1,38 @@
+From 662d359689834ea3d1fdb75050b4c97d2ad720cf Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 4 Jan 2015 00:09:14 +0100
+Subject: [PATCH] Make python module detection match detected python
+
+Some distribution might provided multiple python and configure can know
+about which exactly though AM_PATH_PYTHON.
+---
+ configure.ac | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a0330a6..703fb957 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -255,13 +255,14 @@ if test "x$HAVE_RAPPER" = "xno"; then
+ fi
+ 
+ # check for python-rdflib
++AM_PATH_PYTHON([2.7])
++
+ AC_MSG_CHECKING([for python-rdflib])
+-echo "import rdflib" | $PYTHON - 2>/dev/null
+-if test $? -ne 0 ; then
+-  AC_MSG_FAILURE([failed.  Please install the python-rdflib package.])
+-else
++AS_IF([$PYTHON -c "import rdflib" 2>/dev/null], [
+   AC_MSG_RESULT([yes])
+-fi
++], [
++  AC_MSG_FAILURE([failed.  Please install the python-rdflib package.])
++])
+ 
+ #################################################
+ # Summary
+-- 
+2.13.2
+
diff --git a/gnome-extra/zeitgeist/metadata.xml b/gnome-extra/zeitgeist/metadata.xml
new file mode 100644
index 000000000000..9253594b1e45
--- /dev/null
+++ b/gnome-extra/zeitgeist/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
+  <longdescription>
+The engine is the main module that accepts all incoming events and allows 
+applications to fetch as well as subscribe to be notified when events 
+are logged. It is the heart of Zeitgeist.
+</longdescription>
+  <use>
+    <flag name="datahub">Use build datahub for passive event injection</flag>
+    <flag name="downloads-monitor">Monitor the XDG_DOWNLOAD_DIRECTORY</flag>
+    <flag name="fts">Enable the full text search extension</flag>
+    <flag name="sql-debug">Enable SQL debugging</flag>
+    <flag name="telepathy">Enable telepathy framework as data source</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">zeitgeist</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
new file mode 100644
index 000000000000..32e9f5931570
--- /dev/null
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION=0.22
+
+inherit autotools-utils bash-completion-r1 eutils python-r1 vala versionator
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Service to log activities and present to other apps"
+HOMEPAGE="https://launchpad.net/zeitgeist/"
+SRC_URI="https://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.xz
+	https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+ LGPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+datahub downloads-monitor +fts icu introspection nls sql-debug telepathy"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	downloads-monitor? ( datahub )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/json-glib
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/rdflib[${PYTHON_USEDEP}]
+	media-libs/raptor:2
+	>=dev-libs/glib-2.35.4:2
+	>=dev-db/sqlite-3.7.11:3
+	sys-apps/dbus
+	datahub? ( x11-libs/gtk+:3 )
+	fts? ( dev-libs/xapian:0=[inmemory] )
+	icu? ( dev-libs/dee[icu?] )
+	introspection? ( dev-libs/gobject-introspection )
+	telepathy? ( net-libs/telepathy-glib )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# pure-python module is better managed manually, see src_install
+	sed -e 's:python::g' \
+		-i Makefile.am || die
+
+	# Fix direct invocation of python in configure
+	epatch "${FILESDIR}"/${PN}-0.9.15-python-detection.patch
+
+	autotools-utils_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--with-session-bus-services-dir="${EPREFIX}/usr/share/dbus-1/services"
+		$(use_enable sql-debug explain-queries)
+		$(use_enable datahub)
+		$(use_enable downloads-monitor)
+		$(use_enable telepathy)
+		$(use_enable introspection)
+		$(use_with icu dee-icu)
+	)
+
+	use nls || myeconfargs+=( --disable-nls )
+	use fts && myeconfargs+=( --enable-fts )
+
+	python_setup
+	autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test TESTS_ENVIRONMENT="dbus-run-session"
+}
+
+src_install() {
+	dobashcomp data/completions/zeitgeist-daemon
+	autotools-utils_src_install
+	cd python || die
+	python_moduleinto ${PN}
+	python_foreach_impl python_domodule *py
+
+	# Redundant NEWS/AUTHOR installation
+	rm -r "${D}"/usr/share/zeitgeist/doc/ || die
+}
diff --git a/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild b/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild
new file mode 100644
index 000000000000..7cc47aea59c5
--- /dev/null
+++ b/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION=0.22
+
+inherit bash-completion-r1 python-r1 vala versionator xdg
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Service to log activities and present to other apps"
+HOMEPAGE="https://launchpad.net/zeitgeist/"
+SRC_URI="https://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.xz
+	https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+ LGPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+datahub downloads-monitor +fts introspection nls sql-debug telepathy"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	downloads-monitor? ( datahub )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/json-glib
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/rdflib[${PYTHON_USEDEP}]
+	media-libs/raptor:2
+	>=dev-libs/glib-2.35.4:2
+	>=dev-db/sqlite-3.7.11:3
+	sys-apps/dbus
+	datahub? ( x11-libs/gtk+:3 )
+	fts? ( dev-libs/xapian:0=[inmemory] )
+	introspection? ( dev-libs/gobject-introspection )
+	telepathy? ( net-libs/telepathy-glib )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix direct invocation of python in configure
+	"${FILESDIR}"/${PN}-1.0-python-detection.patch
+)
+
+src_prepare() {
+	# pure-python module is better managed manually, see src_install
+	sed -e 's:python::g' \
+		-i Makefile.am || die
+
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--without-dee-icu
+		$(use_enable sql-debug explain-queries)
+		$(use_enable datahub)
+		$(use_enable downloads-monitor)
+		$(use_enable telepathy)
+		$(use_enable introspection)
+	)
+
+	use nls || myeconfargs+=( --disable-nls )
+	use fts && myeconfargs+=( --enable-fts )
+
+	python_setup
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check TESTS_ENVIRONMENT="dbus-run-session"
+}
+
+src_install() {
+	default
+
+	dobashcomp data/completions/zeitgeist-daemon
+
+	cd python || die
+	python_moduleinto ${PN}
+	python_foreach_impl python_domodule *py
+
+	# Redundant NEWS/AUTHOR installation
+	rm -r "${D}"/usr/share/zeitgeist/doc/ || die
+}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
new file mode 100644
index 000000000000..5eb2f7d98a70
--- /dev/null
+++ b/gnome-extra/zenity/Manifest
@@ -0,0 +1,7 @@
+DIST zenity-3.22.0.tar.xz 1082088 SHA256 1ecdfa1071d383b373b8135954b3ec38d402d671dcd528e69d144aff36a0e466 SHA512 0131e854ffb8093e6c36787ffc831af8d1adbb663931b09b86a477c28c3b456ad2c9bb59cdc00a2d6505a1cf645df6fc9ebdd3c46c1a666c69d607e79b4364a3 WHIRLPOOL 02369c5e8721faf23bd247d308d243b5a2f85c3493b6b5e4708fec84a5db9284fb374a9573875d664569978e14eeb8f3a175a9b614eb496a42c173fddeb75a02
+DIST zenity-3.24.0.tar.xz 1085124 SHA256 6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7 SHA512 b24291166221cc2dabeabfeab7ca00ca63ff21c12a4eb327cd35ac43f485b8d4a858dd717df1b35b8bd3fd89d0bb235609855c6d349b76879b0f77b4fedd4dd9 WHIRLPOOL 723e8434ce355edeffa6f0ac541520c1fce676b76f83a11e16a2ee73430386e2676ab0cf7f867ab7706fe87e91dbe55024edcd319333102215031a0ea7453bac
+EBUILD zenity-3.22.0.ebuild 1101 SHA256 e9f9ec92541cc635e2d3acde411f2232da2676e937fddb560c99362e84b65089 SHA512 6b050763a6e6d06e66000f0d0792735858ffc46739e3dffc534df8213eb03d095a71caf16e3b0c399709c8b6cc67fef1c425eda57081d11dde90bb0dc945ca33 WHIRLPOOL 77f59b343412a3c342c6cf89affd831f977742380bdf93a922a503caea9ad3f2958af6e9dec6ae4091f73473f09833b58ef9f1b7a5747aac3c788c3d42df9881
+EBUILD zenity-3.24.0.ebuild 1103 SHA256 bc105ffe0f3ad301af79dfee3021beb4426b2e25107f3dd44a34273a06b851df SHA512 0b598e688a2d6c27c7d7d056441123acb4cce4aa4c28131bc068e4ebee0e4122ceef52559bffe18dbd10b58b27111e7865daed113eee1a023f27f92ff0d9c473 WHIRLPOOL 2f83df79471a229e5bafd20b9683888cf162302c52baad4760822de80ae553cf772309b4b2d5b2a595021de93b295c7927fd3b3f6b2406e239fe7656d2e727e5
+MISC ChangeLog 4351 SHA256 e890b90ced02d52ec0e5a38aff031c55a3d6cbfc59cb301a9b8b5b68cb703013 SHA512 6d8d99495b5779f1eff0f352359c0b40c3616f33ec8c22287c9c6c710046282a6e37ac9ea7ee17f75b9a3e7a3c070a2f5b323fd589334960234d3f93cdb935f3 WHIRLPOOL 6311d507a278afca1dc602910d31d165fe479438fdcd4f6dbc6e5860d4800969fcb276780cbaaeb18307e5d9b5071e053dd6379cf10c227c01102b60ae134108
+MISC ChangeLog-2015 27684 SHA256 f455e110d11d4e1d3dcaee28a3d4f83181f5ae647bc4bfbf3af013d56ae2f780 SHA512 8704cf223db3346f33f27a5c30e9f89fd9a63b5a345e410fdcf7f9331c2860612c0774acf7104ac445c049d58306108db82f5ed666766cd353f253bf79a54f54 WHIRLPOOL 85c5226c44c74fd049849b03498ecede201d93792912d922e9c40a1645ee0db67be4497e906e42fb741afb6ae336f12065059309d5f8a745d6d1d473c2c89735
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/zenity/metadata.xml b/gnome-extra/zenity/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/zenity/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/zenity/zenity-3.22.0.ebuild b/gnome-extra/zenity/zenity-3.22.0.ebuild
new file mode 100644
index 000000000000..fc4fc7f301b8
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.22.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
+HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug libnotify webkit"
+
+# TODO: X11 dependency is automagically enabled
+RDEPEND="
+	>=dev-libs/glib-2.8:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3[X]
+	x11-libs/libX11
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
+	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable libnotify) \
+		$(use_enable webkit webkitgtk) \
+		PERL=$(type -P false)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Not really needed and prevent us from needing perl
+	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
+}
diff --git a/gnome-extra/zenity/zenity-3.24.0.ebuild b/gnome-extra/zenity/zenity-3.24.0.ebuild
new file mode 100644
index 000000000000..43e2f2019e2a
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.24.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
+HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug libnotify webkit"
+
+# TODO: X11 dependency is automagically enabled
+RDEPEND="
+	>=dev-libs/glib-2.8:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3[X]
+	x11-libs/libX11
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
+	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable libnotify) \
+		$(use_enable webkit webkitgtk) \
+		PERL=$(type -P false)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Not really needed and prevent us from needing perl
+	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /gnome-extra