reinit the tree, so we can have metadata

9 files changed, 381 insertions, 0 deletions

diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
new file mode 100644
index 000000000000..f5ee5ac6a9d0
--- /dev/null
+++ b/sci-electronics/xoscope/Manifest
@@ -0,0 +1,12 @@
+AUX xoscope-2.0-comedi_compile.patch 1068 SHA256 9130d6575f4c62981033f9be8ff55820ddbf20d2b495aab192fb27fc8ac3fe04 SHA512 00263be40f823610743fc69c74fb0ac69d58cc33bf21fde27f7d4f11923f7cae24138439706b1c478795e574d38f30f35f6e5dc955b3ca70ace829e00b432877 WHIRLPOOL 6e7de0fabc57f4d4f55b2a9ec3f6b7b2e4c8cb0eab057c0229b0a6d7372d8bee8d954cf0655dda49c5d7cb79b211066b2dc4c0f01f1ba197c613cb7d8190d770
+AUX xoscope-2.0-implicit_decls.patch 687 SHA256 957295eed4d31d331636b73360767e4c25b1f6fae0b23ebc4500d5b5286f84d3 SHA512 47e46ac1b2fa27a1b3378b65a0b5370045058d0d43a73a31f38ce01c3e0c551aa221e6dc2e2fbb8ff8c0263e5a31caa07adba8bdea7530d2af0196eebf0210b0 WHIRLPOOL 895689828c4b3348fd1877073edcbcb57bfa9b3530f20fca05d35e7d70f94edd4b33c2f268515b7771a43c47655a5802a27de4ec9d2d7ad40456ce36f51b80cb
+AUX xoscope-2.0-man_no_-Tutf8.patch 369 SHA256 b8d77bc99d37c7f5afdca3338bc41f9b8f3d8f169552ff74775e81713976340e SHA512 fcd9522fb8d45a565983d1da4cfdb9239cf2c5c994069ca2fa934fee9ec23d99b9e877bfdca5b0baf01f9722f7fdff791c99f468d088947961758fbb75bc2a0a WHIRLPOOL 224fa3e60fa5d4fad613114364601b0b1fa515dbcdd3c49667a8cf75bb3482511e448927f4b184edb92ff04f6ed84f385337af11167b5c13af7645bfb1a5788d
+AUX xoscope-2.0-remove_bundled_gtkdatabox.patch 6577 SHA256 2aa2284506ade1b21abe98ca86fd3d818ecd291105a49fdc12c7827133e89eb0 SHA512 1a64615e99cfd160d28d9e1da04a000fe538b52b770b77db6fcbd907306aa67172c6848edccb6467f2b2e008bd243fc2c12949c91087fc17deb7b9bbc3980b9a WHIRLPOOL 809e3c3ff27eec969bba1c93f25a57ad8c39a03d38b32574aaebbbcda7c2c044055d76efbcd74a8d0a2127090b871d5cd84248ec2c36bf6d106d955816adab1c
+AUX xoscope-2.1-man_no_-Tutf8.patch 392 SHA256 e0f201da33d99d5f1593b36596301821827cad15c51c501a5f93c2fa70a987c5 SHA512 aa1347e5e396f5735606e61cf90e1aabdffb7d6c1f3ebe6c778a7324d7a3c0b8a31e0b9ec4f380e14db336d82e0790c7d7f7dc197684c140de8822b9e5e4299b WHIRLPOOL 7ede1d9b45523fdbbd94c9b9dcefe24db2180e9f3e61dceef49ecf069293d24bcd3f3e8e5e7c29bd15fdaddbd739b388ba3accb5d313bd99e135d2306b42f5fb
+DIST xoscope-2.0.tgz 334875 SHA256 a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403 SHA512 8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70 WHIRLPOOL 4afd660cb05a9a70ce49a5553c4f08d5877f32a85adcf86ada1014d7d90c358817cdb6da7f4b2d08edfb406375848434f679ea976c15ad16bf3ca2b8691a944c
+DIST xoscope-2.1.tar.gz 302170 SHA256 ff14532ced6ac140064093e7aafaf6a032a50eb09f6b3608c45f81d00dc836ac SHA512 2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d WHIRLPOOL e8dc3e9b56e776431d3d4f6dc30865666d7dc5d3bb0df12ebec62018db040fbb2518023688502dce01a98a7139a23e5222f258a8481511832e9233eadcef00c7
+EBUILD xoscope-2.0.ebuild 799 SHA256 a4a859a3f891d4cbee1df48bf63f94ad4fda829467d829cd7900b5d9dd91151c SHA512 9242f5d321c33ed88e6e30aab6f8b5b05ea34e2cdcba82e164b16591b7b76e1c147543f6859490221faa0da2ceb46a41e6452869241150c9c7c992e3f95907dc WHIRLPOOL 1199bcca16fd0ed5143357585e5cac550b68fd6599280434ae3c7a758be3e626853002241e9c6ac398a0717841960748411401242c8d1203eff60f4ef6200583
+EBUILD xoscope-2.1.ebuild 647 SHA256 d293ebbcd06d8c9c21d1aaf02d2c0072b791cd3dddb7b27bdd798ddd701b795f SHA512 d5a829921f24e0ba12e0b590abec347444486b519777ab6f41c4812f56c84cd561414ae11ca6881dfade3877871c9b38bcf0d8d7899bec85f87e4c1a49e8d692 WHIRLPOOL 437569eadfa6cb39c5337b5d1c97a367017d5344cb46929f9c7f6c58c8a531da78160ed3a116d106f8cc775f6fad87c120f8a1e3d96059150275d1ef0062f2a1
+MISC ChangeLog 2831 SHA256 24c62683fe4ead3c3528d6cc3b6540ec0002491ac365b63a4c054ebb0392e0ca SHA512 e7ae16ea0bfa12a302f2473d3fb5388714f2d52cc05a3ee2a4163258df22bb1dd481c15f6d6b43e294fc7962637742f9a323b4e715a9f02983b9dca4159abd18 WHIRLPOOL dd87d74e889e4590f579271747028af7ba6044e1d30824b4ed96fe060f0fc51dcf7ce67eb89b2f386af280edcf6885a846239f553d45c42d7a076c98370762cc
+MISC ChangeLog-2015 990 SHA256 79dc1557eb415d349dd362819e7596bc34f88d10ff4a52cf6812b2ccb723bb3f SHA512 1b1bc2fc4c1e2da54cb9a461cdeaafa332d10c626b67be8775a3325fcce1d5fac77c9657a058f42fe638da0764903cfec576c593c1fde986a4a2b4dd6eb1fbb9 WHIRLPOOL 7994c658bffb7d20d6b30b69c0ff086a130533bd58152ffa7ee1f294b61b15a6a665a839c360a720afe3d232e34d1dacb0e889ef33fc1f3b94dac2267678f609
+MISC metadata.xml 450 SHA256 cb08e211feaf1abe30214565c8894a18fa123f97d9be5a65c35d1522bf7621ec SHA512 2bf87dde869f9a345497178fabb66199af88b6f5c046c380d23ac62a1862382676cc2aaed92ab4c35eb49e1e4d52d337dc06f62a2926b903550c017c4b20a2b7 WHIRLPOOL 07310a6d053d6dd9203186c91df873f023172de68b9fb25ac673f65e6afffe963da8c8fe9ffe1c0cc001f1dbaedf85d2c8e97d4247ea3cbd41568fdfeaf261a8
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch b/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
new file mode 100644
index 000000000000..75d3820dad81
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
@@ -0,0 +1,32 @@
+--- xoscope-2.0/comedi.c
++++ xoscope-2.0/comedi.c
+@@ -27,7 +27,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <sys/poll.h>
+-#include <asm/page.h>
++//#include <asm/page.h>
+ #include <comedilib.h>
+ #include "oscope.h"		/* program defaults */
+ #include "func.h"
+@@ -184,7 +184,9 @@
+      * avoid the bug.  This is the only reason we need <asm/page.h> in
+      * our include list.
+      */
+-    comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
++    //comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
++    comedi_bufsize = (comedi_bufsize + sysconf(_SC_PAGE_SIZE) - 1) &
++    (sysconf(_SC_PAGE_SIZE) - 1);
+     ret = comedi_set_buffer_size(comedi_dev, comedi_subdevice, comedi_bufsize);
+     if (ret < 0) {
+       comedi_error = comedi_errno();
+@@ -505,7 +507,7 @@
+     unsigned int chan;
+     int ret;
+ 
+-    ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0);
++    ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0, 1);
+ 
+     if (ret >= 0) {
+       chan = CR_PACK(4,0,AREF_DIFF);
+
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch b/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
new file mode 100644
index 000000000000..473243f2ec15
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
@@ -0,0 +1,29 @@
+--- xoscope-2.0/proscope.c
++++ xoscope-2.0/proscope.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include "proscope.h"
+ #include "oscope.h"
+--- xoscope-2.0/oscope.c
++++ xoscope-2.0/oscope.c
+@@ -408,7 +408,15 @@
+    */
+ 
+   displayed_samples = p->signal ? samples(p->signal->rate) : 0;
+-  max_samples = p->signal ? max(samples(p->signal->rate), p->signal->num) : 0;
++  if ( p->signal ) {
++    if ( samples(p->signal->rate) > p->signal->num ) {
++      max_samples = samples(p->signal->rate);
++    } else {
++      max_samples = p->signal->num;
++    }
++  } else {
++    max_samples = 0;
++  }
+ 
+   if (c >= 'A' && c <= 'Z') {
+     if (p->signal) {
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch
new file mode 100644
index 000000000000..5cba9546e91d
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch
@@ -0,0 +1,11 @@
+--- xoscope-2.0/acconfig.h
++++ xoscope-2.0/acconfig.h
+@@ -61,7 +61,7 @@
+    interactive response time as the X server becomes too busy */
+ 
+ /* bourne shell command for X11 Help ("man -Tutf8 xoscope 2>&1") */
+-#define HELPCOMMAND	"man -Tutf8 xoscope 2>&1"
++#define HELPCOMMAND	"man xoscope 2>&1"
+ 
+ /* default file name ("oscope.dat") */
+ #define FILENAME	"oscope.dat"
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch b/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch
new file mode 100644
index 000000000000..3ae541011b3b
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch
@@ -0,0 +1,205 @@
+--- xoscope-2.0/configure.in
++++ xoscope-2.0/configure.in
+@@ -17,7 +17,7 @@
+ 
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
+ 
+-#PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox)
++PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox)
+ #AC_CONFIG_SUBDIRS(gtkdatabox-0.6.0.0)
+ 
+ dnl Set PACKAGE_DATA_DIR in config.h.
+@@ -106,5 +106,4 @@
+ AC_OUTPUT([
+ operl
+ Makefile
+-gtkdatabox-0.6.0.0/gtk/Makefile
+ ])
+--- xoscope-2.0/Makefile.am
++++ xoscope-2.0/Makefile.am
+@@ -40,9 +40,6 @@
+ comedisrc =
+ endif
+ 
+-GTKDATABOX_CFLAGS = -I $(top_srcdir)/gtkdatabox-0.6.0.0/gtk
+-GTKDATABOX_LIBS = $(top_builddir)/gtkdatabox-0.6.0.0/gtk/libgtkdatabox.a
+-
+ # Some bit of explaination is needed here for GUI_LIB.  automake won't
+ # let us include source files in a subdirectory on a _SOURCES line,
+ # and we do want all the auto-magically generated glade stuff confined
+@@ -52,7 +49,6 @@
+ # trick used in things like comedi.c (see comments there) won't work
+ # for a library.  So we put .o files in.
+ 
+-SUBDIRS = gtkdatabox-0.6.0.0/gtk
+ INCLUDES = @GTK_CFLAGS@ $(GTKDATABOX_CFLAGS)
+ GUI_LIB = callbacks.c callbacks.h interface.c interface.h support.c support.h
+ 
+--- xoscope-2.0/Makefile.in
++++ xoscope-2.0/Makefile.in
+@@ -232,8 +232,6 @@
+ 
+ @COMEDI_FALSE@comedisrc = 
+ @COMEDI_TRUE@comedisrc = comedi.c
+-GTKDATABOX_CFLAGS = -I $(top_srcdir)/gtkdatabox-0.6.0.0/gtk
+-GTKDATABOX_LIBS = $(top_builddir)/gtkdatabox-0.6.0.0/gtk/libgtkdatabox.a
+ 
+ # Some bit of explaination is needed here for GUI_LIB.  automake won't
+ # let us include source files in a subdirectory on a _SOURCES line,
+@@ -243,7 +241,6 @@
+ # they get built as one, because then the weak attribute override
+ # trick used in things like comedi.c (see comments there) won't work
+ # for a library.  So we put .o files in.
+-SUBDIRS = gtkdatabox-0.6.0.0/gtk
+ INCLUDES = @GTK_CFLAGS@ $(GTKDATABOX_CFLAGS)
+ INCLUDES = @GTK_CFLAGS@
+ GUI_LIB = callbacks.c callbacks.h interface.c interface.h support.c support.h
+--- xoscope-2.0/display.c
++++ xoscope-2.0/display.c
+@@ -27,7 +27,7 @@
+ #include <gtkdatabox_points.h>
+ #include <gtkdatabox_lines.h>
+ #include <gtkdatabox_grid.h>
+-#include <gtkdatabox_marker.h>
++#include <gtkdatabox_markers.h>
+ 
+ extern GtkWidget *databox;
+ 
+--- xoscope-2.0/display.c
++++ xoscope-2.0/display.c
+@@ -56,7 +56,7 @@
+ gboolean clear_message_callback(gpointer ignored)
+ {
+   gtk_databox_graph_remove (GTK_DATABOX(databox), databox_message);
+-  gtk_databox_redraw (GTK_DATABOX (databox));
++  gtk_widget_queue_draw (databox);
+   return FALSE;
+ }
+ 
+@@ -66,15 +66,15 @@
+   if (databox_message == NULL) {
+     GdkColor gcolor;
+     gcolor.red = gcolor.green = gcolor.blue = 65535;
+-    databox_message = gtk_databox_marker_new(1, &databox_message_X,
++    databox_message = gtk_databox_markers_new(1, &databox_message_X,
+ 					     &databox_message_Y, &gcolor, 0,
+-					     GTK_DATABOX_MARKER_NONE);
++					     GTK_DATABOX_MARKERS_NONE);
+   }
+ 
+-  gtk_databox_marker_set_label(GTK_DATABOX_MARKER(databox_message), 0,
+-			       GTK_DATABOX_TEXT_N, message, FALSE);
++  gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(databox_message), 0,
++			       GTK_DATABOX_MARKERS_TEXT_N, message, FALSE);
+   gtk_databox_graph_add (GTK_DATABOX(databox), databox_message);
+-  gtk_databox_redraw (GTK_DATABOX (databox));
++  gtk_widget_queue_draw (databox);
+ 
+   g_timeout_add (2000, clear_message_callback, NULL);
+ }
+@@ -620,10 +620,10 @@
+   graticule_minor_graph = gtk_databox_grid_new (9, 9, &gcolor, 1);
+   graticule_major_graph = gtk_databox_grid_new (1, 1, &gcolor, 1);
+ 
+-  gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_major_graph),
+-				  GTK_DATABOX_GRID_SOLID_LINES);
+-  gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_minor_graph),
+-				  GTK_DATABOX_GRID_DOTTED_LINES);
++  //gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_major_graph),
++  //				  GTK_DATABOX_GRID_SOLID_LINES);
++  //gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_minor_graph),
++  //				  GTK_DATABOX_GRID_DOTTED_LINES);
+ 
+   recompute_graticule();
+ }
+@@ -675,7 +675,7 @@
+ 
+ void configure_databox(void)
+ {
+-   GtkDataboxValue topleft, bottomright;
++   GtkDataboxValueRectangle rect;
+    gfloat upper_time_limit;
+    int j;
+ 
+@@ -723,24 +723,26 @@
+ 
+    /* Now set the total canvas size of the databox */
+ 
+-   topleft.x = 0;
+-   topleft.y = 1;
++   rect.x1 = 0;
++   rect.y1 = 1;
+ 
+-   bottomright.x = total_horizontal_divisions
++   rect.x2 = total_horizontal_divisions
+      * 0.001 * (gfloat) scope.div / scope.scale;
+-   bottomright.y = -1;
++   rect.y2 = -1;
+ 
+-   gtk_databox_set_canvas(GTK_DATABOX(databox), topleft, bottomright);
++   gtk_databox_set_total_limits(GTK_DATABOX(databox), 
++     rect.x1, rect.x2, rect.y1, rect.y2);
+ 
+    /* A slight adjustment gets us our visible area.  Note that this
+     * call also resets the databox viewport to its left most position.
+     */
+ 
+-   bottomright.x = 10 * 0.001 * (gfloat) scope.div / scope.scale;
+-   gtk_databox_set_visible_canvas(GTK_DATABOX(databox), topleft, bottomright);
++   rect.x2 = 10 * 0.001 * (gfloat) scope.div / scope.scale;
++   gtk_databox_set_visible_limits(GTK_DATABOX(databox), 
++     rect.x1, rect.x2, rect.y1, rect.y2);
+ 
+    /* Temporary message is always centered on screen */
+-   databox_message_X = bottomright.x / 2;
++   databox_message_X = rect.x2 / 2;
+ 
+    /* Decide if we need a scrollbar or not */
+ 
+@@ -1208,7 +1210,7 @@
+     draw_graticule();
+   }
+ 
+-  gtk_databox_redraw (GTK_DATABOX (databox));
++  gtk_widget_queue_draw (databox);
+ }
+ 
+ /* animate() - get and plot some data
+--- xoscope-2.0/gr_gtk.c
++++ xoscope-2.0/gr_gtk.c
+@@ -1049,7 +1049,7 @@
+   l = p->signal->delay * num / 10000;
+ 
+   if (scope.curs) {
+-#if 1
++#if 0
+     GtkDataboxCoord coord;
+     GtkDataboxValue value;
+     coord.x = event->x;
+@@ -1057,7 +1057,7 @@
+     value = gtk_databox_value_from_coord (GTK_DATABOX(databox), coord);
+     x = value.x;
+ #else
+-    x = gtk_databox_pixel_to_value_x (databox, event->x);
++    x = gtk_databox_pixel_to_value_x (GTK_DATABOX(databox), event->x);
+ #endif
+     cursor = rintf((x - l) / num) + 1;
+ #if 0
+@@ -1205,7 +1205,7 @@
+ 
+   glade_window = create_main_window();
+ 
+-  setup_help_text(glade_window);
++  //setup_help_text(glade_window);
+ 
+ #if 0
+   gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+@@ -1217,7 +1217,7 @@
+   gtk_box_reorder_child(GTK_BOX(LU("vbox1")), menubar, 0);
+   gtk_widget_show(menubar);
+ 
+-  gtk_databox_set_hadjustment (GTK_DATABOX (databox),
++  gtk_databox_set_adjustment_x (GTK_DATABOX (databox),
+ 			       gtk_range_get_adjustment (GTK_RANGE (LU("databox_hscrollbar"))));
+ 
+   gtk_widget_show(glade_window);
diff --git a/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch
new file mode 100644
index 000000000000..f00cd8c2545a
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch
@@ -0,0 +1,11 @@
+--- xoscope-2.1/configure.ac
++++ xoscope-2.1/configure.ac
+@@ -132,7 +132,7 @@
+ 
+ AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on libsx version])
+ 
+-AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11 help])
++AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help])
+ 
+ AC_DEFINE(FILENAME, "oscope.dat", [default file name])
+ 
diff --git a/sci-electronics/xoscope/metadata.xml b/sci-electronics/xoscope/metadata.xml
new file mode 100644
index 000000000000..c0bad508a585
--- /dev/null
+++ b/sci-electronics/xoscope/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xoscope</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-electronics/xoscope/xoscope-2.0.ebuild b/sci-electronics/xoscope/xoscope-2.0.ebuild
new file mode 100644
index 000000000000..8a8fe1e077b8
--- /dev/null
+++ b/sci-electronics/xoscope/xoscope-2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Soundcard Oscilloscope for X"
+HOMEPAGE="http://xoscope.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtkdatabox
+	virtual/man"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~!SND_PCM_OSS"
+ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input via /dev/dsp"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-remove_bundled_gtkdatabox.patch \
+		"${FILESDIR}"/${P}-man_no_-Tutf8.patch \
+		"${FILESDIR}"/${P}-implicit_decls.patch \
+		"${FILESDIR}"/${P}-comedi_compile.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	emake -j1
+}
diff --git a/sci-electronics/xoscope/xoscope-2.1.ebuild b/sci-electronics/xoscope/xoscope-2.1.ebuild
new file mode 100644
index 000000000000..5b730bc12bc8
--- /dev/null
+++ b/sci-electronics/xoscope/xoscope-2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Soundcard Oscilloscope for X"
+HOMEPAGE="http://xoscope.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtkdatabox
+	virtual/man"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~!SND_PCM_OSS"
+ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input via /dev/dsp"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch
+
+	eautoreconf
+}