proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

9 files changed, 1150 insertions, 0 deletions

diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
new file mode 100644
index 000000000000..864cf3eed949
--- /dev/null
+++ b/dev-java/java-gnome/Manifest
@@ -0,0 +1,3 @@
+DIST java-gnome-4.0.19.tar.bz2 1048049 SHA256 3954ee78277918a32aa80b35cfc1892f3b21af4a6956d9e53e1f0e980512bd9b SHA512 da59fb69e0ab0547f9cb0979c16a16514ee512ed0a44a52689727d5d2ed1744a69650b8a9f3e9d5f3abdeec158a5f6b6af0326a394c7a4c96bad91c6f90903f1 WHIRLPOOL a4201f55950655d8d4ea5f5908c331bad140f7dcd9a710684d372a370800f88716d2066d06d15bb9d996e04948b4d32e477efba51cbec79dfc763d2f7755850d
+DIST java-gnome-4.0.20.tar.bz2 1053511 SHA256 2f2e1e97076507026e8bfca45183d30667fcd064177c4914d1b071923227c813 SHA512 8769d48b7dcb76487951b99df05dc04487098ccafb144779e53da2e5e934edbb18964053505750056f78b7117d2ab54538ab493c1a38bf82d9530fdcdfc52a85 WHIRLPOOL 0c20628780e16e64eb3d7728b3f10716144a1268b9ebd612bede3c1eef89f28d4f9b11c5c5d68ac68cb8cfa01e83f2bdc55b1b7bc05ce76e6c7085c453b89a1b
+DIST java-gnome-4.1.3.tar.xz 989568 SHA256 060b2b249bad918b91a55a82b8a2ed085bec5734defaf31e6c8c5ad006532373 SHA512 06f9468f59b5d7ac09fd9542b808c8bf7af5099df925b00f2b27d1dc515f1c15ea93b1fd8166bfa46eed143f6759fec360a8c3be3a5edb08d28901687493bd0a WHIRLPOOL aed0b93d138fd70ec6b0b62875346353ca11394f62ecfdd7b1a795010431fc7f84df58c1c66edb824be5c340e406b4882ffe5201f64a3c2ef80fb6d4d1ae689f
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.18-libnotify-0.7.patch b/dev-java/java-gnome/files/java-gnome-4.0.18-libnotify-0.7.patch
new file mode 100644
index 000000000000..adfe937338f5
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.18-libnotify-0.7.patch
@@ -0,0 +1,231 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20110131175810-2wn3gvabeesq0b3x
+# target_branch: ../mainline
+# testament_sha1: dd22e2db4f450dde1d4a5128da7833d50c34ab69
+# timestamp: 2011-01-31 20:04:36 +0200
+# base_revision_id: andrew@operationaldynamics.com-20101224023849-\
+#   u859g3kgg2y9ybx4
+# 
+# Begin patch
+=== modified file 'configure'
+--- configure	2010-12-22 11:23:13 +0000
++++ configure	2011-01-31 17:58:10 +0000
+@@ -787,7 +787,7 @@
+ 			"gtkspell");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify");
+ 
+@@ -835,7 +835,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -897,7 +897,7 @@
+ 			"libgtksourceview2.0-dev");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify-dev");
+ 
+@@ -943,7 +943,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -989,7 +989,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -1050,7 +1050,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+
+=== modified file 'src/bindings/org/gnome/notify/Notification.java'
+--- src/bindings/org/gnome/notify/Notification.java	2010-01-06 06:28:28 +0000
++++ src/bindings/org/gnome/notify/Notification.java	2011-01-31 17:58:10 +0000
+@@ -71,8 +71,7 @@
+      * <p>
+      * The summary appears on the titlebar of notification and body appears as
+      * its text. Icon may be a string defining a theme icon or the filename
+-     * identifying the icon that appears next to text. Attach identifies the
+-     * widget that the notification relates to.
++     * identifying the icon that appears next to text.
+      * 
+      * <p>
+      * Note that all but summary can be <code>null</code>.
+@@ -80,19 +79,8 @@
+      * @since 4.0.12
+      */
+ 
+-    public Notification(String summary, String body, String icon, Widget attach) {
+-        super(NotifyNotification.createNotification(summary, body, icon, attach));
+-    }
+-
+-    /**
+-     * Create a new notification attached to a {@link StatusIcon}. See
+-     * {@link #Notification(String,String,String,Widget) Notification()} for
+-     * other parameters.
+-     * 
+-     * @since 4.0.12
+-     */
+-    public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
+-        super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
++    public Notification(String summary, String body, String icon) {
++        super(NotifyNotification.createNotification(summary, body, icon));
+     }
+ 
+     /**
+@@ -109,34 +97,6 @@
+     }
+ 
+     /**
+-     * Attaches Notification to a Widget setting hints to its location.
+-     * 
+-     * @since 4.0.12
+-     */
+-    public void attach(Widget attach) {
+-        NotifyNotification.attachToWidget(this, attach);
+-    }
+-
+-    /**
+-     * Attaches Notification to a {@link StatusIcon} setting hints to its
+-     * location.
+-     * 
+-     * @since 4.0.12
+-     */
+-    public void attach(StatusIcon statusIcon) {
+-        NotifyNotification.attachToStatusIcon(this, statusIcon);
+-    }
+-
+-    /**
+-     * Sets the position of the notification to display on screen.
+-     * 
+-     * @since 4.0.12
+-     */
+-    public void setGeometryHints(Screen screen, int x, int y) {
+-        NotifyNotification.setGeometryHints(this, screen, x, y);
+-    }
+-
+-    /**
+      * Display the notification on screen.
+      * 
+      * @since 4.0.12
+
+=== modified file 'src/defs/NotifyNotification.defs'
+--- src/defs/NotifyNotification.defs	2009-05-16 05:46:28 +0000
++++ src/defs/NotifyNotification.defs	2011-01-31 17:58:10 +0000
+@@ -15,19 +15,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "body" (null-ok))
+     '("const-gchar*" "icon" (null-ok))
+-    '("GtkWidget*" "attach" (null-ok))
+-  )
+-)
+-
+-(define-function notify_notification_new_with_status_icon
+-  (is-constructor-of "NotifyNotification")
+-  (c-name "notify_notification_new_with_status_icon")
+-  (return-type "NotifyNotification*")
+-  (parameters
+-    '("const-gchar*" "summary")
+-    '("const-gchar*" "body" (null-ok))
+-    '("const-gchar*" "icon" (null-ok))
+-    '("GtkStatusIcon*" "status_icon")
+   )
+ )
+ 
+@@ -42,35 +29,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "status_icon")
+-  )
+-)
+-
+-(define-method set_geometry_hints
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_set_geometry_hints")
+-  (return-type "none")
+-  (parameters
+-    '("GdkScreen*" "screen")
+-    '("gint" "x")
+-    '("gint" "y")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
+
+# Begin bundle
+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
+FSKBdAits/xdyRThQkAgyxQc
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch b/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch
new file mode 100644
index 000000000000..d71be1bf995a
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch
@@ -0,0 +1,291 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20110328160500-s98m2vzg7wh44xsx
+# target_branch: ../mainline
+# testament_sha1: 3cf7a2a7e1af3fab89b8ead7f906642d84977eb2
+# timestamp: 2011-03-28 19:11:05 +0300
+# source_branch: /usr/portage/dev-java/java-gnome/files/java-gnome-\
+#   4.0.19-libnotify-0.7.patch
+# base_revision_id: andrew@operationaldynamics.com-20110214064042-\
+#   fv6tgq41rru7wjng
+# 
+# Begin patch
+=== modified file 'configure'
+--- configure	2011-02-14 06:40:42 +0000
++++ configure	2011-02-14 22:27:29 +0000
+@@ -805,7 +805,7 @@
+ 			"gtkspell");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify");
+ 
+@@ -853,7 +853,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -917,7 +917,7 @@
+ 			"libgtksourceview2.0-dev");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify-dev");
+ 
+@@ -968,7 +968,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -1020,7 +1020,7 @@
+ 			"lib${cpu_arch}gtksourceview-2.0-devel");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"lib${cpu_arch}notify-devel");
+ 
+@@ -1083,7 +1083,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+
+=== modified file 'doc/examples/notify/ExampleLowBattery.java'
+--- doc/examples/notify/ExampleLowBattery.java	2010-01-06 06:54:34 +0000
++++ doc/examples/notify/ExampleLowBattery.java	2011-03-28 16:05:00 +0000
+@@ -61,7 +61,7 @@
+          */
+ 
+         notification = new Notification("Low Battery Example", "Your battery is low!",
+-                "messagebox_warning", icon);
++                "messagebox_warning");
+ 
+         /*
+          * Quit the application after notification disappears.
+
+=== modified file 'src/bindings/org/gnome/notify/Notification.java'
+--- src/bindings/org/gnome/notify/Notification.java	2011-02-14 03:34:07 +0000
++++ src/bindings/org/gnome/notify/Notification.java	2011-03-13 22:23:48 +0000
+@@ -80,41 +80,7 @@
+      */
+ 
+     public Notification(String summary, String body, String icon) {
+-        super(NotifyNotification.createNotification(summary, body, icon, null));
+-    }
+-
+-    /**
+-     * Create a new notification.
+-     * 
+-     * <p>
+-     * The summary appears on the titlebar of notification and body appears as
+-     * its text. Icon may be a string defining a theme icon or the filename
+-     * identifying the icon that appears next to text. Attach identifies the
+-     * widget that the notification relates to.
+-     * 
+-     * <p>
+-     * Note that all but summary can be <code>null</code>.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
+-     * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
+-     */
+-
+-    public Notification(String summary, String body, String icon, Widget attach) {
+-        super(NotifyNotification.createNotification(summary, body, icon, attach));
+-    }
+-
+-    /**
+-     * Create a new notification attached to a {@link StatusIcon}. See
+-     * {@link #Notification(String,String,String,Widget) Notification()} for
+-     * other parameters.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
+-     * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
+-     */
+-    public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
+-        super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
++        super(NotifyNotification.createNotification(summary, body, icon));
+     }
+ 
+     /**
+@@ -131,39 +97,6 @@
+     }
+ 
+     /**
+-     * Attaches Notification to a Widget setting hints to its location.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
+-     * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
+-     */
+-    public void attach(Widget attach) {
+-        NotifyNotification.attachToWidget(this, attach);
+-    }
+-
+-    /**
+-     * Attaches Notification to a {@link StatusIcon} setting hints to its
+-     * location.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
+-     * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
+-     */
+-    public void attach(StatusIcon statusIcon) {
+-        NotifyNotification.attachToStatusIcon(this, statusIcon);
+-    }
+-
+-    /**
+-     * Sets the position of the notification to display on screen.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3
+-     */
+-    public void setGeometryHints(Screen screen, int x, int y) {
+-        NotifyNotification.setGeometryHints(this, screen, x, y);
+-    }
+-
+-    /**
+      * Display the notification on screen.
+      * 
+      * @since 4.0.12
+
+=== modified file 'src/defs/NotifyNotification.defs'
+--- src/defs/NotifyNotification.defs	2009-05-16 05:46:28 +0000
++++ src/defs/NotifyNotification.defs	2011-01-31 17:58:10 +0000
+@@ -15,19 +15,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "body" (null-ok))
+     '("const-gchar*" "icon" (null-ok))
+-    '("GtkWidget*" "attach" (null-ok))
+-  )
+-)
+-
+-(define-function notify_notification_new_with_status_icon
+-  (is-constructor-of "NotifyNotification")
+-  (c-name "notify_notification_new_with_status_icon")
+-  (return-type "NotifyNotification*")
+-  (parameters
+-    '("const-gchar*" "summary")
+-    '("const-gchar*" "body" (null-ok))
+-    '("const-gchar*" "icon" (null-ok))
+-    '("GtkStatusIcon*" "status_icon")
+   )
+ )
+ 
+@@ -42,35 +29,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "status_icon")
+-  )
+-)
+-
+-(define-method set_geometry_hints
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_set_geometry_hints")
+-  (return-type "none")
+-  (parameters
+-    '("GdkScreen*" "screen")
+-    '("gint" "x")
+-    '("gint" "y")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
+
+# Begin bundle
+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
+5IpwoSEBdhhE
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.20-extendsboxed.patch b/dev-java/java-gnome/files/java-gnome-4.0.20-extendsboxed.patch
new file mode 100644
index 000000000000..2cb31856717e
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.20-extendsboxed.patch
@@ -0,0 +1,61 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: abo-DBsUyxBEGcoyHQ1ptcDwU6trohdlbqPIoKRdnAj6d+WDsCgFy4VtynJYGxeQrm1n@public.gmane.org
+# target_branch: bzr://research.operationaldynamics.com/bzr/java-\
+#   gnome/mainline/
+# testament_sha1: d216bed6ef1b2623531fd1fe8d974e6e80f801f4
+# timestamp: 2011-12-15 22:15:31 +0100
+# base_revision_id: andrew-2KHxOkysSnqmy7d5DmSz6aFmO0nFMD88kjLrS2kiXIfrYvW/6KLgWA@public.gmane.org\
+#   dhkqq211ktceucsl
+# 
+# Begin patch
+=== modified file 'src/bindings/org/gnome/glib/Plumbing.java'
+--- src/bindings/org/gnome/glib/Plumbing.java	2011-06-19 04:33:24 +0000
++++ src/bindings/org/gnome/glib/Plumbing.java	2011-12-15 21:09:40 +0000
+@@ -153,7 +153,7 @@
+      * Retrieve an array of appropriate Java Boxeds for the given array of
+      * pointers.
+      */
+-    protected static Boxed[] boxedArrayFor(final Class<?> type, final long[] pointers, Boxed[] boxeds) {
++    protected static Boxed[] boxedArrayFor(final Class<? extends Boxed> type, final long[] pointers, Boxed[] boxeds) {
+         if (pointers == null) {
+             return null;
+         }
+@@ -170,7 +170,7 @@
+      * @throw ClassCastException if the GType pointed by given pointer is not
+      *        a GBoxed.
+      */
+-    protected static Boxed boxedFor(Class<?> type, final long pointer) {
++    protected static Boxed boxedFor(Class<? extends Boxed> type, final long pointer) {
+         Boxed proxy;
+ 
+         if (pointer == 0L) {
+@@ -202,7 +202,7 @@
+      * 
+      * @see #boxedFor(Class, long)
+      */
+-    protected static void fillBoxedArray(Class<?> type, Boxed[] boxeds, long[] pointers) {
++    protected static void fillBoxedArray(Class<? extends Boxed> type, Boxed[] boxeds, long[] pointers) {
+         if (pointers == null) {
+             return;
+         }
+
+# Begin bundle
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaBByfIAAa/fjEAQUGf/9/sA
+UAq////4AQAIAFAEGSaqmPQLWu4EkUJqn5MSeKe1GieQUbJiaI000DT1ASUk8JqHlNoKDEAANADQ
+NAEkQEaEaapmk0eoeTSA0aaaPU0GgOYBMAJgABMAATAAEkqej0JNR6j1DEaaB6h6mgMgA0yHWW3+
+Ju/ZoNpsRz1ywEaVrSsoyeGCB1LL2zZmDv7UeEZ2csNaA7xhD6/e+/wT7Tl2fNjiu6Ejl4wjdWbd
+Mub2pqi9qhzImIR0YKvUu2714RaW5DsKHYY5M8TFKaY+2oIxcVt3LRdrWmwV9blGOYKS9DJTpW0T
+R3QJAHy5Zijz+9TYRObAaUiRzUol0zhEWhJOozeqWpYIqyZbvhqyVV2tcLgZdcViIYXRGU1EWamP
+fTK5S0q+z3lYTFEWq5cF5tuYW2k7WvMGDlqQqx/yLnF+VNBiFDBOMqdO1Zar8QvCNzzpC7eSyknC
+VZnG4qPUcRRtV8C8NzGZlHI5goVGVbsKUpN5XIqNh132rlrcaFCrpxPrT6DHMK/xUi8wtxK7JEE+
+LghEkZweOJ2UkPaseTKLkUzA0XRipOKNF+aIy2J01IY42ndTy4Fwr3ip3jVzgoEgIEOAryVNTToR
+IIs9o+SLTo5F002iUCdG4rd8Tq2mWvBjh3Opei6h5JbZDLkZk33pFBl6jSZOWupp41zP2iy2ZHb0
+iOqcIZ9O687Bs1+PSrDHGvmFqXjrTouj5VB40o1rimaVSh1THOg52eFfn4rlQjMlvK2G4ioWMkp8
+DzsCErteFWAHTbgMwt0r4eWNZeNK7aUk1NCqQeJvxHzV65eiwOMqWyQofWjJwZdotRKlJM2WnhFu
+itOE08953PNQFU8iywcHQtyUJflM0d3TfT8Ww9HJaUxyTKETQe8IOPq0H8aCmAtlW9ScDbTB1gYx
+xaTEzHL40HkxhM53kRYMjw3IfhErFBXhCbKnpQx3UaCJPRoB+/f1TZJyAOWp19ApvRMoZ65LAnCz
+YFcdsFxFCzYnuDivTFYKoKAofaJk/unkDYZBm9+ZHdJ0xUaq1lo2zMF4riTTRQTzYXaAZablBybq
+kQyYI/YJxBkaKUGYGGrmaJSIpkzJlx9XUlkvNnv5lyB1DVHoJhd3EpAawbYbYWYxlX0UL2xpSTWJ
+QFaMmVs+pmTmkJUaF7dJVVjN/V2LAWevoEeGvMODBbgBzgSom6MN1hnByeecE2VKFodt5FRRGSJj
+OIOVNY/sSzFGSwBkFGKglaolFEKpVNfvtS3qMORqDoUYTT0UFPFixc1qVZZ4DhLAKrkk7tN1nIMB
+a7Lhii6yuUgqwb8kuxQxgJOLkKFWGwDMN0NZSy/1f+LuSKcKEhQIOT5A
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.20-libnotify-0.7.patch b/dev-java/java-gnome/files/java-gnome-4.0.20-libnotify-0.7.patch
new file mode 100644
index 000000000000..076d467b2ab8
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.20-libnotify-0.7.patch
@@ -0,0 +1,300 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20110328160500-s98m2vzg7wh44xsx
+# target_branch: ../mainline
+# testament_sha1: 3cf7a2a7e1af3fab89b8ead7f906642d84977eb2
+# timestamp: 2011-03-28 19:11:05 +0300
+# source_branch: /usr/portage/dev-java/java-gnome/files/java-gnome-\
+#   4.0.19-libnotify-0.7.patch
+# base_revision_id: andrew@operationaldynamics.com-20110214064042-\
+#   fv6tgq41rru7wjng
+# 
+# Begin patch
+=== modified file 'configure'
+--- configure	2011-02-14 06:40:42 +0000
++++ configure	2011-02-14 22:27:29 +0000
+@@ -805,7 +805,7 @@
+ 			"gtkspell");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify");
+ 
+@@ -853,7 +853,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -917,7 +917,7 @@
+ 			"libgtksourceview2.0-dev");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify-dev");
+ 
+@@ -968,7 +968,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -1020,7 +1020,7 @@
+ 			"lib${cpu_arch}gtksourceview-2.0-devel");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"lib${cpu_arch}notify-devel");
+ 
+@@ -1083,7 +1083,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+
+=== modified file 'doc/examples/notify/ExampleLowBattery.java'
+--- doc/examples/notify/ExampleLowBattery.java	2010-01-06 06:54:34 +0000
++++ doc/examples/notify/ExampleLowBattery.java	2011-03-28 16:05:00 +0000
+@@ -61,7 +61,7 @@
+          */
+ 
+         notification = new Notification("Low Battery Example", "Your battery is low!",
+-                "messagebox_warning", icon);
++                "messagebox_warning");
+ 
+         /*
+          * Quit the application after notification disappears.
+
+=== modified file 'src/bindings/org/gnome/notify/Notification.java'
+--- src/bindings/org/gnome/notify/Notification.java	2011-02-14 03:34:07 +0000
++++ src/bindings/org/gnome/notify/Notification.java	2011-03-13 22:23:48 +0000
+@@ -80,46 +80,9 @@
+      */
+ 
+     public Notification(String summary, String body, String icon) {
+-        super(NotifyNotification.createNotification(summary, body, icon, null));
++        super(NotifyNotification.createNotification(summary, body, icon));
+     }
+ 
+-    /**
+-     * Create a new notification.
+-     * 
+-     * <p>
+-     * The summary appears on the titlebar of notification and body appears as
+-     * its text. Icon may be a string defining a theme icon or the filename
+-     * identifying the icon that appears next to text. Attach identifies the
+-     * widget that the notification relates to.
+-     * 
+-     * <p>
+-     * Note that all but summary can be <code>null</code>.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets
+-     *             and status icons. See
+-     *             http://live.gnome.org/GnomeShell/Design
+-     *             /Guidelines/MessageTray/Compatibility
+-     */
+-
+-    public Notification(String summary, String body, String icon, Widget attach) {
+-        super(NotifyNotification.createNotification(summary, body, icon, attach));
+-    }
+-
+-    /**
+-     * Create a new notification attached to a {@link StatusIcon}. See
+-     * {@link #Notification(String,String,String,Widget) Notification()} for
+-     * other parameters.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets
+-     *             and status icons. See
+-     *             http://live.gnome.org/GnomeShell/Design
+-     *             /Guidelines/MessageTray/Compatibility
+-     */
+-    public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
+-        super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
+-    }
+ 
+     /**
+      * Updates the notification with given parameters see
+@@ -135,43 +98,6 @@
+     }
+ 
+     /**
+-     * Attaches Notification to a Widget setting hints to its location.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets
+-     *             and status icons. See
+-     *             http://live.gnome.org/GnomeShell/Design
+-     *             /Guidelines/MessageTray/Compatibility
+-     */
+-    public void attach(Widget attach) {
+-        NotifyNotification.attachToWidget(this, attach);
+-    }
+-
+-    /**
+-     * Attaches Notification to a {@link StatusIcon} setting hints to its
+-     * location.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets
+-     *             and status icons. See
+-     *             http://live.gnome.org/GnomeShell/Design
+-     *             /Guidelines/MessageTray/Compatibility
+-     */
+-    public void attach(StatusIcon statusIcon) {
+-        NotifyNotification.attachToStatusIcon(this, statusIcon);
+-    }
+-
+-    /**
+-     * Sets the position of the notification to display on screen.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3
+-     */
+-    public void setGeometryHints(Screen screen, int x, int y) {
+-        NotifyNotification.setGeometryHints(this, screen, x, y);
+-    }
+-
+-    /**
+      * Display the notification on screen.
+      * 
+      * @since 4.0.12
+
+=== modified file 'src/defs/NotifyNotification.defs'
+--- src/defs/NotifyNotification.defs	2009-05-16 05:46:28 +0000
++++ src/defs/NotifyNotification.defs	2011-01-31 17:58:10 +0000
+@@ -15,19 +15,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "body" (null-ok))
+     '("const-gchar*" "icon" (null-ok))
+-    '("GtkWidget*" "attach" (null-ok))
+-  )
+-)
+-
+-(define-function notify_notification_new_with_status_icon
+-  (is-constructor-of "NotifyNotification")
+-  (c-name "notify_notification_new_with_status_icon")
+-  (return-type "NotifyNotification*")
+-  (parameters
+-    '("const-gchar*" "summary")
+-    '("const-gchar*" "body" (null-ok))
+-    '("const-gchar*" "icon" (null-ok))
+-    '("GtkStatusIcon*" "status_icon")
+   )
+ )
+ 
+@@ -42,35 +29,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "status_icon")
+-  )
+-)
+-
+-(define-method set_geometry_hints
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_set_geometry_hints")
+-  (return-type "none")
+-  (parameters
+-    '("GdkScreen*" "screen")
+-    '("gint" "x")
+-    '("gint" "y")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
+
+# Begin bundle
+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
+5IpwoSEBdhhE
diff --git a/dev-java/java-gnome/java-gnome-4.0.19.ebuild b/dev-java/java-gnome/java-gnome-4.0.19.ebuild
new file mode 100644
index 000000000000..0f4e14d4219b
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-4.0.19.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils versionator java-pkg-2 multilib
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Java bindings for GTK and GNOME"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="4.0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.22
+	>=x11-libs/gtk+-2.22.0:2
+	>=gnome-base/libglade-2.6.4
+	>=gnome-base/libgnome-2.22.0
+	>=gnome-base/gnome-desktop-2.22.0:2
+	>=x11-libs/cairo-1.10.0[svg]
+	>=x11-libs/gtksourceview-2.6.2:2.0
+	>=app-text/gtkspell-2.0.15-r1:2
+	>=x11-libs/libnotify-0.4.5
+	>=dev-libs/libunique-1.0.8:1
+	>=gnome-base/librsvg-2.32.1
+	dev-libs/atk
+	>=virtual/jre-1.5"
+DEPEND="${RDEPEND}
+	dev-java/junit:0
+	dev-lang/perl
+	virtual/pkgconfig
+	>=virtual/jdk-1.5"
+
+# Needs X11
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	if has_version ">=x11-libs/libnotify-0.7"; then
+		epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	fi
+}
+
+src_configure() {
+	# Handwritten in perl so not using econf
+	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
+}
+
+src_compile() {
+	# Fails parallel build in case GCJ is detected
+	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
+	emake -j1 || die "Compilation of java-gnome failed"
+
+	if use doc; then
+		DISPLAY= emake -j1 doc || die "Making documentation failed"
+	fi
+}
+
+src_install(){
+	emake -j1 DESTDIR="${D}" install || die
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
+
+	dodoc AUTHORS HACKING NEWS README || die
+	use doc && java-pkg_dojavadoc doc/api
+	use examples && java-pkg_doexamples doc/examples
+	use source && java-pkg_dosrc src/bindings/org
+}
diff --git a/dev-java/java-gnome/java-gnome-4.0.20.ebuild b/dev-java/java-gnome/java-gnome-4.0.20.ebuild
new file mode 100644
index 000000000000..c6bc58fd6af3
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-4.0.20.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils versionator java-pkg-2 multilib python-r1
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Java bindings for GTK and GNOME"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.22
+	>=x11-libs/gtk+-2.22.0:2
+	>=gnome-base/libglade-2.6.4
+	>=gnome-base/libgnome-2.22.0
+	>=gnome-base/gnome-desktop-2.22.0:2
+	>=x11-libs/cairo-1.10.0[svg]
+	>=x11-libs/gtksourceview-2.6.2:2.0
+	>=app-text/gtkspell-2.0.15-r1:2
+	>=x11-libs/libnotify-0.4.5
+	>=dev-libs/libunique-1.0.8:1
+	>=gnome-base/librsvg-2.32.1
+	dev-libs/atk
+	>=virtual/jre-1.5
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}
+	dev-java/junit:0
+	dev-lang/perl
+	virtual/pkgconfig
+	>=virtual/jdk-1.5"
+
+# Needs X11
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+}
+
+java_prepare() {
+	if has_version ">=x11-libs/libnotify-0.7"; then
+		epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	fi
+
+	# From http://permalink.gmane.org/gmane.comp.gnome.bindings.java.devel/1668
+	# which has been applied upstream in versions >=4.1.2.
+	epatch "${FILESDIR}"/${P}-extendsboxed.patch
+}
+
+src_configure() {
+	# Handwritten in perl so not using econf
+	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
+}
+
+src_compile() {
+	# Fails parallel build in case GCJ is detected
+	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
+	emake -j1
+
+	if use doc ; then
+		DISPLAY= emake -j1 doc
+	fi
+}
+
+src_install(){
+	emake -j1 DESTDIR="${D}" install
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
+
+	dodoc AUTHORS HACKING NEWS README
+	use doc && java-pkg_dojavadoc doc/api
+	use examples && java-pkg_doexamples doc/examples
+	use source && java-pkg_dosrc src/bindings/org
+}
diff --git a/dev-java/java-gnome/java-gnome-4.1.3.ebuild b/dev-java/java-gnome/java-gnome-4.1.3.ebuild
new file mode 100644
index 000000000000..d947dce0101f
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-4.1.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils versionator java-pkg-2 multilib python-r1 virtualx
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Java bindings for GTK and GNOME"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.xz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="4.1"
+KEYWORDS="amd64 ~ppc x86"
+
+COMMON_DEP="
+	app-text/enchant:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.28:2
+	dev-libs/libunique:3
+	gnome-base/librsvg:2
+	>=x11-libs/cairo-1.10.0[svg]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7.0
+	x11-libs/pango:0
+	${PYTHON_DEPS}"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+
+DEPEND="${COMMON_DEP}
+	dev-java/junit:0
+	dev-lang/perl
+	>=virtual/jdk-1.6
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+}
+
+src_configure() {
+	# Handwritten in perl so not using econf
+	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
+}
+
+src_compile() {
+	emake
+	use doc && DISPLAY= emake doc
+}
+
+# Needs X11, fails even then
+RESTRICT="test"
+src_test() {
+	Xemake test
+}
+
+src_install(){
+	emake -j1 DESTDIR="${D}" install
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
+
+	use doc && java-pkg_dojavadoc doc/api
+	use examples && java-pkg_doexamples doc/examples
+	use source && java-pkg_dosrc src/bindings/org
+}
diff --git a/dev-java/java-gnome/metadata.xml b/dev-java/java-gnome/metadata.xml
new file mode 100644
index 000000000000..f1b3f175c0be
--- /dev/null
+++ b/dev-java/java-gnome/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		An elegant set of language bindings to allow you to write
+		native GNOME/GTK applications in Java. Works with both
+		traditional Java VMs and also with GCJ, allowing the creation
+		of native Linux executable binaries.
+
+		These libraries all come from the java-gnome project, which in
+		turn is part of the official suite of GNOME language bindings.
+
+		As of java-gnome 2.8, the previously monolithic package was
+		split into numerous individual libraries to allow more
+		modular use. Those libraries are libgtk-java, libgnome-java,
+		libgconf-java, libglade-java, etc.
+
+		This ebuild is a meta package which simply depends on the
+		various libraries which make up the complete java-gnome suite.
+
+		In all likelihood (especially if you're developing apps) this
+		is what you want to emerge.
+	</longdescription>
+</pkgmetadata>