diff options
| author |   Jaroslav Hron <jaroslav.hron@mff.cuni.cz> | 2011-08-14 12:56:58 +0200 |
|---|---|---|
| committer | Jaroslav Hron <jaroslav.hron@mff.cuni.cz> | 2011-08-14 12:56:58 +0200 |
| commit | 09d474ad3f7598f65205062e343d3d0c7a0f72ed (patch) | |
| tree | e456d3b9db0cd752be5fd8912d49f57d6c09dba4 | |
| parent | initial check-in (diff) | |
| download | jxh-09d474ad3f7598f65205062e343d3d0c7a0f72ed.tar.gz jxh-09d474ad3f7598f65205062e343d3d0c7a0f72ed.tar.bz2 jxh-09d474ad3f7598f65205062e343d3d0c7a0f72ed.zip | |
add from home
30 files changed, 1649 insertions, 0 deletions
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest new file mode 100644 index 0000000..e67e2cc --- /dev/null +++ b/app-editors/gedit-plugins/Manifest @@ -0,0 +1,10 @@ +AUX gedit-plugins-2.32.0-background-color.patch 1357 RMD160 76b29218301225311295e30c6ccefcf6f922d592 SHA1 796785b3b9240154ffd72398db7bd8f96a556af2 SHA256 e4ec1d87f37311aa5fd95f30e19a7bc21ca23bf94d458f28906fc8d99758a7a8 +AUX gedit-plugins-2.32.0-commander-menu.patch 3083 RMD160 ba1292f57108328a17d9f5f25133379a0487f812 SHA1 12eec192e43c9791d27cc940f5d2f97aa2716b69 SHA256 4686d1a1d7601fbb8ef0605afa1e0d26a9378b59714b3fbb40bbe4256505dc11 +AUX gedit-plugins-2.32.0-copy-paste.patch 2456 RMD160 dfb05735efa81e4d9cae7fd626db09aec74ee80c SHA1 a45eefc79bf9d1f7008e5b732fbcea50742a8dd0 SHA256 7d0ca7a1181171f55734a3b0734aa97655e3dfe50a481415fc52ee951885e171 +AUX gedit-plugins-2.32.0-edit-menu.patch 4243 RMD160 05d811691ba053d5ddd391f39e18fa76e339fafa SHA1 f956fb7872108cfde79c87af1f6c882af1662047 SHA256 dabf39d4aab37867f190c9b79f2f8cc119688082632a750ab791bf60728b1b72 +AUX gedit-plugins-2.32.0-find-replace.patch 2338 RMD160 39d780467d6d72ea753f2836039b4692fb532122 SHA1 ec96e6238c694dd689f5da47fb4f8a8ebc8a3e19 SHA256 adcc5c4f2a6a3973862cd6ff93b804bc127dad39239eb70b5238e3991d32834f +AUX gedit-plugins-2.32.0-keybinding-toggle.patch 2266 RMD160 17d0ab876ffebf85e435d4b2ea0e21a81ba79e20 SHA1 09ace961c9a109c5142d1d2b037a3062fc1a3913 SHA256 beb89349a7d5d8ab7a18fc8b0aa191eaa2801fbfbee006b2f4e96b64704bc777 +AUX gedit-plugins-2.32.0-replace-all.patch 1305 RMD160 97e01de393390f8642398c8c6a05712ac0e37149 SHA1 c642f47694241efcbf9389d316524af550e20c73 SHA256 1bfef4341f0fe8dd8b9f89ee3e99a4522338458a1d3b6ca34480a062160b8b81 +DIST gedit-plugins-2.32.0.tar.bz2 616927 RMD160 a7540bfd57bdc15546eea802c68719ac71f85c10 SHA1 78339867bcc159cc14ef45effc35fa52c3854ce4 SHA256 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107 +EBUILD gedit-plugins-2.32.0.ebuild 2023 RMD160 9e2ebe3d1472c059e681e034474d523289d641e3 SHA1 c90524f641484a0e587ddb29b27eef45b67d3295 SHA256 101f817aa903347016bfc82ff7d72b4c024a3cd429459d09ee13d47d43db8125 +MISC gedit-plugins-2.32.0.ebuild~ 2693 RMD160 08e384dc0eec38992e5cbb15d73d03b397c1ba0d SHA1 397c90c09fd9fcd053b2aa778e631ecc7bd796c8 SHA256 00af8a5d1a92d144c54478327e41740f9ab417327ce04a3a810afcc1d5e49100 diff --git a/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-background-color.patch b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-background-color.patch new file mode 100644 index 0000000..6965b85 --- /dev/null +++ b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-background-color.patch @@ -0,0 +1,48 @@ +From 37a1648c30cbc23d5425c34f6db29aeebf330800 Mon Sep 17 00:00:00 2001 +From: Jesse van den Kieboom <jesse.vandenkieboom@epfl.ch> +Date: Mon, 03 May 2010 11:43:40 +0000 +Subject: Fix background color of the commander entry + +--- +diff --git a/plugins/commander/commander/entry.py b/plugins/commander/commander/entry.py +index 4e864d7..36ed4e1 100644 +--- a/plugins/commander/commander/entry.py ++++ b/plugins/commander/commander/entry.py +@@ -98,8 +98,9 @@ class Entry(gtk.EventBox): + ct.rectangle(evnt.area.x, evnt.area.y, evnt.area.width, evnt.area.height) + + bg = self.background_color() +- ct.set_source_rgb(bg[0], bg[1], bg[1]) ++ ct.set_source_rgb(bg[0], bg[1], bg[2]) + ct.fill() ++ + return False + + def on_expose(self, widget, evnt): +@@ -143,8 +144,22 @@ class Entry(gtk.EventBox): + + def background_color(self): + bg = self._view.get_style().base[self._view.state] +- +- return [bg.red / 65535.0 * 1.1, bg.green / 65535.0 * 1.1, bg.blue / 65535.0 * 0.9, 0.8] ++ ++ vals = [bg.red, bg.green, bg.blue, 1] ++ ++ for i in range(3): ++ val = vals[i] / 65535.0 ++ ++ if val < 0.0001: ++ vals[i] = 0.1 ++ elif val > 0.9999: ++ vals[i] = 0.9 ++ elif val < 0.1: ++ vals[i] = val * 1.2 ++ else: ++ vals[i] = val * 0.8 ++ ++ return vals + + def on_entry_focus_out(self, widget, evnt): + if self._entry.flags() & gtk.SENSITIVE: +-- +cgit v0.8.3.1 diff --git a/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-commander-menu.patch b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-commander-menu.patch new file mode 100644 index 0000000..5886532 --- /dev/null +++ b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-commander-menu.patch @@ -0,0 +1,107 @@ +From ad60cf271784d10aa6fadf9bef6254f8f1df82ad Mon Sep 17 00:00:00 2001 +From: Jesse van den Kieboom <jesse.vandenkieboom@epfl.ch> +Date: Mon, 03 May 2010 11:46:58 +0000 +Subject: Added commander toggle menu item + +--- +diff --git a/plugins/commander/commander/windowhelper.py b/plugins/commander/commander/windowhelper.py +index 15dc787..9c71f28 100644 +--- a/plugins/commander/commander/windowhelper.py ++++ b/plugins/commander/commander/windowhelper.py +@@ -2,43 +2,79 @@ import gedit + import gtk + from entry import Entry + from info import Info ++from gpdefs import * ++ ++try: ++ gettext.bindtextdomain(GETTEXT_PACKAGE, GP_LOCALEDIR) ++ _ = lambda s: gettext.dgettext(GETTEXT_PACKAGE, s); ++except: ++ _ = lambda s: s ++ ++ui_str = """ ++<ui> ++ <menubar name="MenuBar"> ++ <menu name="EditMenu" action="Edit"> ++ <placeholder name="EditOps_5"> ++ <menuitem name="CommanderEditMode" action="CommanderModeAction"/> ++ </placeholder> ++ </menu> ++ </menubar> ++</ui> ++""" + + class WindowHelper: + def __init__(self, plugin, window): + self._window = window + self._plugin = plugin + self._entry = None +- accel_path = '<gedit>/plugins/commander/activate' ++ self._view = None + +- accel = gtk.accel_map_lookup_entry(accel_path) ++ self.install_ui() + +- if accel == None: +- gtk.accel_map_add_entry(accel_path, gtk.keysyms.period, gtk.gdk.CONTROL_MASK) ++ def install_ui(self): ++ manager = self._window.get_ui_manager() ++ ++ self._action_group = gtk.ActionGroup("GeditCommanderPluginActions") ++ self._action_group.add_toggle_actions([('CommanderModeAction', None, _('Commander Mode'), '<Ctrl>period', _('Start commander mode'), self.on_commander_mode)]) ++ ++ manager.insert_action_group(self._action_group, -1) ++ self._merge_id = manager.add_ui_from_string(ui_str) ++ ++ def uninstall_ui(self): ++ manager = self._window.get_ui_manager() ++ manager.remove_ui(self._merge_id) ++ manager.remove_action_group(self._action_group) ++ ++ manager.ensure_update() + +- self._accel = gtk.AccelGroup() +- self._accel.connect_by_path(accel_path, self._do_command) +- self._window.add_accel_group(self._accel) +- + def deactivate(self): +- self._window.remove_accel_group(self._accel) ++ self.uninstall_ui() ++ + self._window = None + self._plugin = None + + def update_ui(self): + pass +- +- def _do_command(self, group, obj, keyval, mod): ++ ++ def on_commander_mode(self, action): + view = self._window.get_active_view() + + if not view: + return False + +- if not self._entry: +- self._entry = Entry(self._window.get_active_view()) +- self._entry.connect('destroy', self.on_entry_destroy) ++ if action.get_active(): ++ if not self._entry or view != self._view: ++ self._entry = Entry(view) ++ self._entry.connect('destroy', self.on_entry_destroy) ++ ++ self._entry.grab_focus() ++ self._view = view ++ elif self._entry: ++ self._entry.destroy() ++ self._view = None + +- self._entry.grab_focus() + return True + + def on_entry_destroy(self, widget): + self._entry = None ++ self._action_group.get_action('CommanderModeAction').set_active(False) +-- +cgit v0.8.3.1 diff --git a/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-copy-paste.patch b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-copy-paste.patch new file mode 100644 index 0000000..4d15075 --- /dev/null +++ b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-copy-paste.patch @@ -0,0 +1,62 @@ +From 0372583cc0af915e84558caa515429bbb372358d Mon Sep 17 00:00:00 2001 +From: Jesse van den Kieboom <jesse@icecrew.nl> +Date: Thu, 29 Apr 2010 17:05:40 +0000 +Subject: Add Ctrl+Shift+C/V copy paste accelerators to terminal + +--- +diff --git a/plugins/terminal/terminal.py b/plugins/terminal/terminal.py +index 902b424..28ee996 100644 +--- a/plugins/terminal/terminal.py ++++ b/plugins/terminal/terminal.py +@@ -94,6 +94,19 @@ class GeditTerminal(gtk.HBox): + self._vte.connect("popup-menu", self.on_vte_popup_menu) + self._vte.connect("child-exited", lambda term: term.fork_command()) + ++ self._accel_base = '<gedit>/plugins/terminal' ++ self._accels = { ++ 'copy-clipboard': [gtk.keysyms.C, gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, self.copy_clipboard], ++ 'paste-clipboard': [gtk.keysyms.V, gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, self.paste_clipboard] ++ } ++ ++ for name in self._accels: ++ path = self._accel_base + '/' + name ++ accel = gtk.accel_map_lookup_entry(path) ++ ++ if accel == None: ++ gtk.accel_map_add_entry(path, self._accels[name][0], self._accels[name][1]) ++ + self._vte.fork_command() + + def do_grab_focus(self): +@@ -196,6 +209,15 @@ class GeditTerminal(gtk.HBox): + elif modifiers == gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK: + self.get_toplevel().child_focus(gtk.DIR_TAB_BACKWARD) + return True ++ ++ for name in self._accels: ++ path = self._accel_base + '/' + name ++ entry = gtk.accel_map_lookup_entry(path) ++ ++ if entry and entry[0] == event.keyval and entry[1] == modifiers: ++ self._accels[name][2]() ++ return True ++ + return False + + def on_vte_button_press(self, term, event): +@@ -212,11 +234,13 @@ class GeditTerminal(gtk.HBox): + + item = gtk.ImageMenuItem(gtk.STOCK_COPY) + item.connect("activate", lambda menu_item: self.copy_clipboard()) ++ item.set_accel_path(self._accel_base + '/copy-clipboard') + item.set_sensitive(self._vte.get_has_selection()) + menu.append(item) + + item = gtk.ImageMenuItem(gtk.STOCK_PASTE) + item.connect("activate", lambda menu_item: self.paste_clipboard()) ++ item.set_accel_path(self._accel_base + '/paste-clipboard') + menu.append(item) + + self.emit("populate-popup", menu) +-- +cgit v0.8.3.1 diff --git a/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-edit-menu.patch b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-edit-menu.patch new file mode 100644 index 0000000..85a2b9a --- /dev/null +++ b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-edit-menu.patch @@ -0,0 +1,121 @@ +From 0c4ef746e91cb8987430b89f22cb4699e06410fe Mon Sep 17 00:00:00 2001 +From: Jesse van den Kieboom <jesse.vandenkieboom@epfl.ch> +Date: Mon, 03 May 2010 11:48:21 +0000 +Subject: Make multi edit menu item proper toggle item + +--- +diff --git a/plugins/multiedit/multiedit/documenthelper.py b/plugins/multiedit/multiedit/documenthelper.py +index 58ccac7..df08c7f 100644 +--- a/plugins/multiedit/multiedit/documenthelper.py ++++ b/plugins/multiedit/multiedit/documenthelper.py +@@ -69,6 +69,16 @@ class DocumentHelper(Signals): + self.reset_buffer(self._view.get_buffer()) + + self.initialize_event_handlers() ++ self.toggle_callback = None ++ ++ def get_view(self): ++ return self._view ++ ++ def set_toggle_callback(self, callback, data): ++ self.toggle_callback = lambda: callback(data) ++ ++ def enabled(self): ++ return self._in_mode + + def _update_selection_tag(self): + style = self._view.get_style() +@@ -147,12 +157,21 @@ class DocumentHelper(Signals): + self._view.set_border_window_size(gtk.TEXT_WINDOW_TOP, 0) + self.remove_edit_points() + ++ if self.toggle_callback: ++ self.toggle_callback() ++ + def enable_multi_edit(self): + self._view.set_border_window_size(gtk.TEXT_WINDOW_TOP, 20) + self._in_mode = True + +- def toggle_multi_edit(self): +- if self._in_mode: ++ if self.toggle_callback: ++ self.toggle_callback() ++ ++ def toggle_multi_edit(self, enabled): ++ if self.enabled() == enabled: ++ return ++ ++ if self.enabled(): + self.disable_multi_edit() + else: + self.enable_multi_edit() +diff --git a/plugins/multiedit/multiedit/windowhelper.py b/plugins/multiedit/multiedit/windowhelper.py +index d9941ae..adae3af 100644 +--- a/plugins/multiedit/multiedit/windowhelper.py ++++ b/plugins/multiedit/multiedit/windowhelper.py +@@ -58,14 +58,15 @@ class WindowHelper(Signals): + + self.connect_signal(window, 'tab-added', self.on_tab_added) + self.connect_signal(window, 'tab-removed', self.on_tab_removed) +- ++ self.connect_signal(window, 'active-tab-changed', self.on_active_tab_changed) ++ + self.install_ui() + + def install_ui(self): + manager = self._window.get_ui_manager() + + self._action_group = gtk.ActionGroup("GeditMultiEditPluginActions") +- self._action_group.add_actions( ++ self._action_group.add_toggle_actions( + [('MultiEditModeAction', None, _('Multi Edit Mode'), '<Ctrl><Shift>C', _('Start multi edit mode'), self.on_multi_edit_mode)]) + + manager.insert_action_group(self._action_group, -1) +@@ -95,26 +96,40 @@ class WindowHelper(Signals): + def add_document_helper(self, view): + if view.get_data(constants.DOCUMENT_HELPER_KEY) != None: + return +- +- DocumentHelper(view) ++ ++ helper = DocumentHelper(view) ++ helper.set_toggle_callback(self.on_multi_edit_toggled, helper) + + def remove_document_helper(self, view): + helper = view.get_data(constants.DOCUMENT_HELPER_KEY) + + if helper != None: + helper.stop() +- ++ ++ def get_action(self): ++ return self._action_group.get_action('MultiEditModeAction') ++ ++ def on_multi_edit_toggled(self, helper): ++ if helper.get_view() == self._window.get_active_view(): ++ self.get_action().set_active(helper.enabled()) ++ + def on_tab_added(self, window, tab): + self.add_document_helper(tab.get_view()) + + def on_tab_removed(self, window, tab): + self.remove_document_helper(tab.get_view()) +- ++ ++ def on_active_tab_changed(self, window, tab): ++ view = tab.get_view() ++ helper = view.get_data(constants.DOCUMENT_HELPER_KEY) ++ ++ self.get_action().set_active(helper != None and helper.enabled()) ++ + def on_multi_edit_mode(self, action): + view = self._window.get_active_view() + helper = view.get_data(constants.DOCUMENT_HELPER_KEY) + + if helper != None: +- helper.toggle_multi_edit() ++ helper.toggle_multi_edit(self.get_action().get_active()) + + # ex:ts=4:et: +-- +cgit v0.8.3.1 diff --git a/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-find-replace.patch b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-find-replace.patch new file mode 100644 index 0000000..5cdda2a --- /dev/null +++ b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-find-replace.patch @@ -0,0 +1,64 @@ +From 30ede3f5966a87b7cc3591dc3ea856855abf953a Mon Sep 17 00:00:00 2001 +From: Jesse van den Kieboom <jesse@icecrew.nl> +Date: Sun, 11 Apr 2010 20:27:18 +0000 +Subject: Fix issues with find/replace in selections + +--- +diff --git a/plugins/commander/modules/find/finder.py b/plugins/commander/modules/find/finder.py +index eb732b9..3abc16b 100644 +--- a/plugins/commander/modules/find/finder.py ++++ b/plugins/commander/modules/find/finder.py +@@ -71,15 +71,19 @@ class Finder: + ret = self.do_find(bounds) + + # Check if we need to wrap around if nothing is found +- startiter = buf.get_iter_at_mark(self.search_start_mark) ++ if self.search_start_mark: ++ startiter = buf.get_iter_at_mark(self.search_start_mark) ++ else: ++ startiter = None ++ + startbound = buf.get_iter_at_mark(self.search_boundaries.start) + +- if not ret and not self.from_start and not startiter.equal(startbound): ++ if not ret and not self.from_start and (startiter and not startiter.equal(startbound)): + self.from_start = True + + # Try from beginning + bounds[0] = buf.get_start_iter() +- bounds[1] = buf.get_iter_at_mark(self.search_start_mark) ++ bounds[1] = startiter + + # Make sure to just stop at the start of the previous + self.search_boundaries.end = self.search_start_mark +@@ -131,6 +135,9 @@ class Finder: + # end, and then continue to start from the beginning of the buffer if needed + bounds = list(buf.get_bounds()) + self.search_start_mark = buf.create_mark(None, buf.get_iter_at_mark(buf.get_insert()), True) ++ selection = False ++ else: ++ selection = True + + bounds[0].order(bounds[1]) + +@@ -139,7 +146,10 @@ class Finder: + self.search_boundaries.end = self._create_or_move(Finder.FIND_ENDMARK, bounds[1], False) + + # Set the result marks so the next find will start at the correct location +- piter = buf.get_iter_at_mark(buf.get_insert()) ++ if selection: ++ piter = bounds[0] ++ else: ++ piter = buf.get_iter_at_mark(buf.get_insert()) + + self.find_result.start = self._create_or_move(Finder.FIND_RESULT_STARTMARK, piter, True) + self.find_result.end = self._create_or_move(Finder.FIND_RESULT_ENDMARK, piter, False) +@@ -270,4 +280,4 @@ class Finder: + buf.end_user_action() + + self.cancel() +- yield commands.result.DONE +\ No newline at end of file ++ yield commands.result.DONE +-- +cgit v0.8.3.1 diff --git a/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-keybinding-toggle.patch b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-keybinding-toggle.patch new file mode 100644 index 0000000..b7c8e5a --- /dev/null +++ b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-keybinding-toggle.patch @@ -0,0 +1,68 @@ +From f02718befc0f65350a90acc636106d8f9377c252 Mon Sep 17 00:00:00 2001 +From: Jesse van den Kieboom <jesse@icecrew.nl> +Date: Sat, 01 May 2010 15:10:42 +0000 +Subject: Make multi edit keybinding toggle multi edit mode + +--- +diff --git a/plugins/multiedit/multiedit/documenthelper.py b/plugins/multiedit/multiedit/documenthelper.py +index 44937a8..58ccac7 100644 +--- a/plugins/multiedit/multiedit/documenthelper.py ++++ b/plugins/multiedit/multiedit/documenthelper.py +@@ -138,13 +138,24 @@ class DocumentHelper(Signals): + for handler in self._event_handlers: + handler[0] = map(lambda x: gtk.gdk.keyval_from_name(x), handler[0]) + ++ def disable_multi_edit(self): ++ if self._column_mode: ++ self._cancel_column_mode() ++ ++ self._in_mode = False ++ ++ self._view.set_border_window_size(gtk.TEXT_WINDOW_TOP, 0) ++ self.remove_edit_points() ++ + def enable_multi_edit(self): + self._view.set_border_window_size(gtk.TEXT_WINDOW_TOP, 20) ++ self._in_mode = True + ++ def toggle_multi_edit(self): + if self._in_mode: +- return +- +- self._in_mode = True ++ self.disable_multi_edit() ++ else: ++ self.enable_multi_edit() + + def remove_edit_points(self): + buf = self._buffer +@@ -156,15 +167,6 @@ class DocumentHelper(Signals): + self._multi_edited = False + self._view.queue_draw() + +- def disable_multi_edit(self): +- if self._column_mode: +- self._cancel_column_mode() +- +- self._in_mode = False +- +- self._view.set_border_window_size(gtk.TEXT_WINDOW_TOP, 0) +- self.remove_edit_points() +- + def do_escape_mode(self, event): + if self._column_mode: + self._cancel_column_mode() +diff --git a/plugins/multiedit/multiedit/windowhelper.py b/plugins/multiedit/multiedit/windowhelper.py +index 63ac0ef..d9941ae 100644 +--- a/plugins/multiedit/multiedit/windowhelper.py ++++ b/plugins/multiedit/multiedit/windowhelper.py +@@ -115,6 +115,6 @@ class WindowHelper(Signals): + helper = view.get_data(constants.DOCUMENT_HELPER_KEY) + + if helper != None: +- helper.enable_multi_edit() ++ helper.toggle_multi_edit() + + # ex:ts=4:et: +-- +cgit v0.8.3.1 diff --git a/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-replace-all.patch b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-replace-all.patch new file mode 100644 index 0000000..03510af --- /dev/null +++ b/app-editors/gedit-plugins/files/gedit-plugins-2.32.0-replace-all.patch @@ -0,0 +1,53 @@ +From facc66d97ee959309ce7900553cc1f7a6517c394 Mon Sep 17 00:00:00 2001 +From: Jesse van den Kieboom <jesse@icecrew.nl> +Date: Thu, 29 Apr 2010 17:15:09 +0000 +Subject: Improved handling of scrolling for replace-all command + +--- +diff --git a/plugins/commander/modules/find/finder.py b/plugins/commander/modules/find/finder.py +index 3abc16b..bc453f1 100644 +--- a/plugins/commander/modules/find/finder.py ++++ b/plugins/commander/modules/find/finder.py +@@ -195,7 +195,7 @@ class Finder: + + self.cancel() + yield commands.result.DONE +- ++ + def _restore_cursor(self, mark): + buf = mark.get_buffer() + +@@ -221,10 +221,16 @@ class Finder: + + if not ret: + yield commands.result.DONE +- ++ ++ self.scroll_back = False ++ + # Then ask for the replacement string + if not self.replacestr: + try: ++ if replaceall: ++ self.scroll_back = True ++ self.select_last_result() ++ + replacestr, words, modifier = (yield commands.result.Prompt('Replace with:')) + self.set_replace(replacestr) + except GeneratorExit, e: +@@ -272,10 +278,11 @@ class Finder: + buf.end_user_action() + + self.cancel() +- raise e ++ raise e + + if replaceall: +- self._restore_cursor(startmark) ++ if self.scroll_back: ++ self._restore_cursor(startmark) + + buf.end_user_action() + +-- +cgit v0.8.3.1 diff --git a/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild new file mode 100644 index 0000000..35c27d6 --- /dev/null +++ b/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-2.30.0.ebuild,v 1.5 2011/04/16 20:01:14 arfrever Exp $ + +EAPI="3" +GCONF_DEBUG="no" +PYTHON_DEPEND="session? 2" +PYTHON_USE_WITH_OPT="session? xml" + +inherit gnome2 multilib python eutils + +DESCRIPTION="Offical plugins for gedit." +HOMEPAGE="http://live.gnome.org/GeditPlugins" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" + +IUSE="bookmarks +bracketcompletion charmap colorpicker +drawspaces +joinlines python +session showtabbar smartspaces terminal +synctex" + +RDEPEND=">=x11-libs/gtk+-2.14:2 + gnome-base/gconf + >=x11-libs/gtksourceview-2.6:2.0 + >=app-editors/gedit-2.29.3[python] + >=dev-python/pygtk-2.14:2 + charmap? ( + >=gnome-extra/gucharmap-2.24.3 + ) + python? ( + >=dev-python/pygtksourceview-2.2:2 + ) + terminal? ( + dev-python/gconf-python + >=x11-libs/vte-0.19.4:0[python] + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool" + +DOCS="AUTHORS NEWS ChangeLog*" + +pkg_setup() { + local myplugins="codecomment" + + for plugin in ${IUSE/python}; do + if use session && [ "${plugin/+}" = "session" ]; then + myplugins="${myplugins},sessionsaver" + elif use ${plugin/+}; then + myplugins="${myplugins},${plugin/+}" + fi + done + + G2CONF="${G2CONF} + --disable-dependency-tracking + --with-plugins=${myplugins} + $(use_enable python)" + + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + gnome2_src_prepare + + + # disable pyc compiling + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile +} + +src_test() { + emake check || die "make check failed" +} + +src_install() { + gnome2_src_install + # gedit doesn't rely on *.la files + find "${D}" -name "*.la" -delete || die "*.la files removal failed" +} + +pkg_postinst() { + gnome2_pkg_postinst + python_need_rebuild + python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins +} + +pkg_postrm() { + gnome2_pkg_postrm + python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins +} diff --git a/app-office/homebank/homebank-4.4.ebuild b/app-office/homebank/homebank-4.4.ebuild new file mode 100644 index 0000000..3f77e8f --- /dev/null +++ b/app-office/homebank/homebank-4.4.ebuild @@ -0,0 +1,46 @@ +EAPI="2" + +inherit fdo-mime + +DESCRIPTION="Free, easy, personal accounting for everyone" +HOMEPAGE="http://homebank.free.fr/index.php" +SRC_URI="http://homebank.free.fr/public/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +IUSE="ofx" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=">=x11-libs/gtk+-2.14 + >=dev-libs/glib-2.17 + sys-libs/zlib + ofx? ( >=dev-libs/libofx-0.7 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.40.5" +RDEPEND="${RDEPEND} + gnome-base/librsvg" + +S="${WORKDIR}/${P/_/}" + +src_prepare() { + sed -i -e 's/true/TRUE/' src/import.c || die "sed failed" +} + +src_configure() { + econf $(use_with ofx) +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS ChangeLog README +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/gnome-extra/conduit/Manifest b/gnome-extra/conduit/Manifest new file mode 100644 index 0000000..8030179 --- /dev/null +++ b/gnome-extra/conduit/Manifest @@ -0,0 +1,24 @@ +AUX conduit-0.3.12_correct_firefox_path.patch 471 RMD160 079526aebc179b78fe07af3f60a7afe0a5c41309 SHA1 278b6380d7231e55c551af7573a8e4eb4bf430e2 SHA256 86e382f666374c559d5458fa14d5f790086f7d6ec3c3968701563fd988eff2d0 +AUX conduit-0.3.13_correct_firefox_path.patch 487 RMD160 4fff08ef5af4afdae3a5f70ff1a4b1c45c315d5f SHA1 f5d663299f0cd0f970e8a901c5929bae1018ce12 SHA256 1dc4b12c84e83d8d6adc48d4c2f4ab7f62704d54d083babb3bd7e2d1b2213444 +AUX conduit-0.3.17-escaping-caracters.patch 1308 RMD160 39d48747bfdbbd4d94027ae15e629537a4bf8586 SHA1 b24780d1453df28a66a502d2e69d5f9431acbfa3 SHA256 de786c035d8adf9865cb4ba6e0545320154049681aab05375ac2bb74e6e01d66 +AUX conduit-0.3.17-non-ASCII-folder-canvas.patch 614 RMD160 9efd0154bcd43309de25a96e175a10a39d067fe8 SHA1 33520fcd8353f8d1287704df6f1923fd85e6538a SHA256 6d568123a12991c3473b85ba4f5cec3c757c4cae4c1fdf90ea74e26925c09481 +AUX conduit-0.3.17-programming-error-unicode.patch 790 RMD160 c16f2b461d976ca61e502990d9002d727c1b6ae8 SHA1 57f811f42e1359618266da05960bc39434e43fff SHA256 2d2c5d82c9b293f946a0b583bf297791b62e9e78f8c5713126de4cdf29f7330e +AUX conduit-0.3.17-rhythmbox-new-path.patch 1130 RMD160 48064e3aaefde02e0a3f6f172c65bfdee958a20d SHA1 a30a2138a5b2d72b5200910f249d38c3c1dc7d3e SHA256 2a5ec1b04ee7ba7dbcf6fba80d840b7a9a00518ac262627609176903ae116416 +AUX conduit-0.3.9_correct_firefox_path.patch 450 RMD160 1bee9c2965dcf959a094b6e1adcea2882ada8dbf SHA1 007e05d95cbe7a29c189e1e3445d5b316b72e1ad SHA256 e89103d2747f9476586d5a4a8135c3578695a3aaa2579d53500c12e1b5c54165 +DIST conduit-0.3.0.tar.gz 493837 RMD160 32f6c694cd3578d85c394b2cc2678f30281e0cd5 SHA1 54d12c17b971fd3d456754a427c845d3f174caa6 SHA256 4ecf1fd593a0e391ebf17c9ec8c7f3c32276507c5a3c6fa4715c58f58152c6fd +DIST conduit-0.3.12.tar.gz 990540 RMD160 4bf2f5bbada12d0b5a3b258b2356d9cc31bf8c06 SHA1 2696c6c8e330b588b6f303b28c4db86e34e92f9f SHA256 36b004b3f94b94095ece70037d5298438f5c6fe82fbe1c68057de26072327ed3 +DIST conduit-0.3.13.tar.bz2 920341 RMD160 c4b5391a3629d6e85fc59a86b3ea367e2b62976a SHA1 a84beec8fe8f009cd55cd91abb92b56e85b77e4d SHA256 5fd3d3ab816d347a00dce93cdfa856339d02be878a524a4a8031d9643b52bf86 +DIST conduit-0.3.15.tar.bz2 952077 RMD160 b0d69a47d3dfa946c8aa8ae7f03dbaed1abef971 SHA1 2c691aeac8ab550504d2acd8d23d26317cd2e89b SHA256 cc676d1096562ccf1bd91e9e6c113f682817387dd6e6803d75ba68bb96c3283f +DIST conduit-0.3.17.tar.bz2 888078 RMD160 1781b449fc686965b6e13015f33c3a2ddba9fb90 SHA1 dd959dfb4be436febeff517a1f1675597718ecc5 SHA256 dfbc00490b0170f22eb6e73b893da40c48556d8982b8400484e19fa617f5f934 +DIST conduit-0.3.3.tar.gz 507050 RMD160 3c44eda4dd4fb98bdc87be6dd534b1ae916fe52f SHA1 7b59528993ea78f008e0e3725e5ff7f06685517b SHA256 305632eac1277a16c28d149c85c461487f8d990e940b605503becf8e2261bac8 +DIST conduit-0.3.8.tar.gz 862659 RMD160 3a2c1fe66cf1dfd2ee9ee8e9c78c0b2946da6d14 SHA1 37e6f7e879e35a2151c3aa34aba4feda90918600 SHA256 4412eed98f6ea826f16b3fd8b1889d0c869bebaea2b80132e8c3d8bd266415e4 +DIST conduit-0.3.9.tar.gz 893278 RMD160 c5f18b9cdd847a05d5b9bfdb836bfd854889d403 SHA1 a7ffe1541d56d5fd69f8e48f49093c7c4c5de2e2 SHA256 f1fcf9f1ab260ca48c1e5d7050d313ad1b851856bfc523b14188452b98ad1ecf +EBUILD conduit-0.3.0.ebuild 568 RMD160 04e5d1b255538689b862272a90c1b95b948bbe3f SHA1 6f27efa1f7ee1dc66eccd95b393669c9adc197d0 SHA256 3ae76016d88d08352ddf81a04000f80872ff2ebf018eb3e8f42f59c08a378b16 +EBUILD conduit-0.3.12.ebuild 901 RMD160 2d5a9e66420734c363368460bbcb7a4dcedfa98d SHA1 50cbe8b86dd26acc5eb372292d72e7768766662e SHA256 f3289331ce5a5a0f56fc2fcd7fabb7d421072c2d215374489182f6605a48f064 +EBUILD conduit-0.3.13.ebuild 937 RMD160 8bbaa3c3092816e8ae84367833ea0565879e6225 SHA1 790e2aabf2a3645887b2c3d9c2069df067adec04 SHA256 5962b0b9803b91fadb7db8c61279f4494ba5076885001b2860ed56406ecc348d +EBUILD conduit-0.3.15.ebuild 903 RMD160 f559d7a7cab43fc9129ff4abf2eda32a7a445838 SHA1 c294f671beac0e2356b971b1b2dec0e9d477e6af SHA256 340029e56099ccc20244fd78b48d9223091febc94786b51615fb53e2c1ede4e8 +EBUILD conduit-0.3.17.ebuild 2524 RMD160 167e867a78cdc026ceb70f5d8ba2fca687c598d7 SHA1 fcaefa063bcdc2094693515d83d65250fec833c4 SHA256 30d67fb5c5ceb7bd6290e08c33926f97d2c9b2e7f15b81a6bbafce5997a51dad +EBUILD conduit-0.3.3.ebuild 749 RMD160 7727ce30b7e38e82d870b804c7dd91b7ab6c235c SHA1 7ad3465d34d3f4bf7caef9fb0a2c49adba990a07 SHA256 6b27d5633560e18a84f3f445e7a2dc9e30dc10d474bcefed7cb69016c925f2d4 +EBUILD conduit-0.3.8.ebuild 901 RMD160 2d5a9e66420734c363368460bbcb7a4dcedfa98d SHA1 50cbe8b86dd26acc5eb372292d72e7768766662e SHA256 f3289331ce5a5a0f56fc2fcd7fabb7d421072c2d215374489182f6605a48f064 +EBUILD conduit-0.3.9.ebuild 901 RMD160 2d5a9e66420734c363368460bbcb7a4dcedfa98d SHA1 50cbe8b86dd26acc5eb372292d72e7768766662e SHA256 f3289331ce5a5a0f56fc2fcd7fabb7d421072c2d215374489182f6605a48f064 +MISC conduit-0.3.17.ebuild~ 2523 RMD160 78830324524fb0b3854b5289b7e96f0578d4beee SHA1 7cf0fcada715ce059734c652697a04d64a9fa1da SHA256 77c51bfe92dc44fe0e6b66f135e4c43276cbac8cb6960c80d07bf58cdfc2a991 diff --git a/gnome-extra/conduit/conduit-0.3.0.ebuild b/gnome-extra/conduit/conduit-0.3.0.ebuild new file mode 100755 index 0000000..c2042cf --- /dev/null +++ b/gnome-extra/conduit/conduit-0.3.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="Synchronization for GNOME" +HOMEPAGE="http://www.conduit-project.org" +SRC_URI="http://files.conduit-project.org/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +DEPEND=">=dev-python/pygoocanvas-0.8.0 + >=dev-python/vobject-0.4.8 + >=dev-python/pygtk-2.10.3 + >=dev-python/pysqlite-2.3.1" +RDEPEND=">=dev-python/pygoocanvas-0.8.0" + +src_install() { + emake DESTDIR="${D}" install || die "Error installing ${PN}" +} diff --git a/gnome-extra/conduit/conduit-0.3.12.ebuild b/gnome-extra/conduit/conduit-0.3.12.ebuild new file mode 100755 index 0000000..9eccbb6 --- /dev/null +++ b/gnome-extra/conduit/conduit-0.3.12.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +DESCRIPTION="Synchronization for GNOME" +HOMEPAGE="http://www.conduit-project.org" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/conduit/0.3/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="nautilus eog" + +DEPEND=">=dev-python/pygoocanvas-0.9.0 + >=dev-python/vobject-0.4.8 + >=dev-python/pyxml-0.8.4 + >=dev-python/pygtk-2.10.3 + >=dev-python/pysqlite-2.3.1" +RDEPEND=">=dev-python/pygoocanvas-0.9.0" + +src_unpack() { + unpack ${A} + + epatch ${FILESDIR}/${P}_correct_firefox_path.patch +} + +src_compile() { + + econf \ + $(use_enable nautilus nautilus-extension) \ + $(use_enable eog eog-plugin) \ + || die "configure failed" + + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Error installing ${PN}" +} diff --git a/gnome-extra/conduit/conduit-0.3.13.ebuild b/gnome-extra/conduit/conduit-0.3.13.ebuild new file mode 100755 index 0000000..b26e1bc --- /dev/null +++ b/gnome-extra/conduit/conduit-0.3.13.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="0" + +inherit eutils versionator + +DESCRIPTION="Synchronization for GNOME" +HOMEPAGE="http://www.conduit-project.org" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/conduit/$(get_version_component_range 1-2)/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="nautilus eog" + +DEPEND=">=dev-python/pygoocanvas-0.9.0 + >=dev-python/vobject-0.4.8 + >=dev-python/pyxml-0.8.4 + >=dev-python/pygtk-2.10.3 + >=dev-python/pysqlite-2.3.1" +RDEPEND=">=dev-python/pygoocanvas-0.9.0" + +src_unpack() { + unpack "${A}" + + epatch "${FILESDIR}/${P}_correct_firefox_path.patch" +} + +src_compile() { + econf \ + $(use_enable nautilus nautilus-extension) \ + $(use_enable eog eog-plugin) \ + || die "configure failed" + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Error installing ${PN}" +} diff --git a/gnome-extra/conduit/conduit-0.3.15.ebuild b/gnome-extra/conduit/conduit-0.3.15.ebuild new file mode 100755 index 0000000..0e8a227 --- /dev/null +++ b/gnome-extra/conduit/conduit-0.3.15.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="0" + +inherit eutils versionator + +DESCRIPTION="Synchronization for GNOME" +HOMEPAGE="http://www.conduit-project.org" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/conduit/$(get_version_component_range 1-2)/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="nautilus eog totem" + +DEPEND=">=dev-python/pygoocanvas-0.9.0 + >=dev-python/vobject-0.4.8 + >=dev-python/pyxml-0.8.4 + >=dev-python/pygtk-2.10.3 + >=dev-python/pysqlite-2.3.1 + >=dev-python/dbus-python-0.80" +RDEPEND="$(DEPEND)" + +src_compile() { + econf \ + $(use_enable nautilus nautilus-extension) \ + $(use_enable eog eog-plugin) \ + $(use_enable totem totem-plugin) \ + || die "configure failed" + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Error installing ${PN}" +} diff --git a/gnome-extra/conduit/conduit-0.3.17.ebuild b/gnome-extra/conduit/conduit-0.3.17.ebuild new file mode 100644 index 0000000..6d6ad96 --- /dev/null +++ b/gnome-extra/conduit/conduit-0.3.17.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PYTHON_DEPEND="2" + +inherit eutils gnome.org python + +DESCRIPTION="Synchronization for GNOME" +HOMEPAGE="http://live.gnome.org/Conduit" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64" +#flickr nautilus +IUSE="eog evolution ipod rss totem" + +#DEPENDS extracted from http://packages.ubuntu.com/natty/conduit +#http://stuvel.eu/flickrapi +# flickr? ( dev-python/flickr ) +#Makefile bug: plugins are not installed even if enabled +# nautilus? ( >=dev-python/nautilus-python-0.5.3 ) +DEPEND=">=dev-python/pygoocanvas-0.9.0 + >=dev-python/pywebkitgtk-1.1.8 + >=dev-python/vobject-0.4.8 + >=dev-python/pyxml-0.8.4 + >=dev-python/pygtk-2.10.3 + dev-python/gdata + evolution? ( dev-python/evolution-python ) + ipod? ( >=media-libs/libgpod-0.8.0[python] ) + rss? ( dev-python/feedparser ) + || ( >=dev-lang/python-2.6 dev-python/simplejson ) + || ( ( >=dev-lang/python-2.4 >=dev-python/pysqlite-2.3.1 ) >=dev-lang/python-2.5[sqlite] )" +RDEPEND=">=dev-python/pygoocanvas-0.9.0" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}/${P}-non-ASCII-folder-canvas.patch" + epatch "${FILESDIR}/${P}-programming-error-unicode.patch" + epatch "${FILESDIR}/${P}-escaping-caracters.patch" + epatch "${FILESDIR}/${P}-rhythmbox-new-path.patch" + #epatch "${FILESDIR}/${P}-fix-firefox-libraries.patch" + + # disable pyc compiling + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile +} + +src_configure() { + local myconf + + myconf=" --disable-scrollkeeper " + + #Makefile bug: plugins are not installed even if enabled +# if use eog; then +# myconf="${myconf} --with-eog-plugin-dir=$(pkg-config --variable=pluginsdir eog) " +# fi +# +# if use totem; then +# myconf="${myconf} --with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins" +# fi +# +# if use nautilus; then +# myconf="${myconf} --with-nautilus-extension-dir=$(pkg-config --variable=pythondir nautilus-python) " +# fi +# $(use_enable nautilus nautilus-extension) \ +# $(use_enable eog eog-plugin) \ +# $(use_enable totem totem-plugin) \ + + econf \ + ${myconf} \ + || die "configure failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Error installing ${PN}" +} + +pkg_postinst() { + python_mod_optimize $(python_get_sitedir)/conduit + python_mod_optimize /usr/$(get_libdir)/conduit/modules/ +} + +pkg_postrm() { + python_mod_cleanup $(python_get_sitedir)/conduit + python_mod_cleanup /usr/$(get_libdir)/conduit/modules/ +} diff --git a/gnome-extra/conduit/conduit-0.3.3.ebuild b/gnome-extra/conduit/conduit-0.3.3.ebuild new file mode 100755 index 0000000..dd18a5e --- /dev/null +++ b/gnome-extra/conduit/conduit-0.3.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="Synchronization for GNOME" +HOMEPAGE="http://www.conduit-project.org" +SRC_URI="http://files.conduit-project.org/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="evolution" + +DEPEND=">=dev-python/pygoocanvas-0.8.0 + >=dev-python/vobject-0.4.8 + >=dev-python/pyxml-0.8.4 + >=dev-python/pygtk-2.10.3 + >=dev-python/pysqlite-2.3.1 + evolution? ( >=dev-python/evolution-python-0.0.3 )" +RDEPEND=">=dev-python/pygoocanvas-0.8.0" + +src_compile() { + if ! use evolution ; then + econf --enable-ecal=no + else + econf + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "Error installing ${PN}" +} diff --git a/gnome-extra/conduit/conduit-0.3.8.ebuild b/gnome-extra/conduit/conduit-0.3.8.ebuild new file mode 100755 index 0000000..9eccbb6 --- /dev/null +++ b/gnome-extra/conduit/conduit-0.3.8.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +DESCRIPTION="Synchronization for GNOME" +HOMEPAGE="http://www.conduit-project.org" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/conduit/0.3/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="nautilus eog" + +DEPEND=">=dev-python/pygoocanvas-0.9.0 + >=dev-python/vobject-0.4.8 + >=dev-python/pyxml-0.8.4 + >=dev-python/pygtk-2.10.3 + >=dev-python/pysqlite-2.3.1" +RDEPEND=">=dev-python/pygoocanvas-0.9.0" + +src_unpack() { + unpack ${A} + + epatch ${FILESDIR}/${P}_correct_firefox_path.patch +} + +src_compile() { + + econf \ + $(use_enable nautilus nautilus-extension) \ + $(use_enable eog eog-plugin) \ + || die "configure failed" + + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Error installing ${PN}" +} diff --git a/gnome-extra/conduit/conduit-0.3.9.ebuild b/gnome-extra/conduit/conduit-0.3.9.ebuild new file mode 100755 index 0000000..9eccbb6 --- /dev/null +++ b/gnome-extra/conduit/conduit-0.3.9.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +DESCRIPTION="Synchronization for GNOME" +HOMEPAGE="http://www.conduit-project.org" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/conduit/0.3/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="nautilus eog" + +DEPEND=">=dev-python/pygoocanvas-0.9.0 + >=dev-python/vobject-0.4.8 + >=dev-python/pyxml-0.8.4 + >=dev-python/pygtk-2.10.3 + >=dev-python/pysqlite-2.3.1" +RDEPEND=">=dev-python/pygoocanvas-0.9.0" + +src_unpack() { + unpack ${A} + + epatch ${FILESDIR}/${P}_correct_firefox_path.patch +} + +src_compile() { + + econf \ + $(use_enable nautilus nautilus-extension) \ + $(use_enable eog eog-plugin) \ + || die "configure failed" + + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Error installing ${PN}" +} diff --git a/gnome-extra/conduit/files/conduit-0.3.12_correct_firefox_path.patch b/gnome-extra/conduit/files/conduit-0.3.12_correct_firefox_path.patch new file mode 100755 index 0000000..91f01be --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.12_correct_firefox_path.patch @@ -0,0 +1,11 @@ +--- conduit-0.3.12/conduit/conduit.orig 2008-07-18 08:58:17.000000000 +0200 ++++ conduit-0.3.12/conduit/conduit 2008-07-18 08:58:40.000000000 +0200 +@@ -8,7 +8,7 @@ + # Run mozilla takes care of settin up the appropriate environment variables + # to run a program using mozilla libs + +-for d in `ls -d /usr/lib*/firefox* | sort -r` ++for d in `ls -d /usr/lib*/mozilla-firefox* | sort -r` + do + if [ -x $d/run-mozilla.sh ]; then + echo INFO: FOUND FIREFOX LIBS AT $d diff --git a/gnome-extra/conduit/files/conduit-0.3.13_correct_firefox_path.patch b/gnome-extra/conduit/files/conduit-0.3.13_correct_firefox_path.patch new file mode 100755 index 0000000..6b5ee19 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.13_correct_firefox_path.patch @@ -0,0 +1,11 @@ +--- conduit-0.3.13/conduit/conduit.orig 2008-08-05 23:12:49.000000000 +0200 ++++ conduit-0.3.13/conduit/conduit 2008-08-05 23:18:03.000000000 +0200 +@@ -8,7 +8,7 @@ + # Run mozilla takes care of settin up the appropriate environment variables + # to run a program using mozilla libs + +-for d in `ls -d /usr/lib*/firefox* | sort -r` ++for d in `ls -d /usr/lib*/{mozilla-,}firefox* 2> /dev/null | sort -r` + do + if [ -x $d/run-mozilla.sh ]; then + echo INFO: FOUND FIREFOX LIBS AT $d diff --git a/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch b/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch new file mode 100755 index 0000000..c62c1c4 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch @@ -0,0 +1,31 @@ +diff -urNad conduit~/conduit/platform/FileGio.py conduit/conduit/platform/FileGio.py +--- conduit~/conduit/platform/FileGio.py 2009-08-30 13:33:34.000000000 +0200 ++++ conduit/conduit/platform/FileGio.py 2009-08-30 14:06:49.000000000 +0200 +@@ -1,4 +1,5 @@ + import gio ++import urllib + + import conduit.platform + +@@ -200,6 +201,8 @@ + #if not relative, return abs path + if not res: + res = toURI ++ else: ++ res = urllib.quote(res) + return res + + @staticmethod +@@ -353,10 +356,10 @@ + if filetype == gio.FILE_TYPE_DIRECTORY: + #Include hidden directories + if not hidden or self.includeHidden: +- self.dirs.append(dir+"/"+filename) ++ self.dirs.append(dir+"/"+urllib.quote(filename)) + t += 1 + elif filetype == gio.FILE_TYPE_REGULAR or (filetype == gio.FILE_TYPE_SYMBOLIC_LINK and self.followSymlinks): +- uri = dir+"/"+filename ++ uri = dir+"/"+urllib.quote(filename) + #Include hidden files + if not hidden or self.includeHidden: + self.URIs.append(uri) diff --git a/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch b/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch new file mode 100755 index 0000000..15ad2e2 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch @@ -0,0 +1,12 @@ +diff -urNad conduit-fix~/conduit/modules/FileModule/FileModule.py conduit-fix/conduit/modules/FileModule/FileModule.py +--- conduit-fix~/conduit/modules/FileModule/FileModule.py 2009-02-24 22:56:27.000000000 +0100 ++++ conduit-fix/conduit/modules/FileModule/FileModule.py 2009-02-24 23:03:47.000000000 +0100 +@@ -116,7 +116,7 @@ + return self.folder + + def get_name(self): +- return Vfs.uri_get_filename(self.folder) ++ return Vfs.uri_unescape(Vfs.uri_get_filename(self.folder)) + + def _monitor_folder(self): + self._monitor.add(self.folder, self._monitor.MONITOR_DIRECTORY) diff --git a/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch b/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch new file mode 100755 index 0000000..bc2c382 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch @@ -0,0 +1,14 @@ +diff -urNad conduit~/conduit/MappingDB.py conduit/conduit/MappingDB.py +--- conduit~/conduit/MappingDB.py 2009-08-30 13:33:34.000000000 +0200 ++++ conduit/conduit/MappingDB.py 2009-08-30 13:40:49.000000000 +0200 +@@ -38,8 +38,8 @@ + self.sinkRid = rid + + def values(self): +- return (self.sourceUID,self.sourceRid.get_UID(),self.sourceRid.get_mtime(),self.sourceRid.get_hash(), +- self.sinkUID,self.sinkRid.get_UID(),self.sinkRid.get_mtime(),self.sinkRid.get_hash()) ++ return (unicode(self.sourceUID),unicode(self.sourceRid.get_UID()),self.sourceRid.get_mtime(),self.sourceRid.get_hash(), ++ unicode(self.sinkUID),unicode(self.sinkRid.get_UID()),self.sinkRid.get_mtime(),self.sinkRid.get_hash()) + + class MappingDB: + """ diff --git a/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch b/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch new file mode 100755 index 0000000..d5c35ec --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch @@ -0,0 +1,23 @@ +diff -urNad conduit-0.3.17~/conduit/modules/RhythmboxModule/RhythmboxModule.py conduit-0.3.17/conduit/modules/RhythmboxModule/RhythmboxModule.py +--- conduit-0.3.17~/conduit/modules/RhythmboxModule/RhythmboxModule.py 2010-01-07 17:10:30.000000000 +0100 ++++ conduit-0.3.17/conduit/modules/RhythmboxModule/RhythmboxModule.py 2010-03-28 14:37:12.034777215 +0200 +@@ -50,8 +50,8 @@ + _icon_ = "rhythmbox" + _configurable_ = True + +- PLAYLIST_PATH="~/.gnome2/rhythmbox/playlists.xml" +- RHYTHMDB_PATH="~/.gnome2/rhythmbox/rhythmdb.xml" ++ PLAYLIST_PATH="~/.local/share/rhythmbox/playlists.xml" ++ RHYTHMDB_PATH="~/.local/share/rhythmbox/rhythmdb.xml" + + def __init__(self, *args): + DataProvider.DataSource.__init__(self) +@@ -150,7 +150,7 @@ + '''Wrapper around the standard Audio datatype that implements + the rating, playcount, and cover location tags. + ''' +- COVER_ART_PATH="~/.gnome2/rhythmbox/covers/" ++ COVER_ART_PATH="~/.cache/rhythmbox/covers" + def __init__(self, URI, **kwargs): + Audio.Audio.__init__(self, URI, **kwargs) + self._songdata = kwargs['songdata'] or {} diff --git a/gnome-extra/conduit/files/conduit-0.3.9_correct_firefox_path.patch b/gnome-extra/conduit/files/conduit-0.3.9_correct_firefox_path.patch new file mode 100755 index 0000000..d2e4cf3 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.9_correct_firefox_path.patch @@ -0,0 +1,11 @@ +--- conduit-0.3.9/conduit/conduit.orig 2007-11-29 01:29:17.000000000 +0100 ++++ conduit-0.3.9/conduit/conduit 2008-03-03 02:17:58.000000000 +0100 +@@ -7,7 +7,7 @@ + + # Run mozilla takes care of settin up the appropriate environment variables + # to run a program using mozilla libs +-FF_PATH=`ls -d /usr/lib/firefox* | tail -n 1` ++FF_PATH=`ls -d /usr/lib/mozilla-firefox* | tail -n 1` + RUN_MOZILLA=$FF_PATH/run-mozilla.sh + + if [ -x $RUN_MOZILLA ]; then diff --git a/gnome-extra/gedit-latex/gedit-latex-0.2_rc2.ebuild b/gnome-extra/gedit-latex/gedit-latex-0.2_rc2.ebuild new file mode 100644 index 0000000..984ce80 --- /dev/null +++ b/gnome-extra/gedit-latex/gedit-latex-0.2_rc2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit eutils python + +DESCRIPTION="LaTeX plugin for gedit" +HOMEPAGE="http://live.gnome.org/Gedit/LaTeXPlugin" +SRC_URI="mirror://sourceforge/${PN}/LaTeXPlugin-${PV/_rc/rc}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="" + +RDEPEND=">=app-editors/gedit-2.15.2[python] + dev-python/gnome-python + dev-python/dbus-python + dev-tex/rubber" + +DEPEND="" + +S="${WORKDIR}" + +src_compile() { + einfo "Nothing to compile" +} + +src_install() { + mv GeditLaTeXPlugin ${PN} + mv GeditLaTeXPlugin.gedit-plugin ${PN}.gedit-plugin + sed -i -e "s/GeditLaTeXPlugin/${PN}/g" ${PN}.gedit-plugin ${PN}/src/base/resources.py + rm ${PN}/ChangeLog + rm ${PN}/INSTALL + rm ${PN}/COPYING + insinto /usr/$(get_libdir)/gedit-2/plugins + doins -r * + fperms 755 /usr/$(get_libdir)/gedit-2/plugins/${PN}/util/eps2png.pl +} + +pkg_postinst() { + python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins/${PN} +} + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins/${PN} +} diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest new file mode 100644 index 0000000..c44df83 --- /dev/null +++ b/media-gfx/sane-backends/Manifest @@ -0,0 +1,3 @@ +DIST sane-backends-1.0.22.tar.gz 5050344 RMD160 000ae42ffd6484c54389a9468bdde1dcfc758dde SHA1 4a2789ea9dae1ece090d016abd14b0f2450d9bdb SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b +EBUILD sane-backends-1.0.22.ebuild 4595 RMD160 6676c4dba096dd6e985963d9faecb7f221c06fef SHA1 b918833602f2b3caf3538525a4fd42525a290a12 SHA256 0875bbdf8fd05199dba4594d4503a6eaf3e9118e3ac99b0bcf23ffc45acb39ce +EBUILD sane-backends-9999.ebuild 4490 RMD160 3bc767920409947348e4d9573ed48cd4fcf3ad52 SHA1 b82820c0b030cdae0b790e548ebbbe38ba60516f SHA256 54bbfd3bb20b79c269faa816db9b17bff0b14d741db3e8c1ce887591eda7a0cc diff --git a/media-gfx/sane-backends/sane-backends-1.0.22.ebuild b/media-gfx/sane-backends/sane-backends-1.0.22.ebuild new file mode 100644 index 0000000..604f328 --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.0.22.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22.ebuild,v 1.10 2011/02/25 08:52:40 xarthisius Exp $ + +EAPI="1" + +inherit eutils flag-o-matic multilib + +# gphoto and v4l are handled by their usual USE flags. +# The pint backend was disabled because I could not get it to compile. +# The mustek_usb2 backend would force us to use --enable-pthreads which is off +# by default for linux. Let's keep this one out until we find a way how to +# handle this cleanly. +IUSE_SANE_BACKENDS=" + abaton + agfafocus + apple + artec + artec_eplus48u + as6e + avision + bh + canon + canon630u + canon_dr + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc25 + dc210 + dc240 + dell1600n_net + dmc + epjitsu + epson + epson2 + fujitsu + genesys + gt68xx + hp + hp3500 + hp3900 + hp4200 + hp5400 + hp5590 + hpsj5s + hpljm1005 + hs2p + ibm + kodak + kvs1025 + leo + lexmark + ma1509 + matsushita + microtek + microtek2 + mustek + mustek_pp + mustek_usb + nec + net + niash + p5 + pie + pixma + plustek + plustek_pp + qcam + ricoh + rts8891 + s9036 + sceptre + sharp + sm3600 + sm3840 + snapscan + sp15c + st400 + stv680 + tamarack + teco1 + teco2 + teco3 + test + u12 + umax + umax_pp + umax1220u + xerox_mfp" + +IUSE="avahi usb gphoto2 ipv6 v4l doc" + +for backend in ${IUSE_SANE_BACKENDS}; do + IUSE="${IUSE} +sane_backends_${backend}" +done + +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" + +RDEPEND=" + sane_backends_dc210? ( virtual/jpeg ) + sane_backends_dc240? ( virtual/jpeg ) + sane_backends_dell1600n_net? ( virtual/jpeg ) + avahi? ( >=net-dns/avahi-0.6.24 ) + sane_backends_canon_pp? ( sys-libs/libieee1284 ) + sane_backends_hpsj5s? ( sys-libs/libieee1284 ) + sane_backends_mustek_pp? ( sys-libs/libieee1284 ) + usb? ( virtual/libusb:0 ) + gphoto2? ( + media-libs/libgphoto2 + virtual/jpeg + ) + v4l? ( media-libs/libv4l )" + +DEPEND="${RDEPEND} + v4l? ( sys-kernel/linux-headers ) + doc? ( + virtual/latex-base + || ( dev-texlive/texlive-latexextra app-text/ptex ) + ) + >=sys-apps/sed-4" + +# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) +RDEPEND="${RDEPEND} + !<sys-fs/udev-114" + +# Could not access via ftp on 2006-07-20 +SRC_URI="http://alioth.debian.org/frs/download.php/3258/${P}.tar.gz + ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz + ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz" +# ftp://ftp.sane-project.org/pub/sane/${P}/${P}-i18n.patch" +SLOT="0" +LICENSE="GPL-2 public-domain" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" + +# the blank is intended - an empty string would result in building ALL backends. +BACKENDS=" " + +pkg_setup() { + enewgroup scanner + + use gphoto2 && BACKENDS="gphoto2" + use v4l && BACKENDS="${BACKENDS} v4l" + for backend in ${IUSE_SANE_BACKENDS}; do + if use "sane_backends_${backend}"; then + BACKENDS="${BACKENDS} ${backend}" + fi + done +} + +src_unpack() { + unpack ${A} + cd "${S}" + + cat >> backend/dll.conf.in <<-EOF + # Add support for the HP-specific backend. Needs net-print/hplip installed. + hpaio + EOF + #epatch "${DISTDIR}/${P}-i18n.patch" + #epatch "${FILESDIR}/xerox-grey.patch" +} + +src_compile() { + append-flags -fno-strict-aliasing + + myconf=$(use_enable usb libusb) + if ! use doc; then + myconf="${myconf} --disable-latex" + fi + if use sane_backends_mustek_pp; then + myconf="${myconf} --enable-parport-directio" + fi + if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then + myconf="${myconf} sane_cv_use_libieee1284=no" + fi + SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${BACKENDS}" econf \ + $(use_with gphoto2) \ + $(use_enable ipv6) \ + $(use_enable avahi) \ + ${myconf} + + emake VARTEXFONTS="${T}/fonts" || die + + if use usb; then + cd tools/hotplug + grep -v '^$' libsane.usermap > libsane.usermap.new + mv libsane.usermap.new libsane.usermap + fi +} + +src_install () { + make INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir=/usr/share/doc/${PF} + keepdir /var/lib/lock/sane + fowners root:scanner /var/lib/lock/sane + fperms g+w /var/lib/lock/sane + dodir /etc/env.d + if use usb; then + cd tools/hotplug + insinto /etc/hotplug/usb + exeinto /etc/hotplug/usb + doins libsane.usermap + doexe libusbscanner + newdoc README README.hotplug + echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb" + cd ../.. + fi + cd tools/udev + dodir /$(get_libdir)/udev/rules.d + insinto /$(get_libdir)/udev/rules.d + newins libsane.rules 41-libsane.rules + cd ../.. + dodoc NEWS AUTHORS ChangeLog* README README.linux + echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane +} diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild new file mode 100644 index 0000000..707f81c --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-9999.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild,v 1.2 2010/09/01 21:21:56 phosphan Exp $ + +EAPI="1" + +inherit eutils flag-o-matic git + +# gphoto and v4l are handled by their usual USE flags. +# The pint backend was disabled because I could not get it to compile. +# The mustek_usb2 backend would force us to use --enable-pthreads which is off +# by default for linux. Let's keep this one out until we find a way how to +# handle this cleanly. +IUSE_SANE_BACKENDS=" + abaton + agfafocus + apple + artec + artec_eplus48u + as6e + avision + bh + canon + canon630u + canon_dr + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc25 + dc210 + dc240 + dell1600n_net + dmc + epjitsu + epson + epson2 + fujitsu + genesys + gt68xx + hp + hp3500 + hp3900 + hp4200 + hp5400 + hp5590 + hpsj5s + hpljm1005 + hs2p + ibm + kodak + kvs1025 + leo + lexmark + ma1509 + matsushita + microtek + microtek2 + mustek + mustek_pp + mustek_usb + nec + net + niash + p5 + pie + pixma + plustek + plustek_pp + qcam + ricoh + rts8891 + s9036 + sceptre + sharp + sm3600 + sm3840 + snapscan + sp15c + st400 + stv680 + tamarack + teco1 + teco2 + teco3 + test + u12 + umax + umax_pp + umax1220u + xerox_mfp" + +IUSE="avahi usb gphoto2 ipv6 v4l doc" + +for backend in ${IUSE_SANE_BACKENDS}; do + IUSE="${IUSE} +sane_backends_${backend}" +done + +EGIT_REPO_URI="http://git.debian.org/git/sane/sane-backends.git" + +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" + +RDEPEND=" + sane_backends_dc210? ( >=media-libs/jpeg-6b ) + sane_backends_dc240? ( >=media-libs/jpeg-6b ) + sane_backends_dell1600n_net? ( >=media-libs/jpeg-6b ) + avahi? ( >=net-dns/avahi-0.6.24 ) + sane_backends_canon_pp? ( sys-libs/libieee1284 ) + sane_backends_hpsj5s? ( sys-libs/libieee1284 ) + sane_backends_mustek_pp? ( sys-libs/libieee1284 ) + usb? ( virtual/libusb:0 ) + gphoto2? ( + media-libs/libgphoto2 + >=media-libs/jpeg-6b + ) + v4l? ( media-libs/libv4l )" + +DEPEND="${RDEPEND} + v4l? ( sys-kernel/linux-headers ) + doc? ( + virtual/latex-base + || ( dev-texlive/texlive-latexextra app-text/tetex app-text/ptex ) + ) + >=sys-apps/sed-4" + +# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) +RDEPEND="${RDEPEND} + !<sys-fs/udev-114" + +# Could not access via ftp on 2006-07-20 +SRC_URI="" +SLOT="0" +LICENSE="GPL-2 public-domain" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# the blank is intended - an empty string would result in building ALL backends. +BACKENDS=" " + +pkg_setup() { + enewgroup scanner + + use gphoto2 && BACKENDS="gphoto2" + use v4l && BACKENDS="${BACKENDS} v4l" + for backend in ${IUSE_SANE_BACKENDS}; do + if use "sane_backends_${backend}"; then + BACKENDS="${BACKENDS} ${backend}" + fi + done +} + +#src_unpack() { +# unpack ${A} +# cd "${S}" +# +# cat >> backend/dll.conf.in <<-EOF +# # Add support for the HP-specific backend. Needs net-print/hplip installed. +# hpaio +# EOF +# epatch "${DISTDIR}/${P}-i18n.patch" +# epatch "${FILESDIR}/xerox-grey.patch" +#} + +src_compile() { + append-flags -fno-strict-aliasing + + myconf=$(use_enable usb libusb) + if ! use doc; then + myconf="${myconf} --disable-latex" + fi + if use sane_backends_mustek_pp; then + myconf="${myconf} --enable-parport-directio" + fi + if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then + myconf="${myconf} sane_cv_use_libieee1284=no" + fi + SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${BACKENDS}" econf \ + $(use_with gphoto2) \ + $(use_enable ipv6) \ + $(use_enable avahi) \ + ${myconf} || die "econf failed" + + emake VARTEXFONTS="${T}/fonts" || die + + if use usb; then + cd tools/hotplug + grep -v '^$' libsane.usermap > libsane.usermap.new + mv libsane.usermap.new libsane.usermap + fi +} + +src_install () { + make INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir=/usr/share/doc/${PF} + keepdir /var/lib/lock/sane + fowners root:scanner /var/lib/lock/sane + fperms g+w /var/lib/lock/sane + dodir /etc/env.d + if use usb; then + cd tools/hotplug + insinto /etc/hotplug/usb + exeinto /etc/hotplug/usb + doins libsane.usermap + doexe libusbscanner + newdoc README README.hotplug + echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb" + cd ../.. + fi + cd tools/udev + dodir /etc/udev/rules.d + insinto /etc/udev/rules.d + newins libsane.rules 41-libsane.rules + cd ../.. + dodoc NEWS AUTHORS ChangeLog* README README.linux + echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane +} |