Remove patch and change make to emake.

(Portage version: 2.1.2_pre3-r2)
 (Unsigned Manifest commit)

2 files changed, 15 insertions, 168 deletions

diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index d7841f108c8f..15bcef4c4236 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,8 +1,4 @@
-AUX obconf-1.6-hideMenuHeader.patch 5961 RMD160 6c999b93be555e8034da797e2eeb91d81a2ab621 SHA1 992b5d7c30d2e18d0e0dab943f8322c7f57a8269 SHA256 85e8b6aaaa4397b622554ea92bc0c67078ea46ac4fceecc5301122171f1b49c9
-MD5 a4632eac3e2275061cf6151815b3b0b1 files/obconf-1.6-hideMenuHeader.patch 5961
-RMD160 6c999b93be555e8034da797e2eeb91d81a2ab621 files/obconf-1.6-hideMenuHeader.patch 5961
-SHA256 85e8b6aaaa4397b622554ea92bc0c67078ea46ac4fceecc5301122171f1b49c9 files/obconf-1.6-hideMenuHeader.patch 5961
-DIST obconf-1.5.tar.gz 163007
+DIST obconf-1.5.tar.gz 163007 RMD160 c21efab25bd712ec18f0cae9d160336b715e59cc SHA1 a82067d5cd79d13df4c1c77e2a281a37fa5de7d2 SHA256 d04d6f691d13f399df3f8b6c5c8227e81270f199b821fc9d624857abb9d0a0f4
 DIST obconf-1.6.tar.gz 166214 RMD160 234d262855dac53182a9130e3116f75667af6713 SHA1 e3a1ddb1a393b0cb09718cd204f2b74902cb5da4 SHA256 b491a3dd38185e187a61fef86a3382af684e6bd4fbf07b1704cfc9b0c7579a4b
 EBUILD obconf-1.5-r1.ebuild 639 RMD160 f02f729f1aa0db9a2e55937eb6cc851e40653374 SHA1 c89734dd2c46e87b1332eb3d97e2583bcf17db97 SHA256 7574606e721a56bf1ba2be4a1352752f758149ca040a256bc0920e3d0c7d047b
 MD5 00e7f9e79dddd4a457aaa8dd266264e5 obconf-1.5-r1.ebuild 639
@@ -12,24 +8,24 @@ EBUILD obconf-1.5.ebuild 624 RMD160 22738c6e6e9d0030e3a2b2ff5bd99a41d5c7d00a SHA
 MD5 fcbc1e0d5da6245afb77172637945c13 obconf-1.5.ebuild 624
 RMD160 22738c6e6e9d0030e3a2b2ff5bd99a41d5c7d00a obconf-1.5.ebuild 624
 SHA256 be8363ee7f7f7dddc82b2fed40d21ea8baedfa332d701f7589244478a9881fbe obconf-1.5.ebuild 624
-EBUILD obconf-1.6.ebuild 733 RMD160 e62935b7342714ebd67411972e5b660905d974b2 SHA1 6cb5005afde9ef3ca91e0904627df02e3fd9b738 SHA256 6f99d0325b611a98362222f67630e37faea15a021eb242b5c3dddce26d86a0b3
-MD5 afff6046a08438544e53145ec4239b2d obconf-1.6.ebuild 733
-RMD160 e62935b7342714ebd67411972e5b660905d974b2 obconf-1.6.ebuild 733
-SHA256 6f99d0325b611a98362222f67630e37faea15a021eb242b5c3dddce26d86a0b3 obconf-1.6.ebuild 733
-MISC ChangeLog 2256 RMD160 e9622b044cf5e37debcb682a9b6e7c81aec888dd SHA1 bc6734ce06c94a8a146430f11a13aa87d728d7a0 SHA256 e032f822a4c89d6c9d8687d957d22aacfa91b80a90c92a72ff6ffdaf5640c0c5
-MD5 01775f633b39f3ec97db8031191e28c1 ChangeLog 2256
-RMD160 e9622b044cf5e37debcb682a9b6e7c81aec888dd ChangeLog 2256
-SHA256 e032f822a4c89d6c9d8687d957d22aacfa91b80a90c92a72ff6ffdaf5640c0c5 ChangeLog 2256
+EBUILD obconf-1.6.ebuild 658 RMD160 01f9745eca3f830cdf65044bc452ab143fa06005 SHA1 1f67d10ff2252b7d67880921fffbcadb4d722794 SHA256 e292cf3055364db5304dd00ad3ce19522094ebe498d76f12ca906f9fc1218163
+MD5 d8390bfc4a542010fb1066d85ddba8d4 obconf-1.6.ebuild 658
+RMD160 01f9745eca3f830cdf65044bc452ab143fa06005 obconf-1.6.ebuild 658
+SHA256 e292cf3055364db5304dd00ad3ce19522094ebe498d76f12ca906f9fc1218163 obconf-1.6.ebuild 658
+MISC ChangeLog 2399 RMD160 133857223ead35f6dad7f11040f8fcef8a8ffbed SHA1 b6e59bd05bfcccdeb46161e31c394962d0166fea SHA256 bccdaffa011c5163af6493c5a27f62b7367d6dbcff0318ff6414c348a36ad189
+MD5 fb092bd665a2b34947757cd421d7e8a7 ChangeLog 2399
+RMD160 133857223ead35f6dad7f11040f8fcef8a8ffbed ChangeLog 2399
+SHA256 bccdaffa011c5163af6493c5a27f62b7367d6dbcff0318ff6414c348a36ad189 ChangeLog 2399
 MISC metadata.xml 162 RMD160 703446c6272f12116290b48cf1edb105392e19d5 SHA1 57738825f99b27d6f85e18693ccf1167206f79e9 SHA256 98f3695fbdfbde0e5c6c81ebc87af8db70d4a62eadaea2125cfa50956860266d
 MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
 RMD160 703446c6272f12116290b48cf1edb105392e19d5 metadata.xml 162
 SHA256 98f3695fbdfbde0e5c6c81ebc87af8db70d4a62eadaea2125cfa50956860266d metadata.xml 162
-MD5 16f5548bb98f7f19887a99d6c931cb88 files/digest-obconf-1.5 62
-RMD160 1e321c623fac1a75bd2cb0765a8bd5bc49eee48e files/digest-obconf-1.5 62
-SHA256 ca155957c6b29a6c71d9b4f909206f3c0625143347f2503a736f78a44ed7b34d files/digest-obconf-1.5 62
-MD5 16f5548bb98f7f19887a99d6c931cb88 files/digest-obconf-1.5-r1 62
-RMD160 1e321c623fac1a75bd2cb0765a8bd5bc49eee48e files/digest-obconf-1.5-r1 62
-SHA256 ca155957c6b29a6c71d9b4f909206f3c0625143347f2503a736f78a44ed7b34d files/digest-obconf-1.5-r1 62
+MD5 4b16c9736ad8d25ad5da2558afebff92 files/digest-obconf-1.5 232
+RMD160 5683d22b2be0b9277eb5d298ec6f6180ebe75c1d files/digest-obconf-1.5 232
+SHA256 e84c05b01cc1fee1035928bc58a0adcbdc638c7bca96e1ef5c8041fa46a4698f files/digest-obconf-1.5 232
+MD5 4b16c9736ad8d25ad5da2558afebff92 files/digest-obconf-1.5-r1 232
+RMD160 5683d22b2be0b9277eb5d298ec6f6180ebe75c1d files/digest-obconf-1.5-r1 232
+SHA256 e84c05b01cc1fee1035928bc58a0adcbdc638c7bca96e1ef5c8041fa46a4698f files/digest-obconf-1.5-r1 232
 MD5 48ca988ff6cf73101df37de4490b5976 files/digest-obconf-1.6 232
 RMD160 5a5d830e4b5ba26b62bea09841d469edc2975811 files/digest-obconf-1.6 232
 SHA256 2b293f025ebc544170d82e7ed3d83a06122b861058099c08da3ae42c3cd436d0 files/digest-obconf-1.6 232
diff --git a/x11-misc/obconf/files/obconf-1.6-hideMenuHeader.patch b/x11-misc/obconf/files/obconf-1.6-hideMenuHeader.patch
deleted file mode 100644
index 3ef85ac58eb5..000000000000
--- a/x11-misc/obconf/files/obconf-1.6-hideMenuHeader.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -ruN obconf-1.6/src/handlers.c obconf-1.6_hideMenuHeader/src/handlers.c
---- obconf-1.6/src/handlers.c	2006-03-06 23:40:50.000000000 -0800
-+++ obconf-1.6_hideMenuHeader/src/handlers.c	2006-04-16 22:10:59.000000000 -0700
-@@ -164,6 +164,14 @@
-     mapping = FALSE;
- }
- 
-+void setup_hide_menu_header(GtkWidget *w)
-+{
-+    mapping = TRUE;
-+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-+                                 tree_get_bool("theme/hideMenuHeader", TRUE));
-+    mapping = FALSE;
-+}
-+
- void setup_place_mouse(GtkWidget *w)
- {
-     gchar *s;
-@@ -592,6 +600,13 @@
-     tree_set_bool("focus/focusNew", gtk_toggle_button_get_active(w));
- }
- 
-+void on_hide_menu_header_toggled(GtkToggleButton *w, gpointer data)
-+{
-+    if (mapping) return;
-+
-+    tree_set_bool("theme/hideMenuHeader", gtk_toggle_button_get_active(w));
-+}
-+
- void on_place_mouse_toggled(GtkToggleButton *w, gpointer data)
- {
-     if (mapping) return;
-diff -ruN obconf-1.6/src/main.c obconf-1.6_hideMenuHeader/src/main.c
---- obconf-1.6/src/main.c	2006-03-06 23:40:50.000000000 -0800
-+++ obconf-1.6_hideMenuHeader/src/main.c	2006-04-16 22:10:49.000000000 -0700
-@@ -90,6 +90,7 @@
-     setup_focus_raise(glade_xml_get_widget(glade, "focus_raise"));
-     setup_focus_delay(glade_xml_get_widget(glade, "focus_delay"));
-     setup_focus_new(glade_xml_get_widget(glade, "focus_new"));
-+    setup_hide_menu_header(glade_xml_get_widget(glade, "hide_menu_header"));
-     setup_place_mouse(glade_xml_get_widget(glade, "place_mouse"));
-     setup_resist_window(glade_xml_get_widget(glade, "resist_window"));
-     setup_resist_edge(glade_xml_get_widget(glade, "resist_edge"));
-diff -ruN obconf-1.6/src/obconf.glade obconf-1.6_hideMenuHeader/src/obconf.glade
---- obconf-1.6/src/obconf.glade	2006-03-07 00:23:34.000000000 -0800
-+++ obconf-1.6_hideMenuHeader/src/obconf.glade	2006-04-16 22:10:54.000000000 -0700
-@@ -297,6 +297,102 @@
- 		      <property name="fill">True</property>
- 		    </packing>
- 		  </child>
-+
-+		  <child>
-+		    <widget class="GtkLabel" id="label85">
-+		      <property name="visible">True</property>
-+		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Menu&lt;/span&gt;</property>
-+		      <property name="use_underline">False</property>
-+		      <property name="use_markup">True</property>
-+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		      <property name="wrap">False</property>
-+		      <property name="selectable">False</property>
-+		      <property name="xalign">0</property>
-+		      <property name="yalign">0.5</property>
-+		      <property name="xpad">0</property>
-+		      <property name="ypad">0</property>
-+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		      <property name="width_chars">-1</property>
-+		      <property name="single_line_mode">False</property>
-+		      <property name="angle">0</property>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">0</property>
-+		      <property name="expand">False</property>
-+		      <property name="fill">False</property>
-+		    </packing>
-+		  </child>
-+
-+		  <child>
-+		    <widget class="GtkHBox" id="hbox41">
-+		      <property name="visible">True</property>
-+		      <property name="homogeneous">False</property>
-+		      <property name="spacing">0</property>
-+
-+		      <child>
-+			<widget class="GtkLabel" id="label84">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">    </property>
-+			  <property name="use_underline">False</property>
-+			  <property name="use_markup">False</property>
-+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			  <property name="wrap">False</property>
-+			  <property name="selectable">False</property>
-+			  <property name="xalign">0.5</property>
-+			  <property name="yalign">0.5</property>
-+			  <property name="xpad">0</property>
-+			  <property name="ypad">0</property>
-+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			  <property name="width_chars">-1</property>
-+			  <property name="single_line_mode">False</property>
-+			  <property name="angle">0</property>
-+			</widget>
-+			<packing>
-+			  <property name="padding">0</property>
-+			  <property name="expand">False</property>
-+			  <property name="fill">False</property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkVBox" id="vbox36">
-+			  <property name="visible">True</property>
-+			  <property name="homogeneous">False</property>
-+			  <property name="spacing">6</property>
-+
-+			  <child>
-+			    <widget class="GtkCheckButton" id="hide_menu_header">
-+			      <property name="visible">True</property>
-+			      <property name="can_focus">True</property>
-+			      <property name="label" translatable="yes">_Hide menu header</property>
-+			      <property name="use_underline">True</property>
-+			      <property name="relief">GTK_RELIEF_NORMAL</property>
-+			      <property name="focus_on_click">True</property>
-+			      <property name="active">False</property>
-+			      <property name="inconsistent">False</property>
-+			      <property name="draw_indicator">True</property>
-+			      <signal name="toggled" handler="on_hide_menu_header_toggled" after="yes" last_modification_time="Sun, 14 Sep 2003 11:25:04 GMT"/>
-+			    </widget>
-+			    <packing>
-+			      <property name="padding">0</property>
-+			      <property name="expand">False</property>
-+			      <property name="fill">False</property>
-+			    </packing>
-+			  </child>
-+			</widget>
-+			<packing>
-+			  <property name="padding">0</property>
-+			  <property name="expand">True</property>
-+			  <property name="fill">True</property>
-+			</packing>
-+		      </child>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">0</property>
-+		      <property name="expand">True</property>
-+		      <property name="fill">True</property>
-+		    </packing>
-+		  </child>
- 		</widget>
- 		<packing>
- 		  <property name="padding">0</property>