remove some no longer used patches for thoggen

Package-Manager: portage-2.1.2_pre2-r3

3 files changed, 10 insertions, 368 deletions

diff --git a/media-video/thoggen/Manifest b/media-video/thoggen/Manifest
index 490239831ead..18d4ef593f8b 100644
--- a/media-video/thoggen/Manifest
+++ b/media-video/thoggen/Manifest
@@ -1,11 +1,6 @@
-AUX thoggen-0.3-new-dbus-hal.patch 13464 RMD160 823be193ea58678b0dce1e70a2f0c6fcbb3f05d9 SHA1 59bc8df80faa84528cfb094eff6dff9d9a5595b2 SHA256 1e80b866bf75b83b0e92953ee0f8d676e0988795a2dfcab4076588c81f94bbe4
-MD5 214c2419992cfee26543fedc1e4711ea files/thoggen-0.3-new-dbus-hal.patch 13464
-RMD160 823be193ea58678b0dce1e70a2f0c6fcbb3f05d9 files/thoggen-0.3-new-dbus-hal.patch 13464
-SHA256 1e80b866bf75b83b0e92953ee0f8d676e0988795a2dfcab4076588c81f94bbe4 files/thoggen-0.3-new-dbus-hal.patch 13464
-AUX thoggen-0.4.1-libdvdread.diff 327 RMD160 3bdb60ef5ff5e2f4630e2d08dfec36e7d58341bf SHA1 81401742c0a2a16ee6c1f9c1db612071c1ffd493 SHA256 7e58076c27b2bbb5d45931fdc7d158c3fa8c7f2685ea443c8df82dba96871900
-MD5 fe6082938dc6286a6db60274772321fe files/thoggen-0.4.1-libdvdread.diff 327
-RMD160 3bdb60ef5ff5e2f4630e2d08dfec36e7d58341bf files/thoggen-0.4.1-libdvdread.diff 327
-SHA256 7e58076c27b2bbb5d45931fdc7d158c3fa8c7f2685ea443c8df82dba96871900 files/thoggen-0.4.1-libdvdread.diff 327
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST thoggen-0.4.2.tar.gz 775405 RMD160 bc0980882e3989f1af31e0ca3d49bdcfbec2a9fb SHA256 b58808d6281d85e477dac7d27dd5e57bd1392196be5bb6664e607b511349f359
 EBUILD thoggen-0.4.2.ebuild 1228 RMD160 a66c52331c56decbc7efba1fb2cf09f34dcbff34 SHA1 cd993b2d1bad39b56a304578350e229680f14cf9 SHA256 d78b914159b7b6182915c8b5cf96d34ee65fb964b8c53abdcffb145865f4f356
 MD5 09531175ba3fc32e7ddb686dcaa92f0e thoggen-0.4.2.ebuild 1228
@@ -22,3 +17,10 @@ SHA256 c76952c442b16a3d2efe40e95e84f1110ec9b13775882012b30a25ca3b063ada metadata
 MD5 b8a78a2310e332dc39a7a1880f517e3a files/digest-thoggen-0.4.2 241
 RMD160 a76ea99fa0f8519440a63c69f8bb357390d90257 files/digest-thoggen-0.4.2 241
 SHA256 3395d544992208b3dba9ff383b459893e304d70527d16917b2e7b5ed897621e4 files/digest-thoggen-0.4.2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFJtWLr2QksT29OyARAn8zAKCiz+R0zMfxDtNI/3HUizmr42CH9ACfY18q
+nx3tvHybIS5a/4QbLCd8O58=
+=qyyn
+-----END PGP SIGNATURE-----
diff --git a/media-video/thoggen/files/thoggen-0.3-new-dbus-hal.patch b/media-video/thoggen/files/thoggen-0.3-new-dbus-hal.patch
deleted file mode 100644
index 07f2d2453a08..000000000000
--- a/media-video/thoggen/files/thoggen-0.3-new-dbus-hal.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-Index: src/th-device-pool.c
-===================================================================
-RCS file: /cvsroot/thoggen/thoggen/src/th-device-pool.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -p -r1.4 -r1.5
---- src/th-device-pool.c	6 Jan 2005 20:23:47 -0000	1.4
-+++ src/th-device-pool.c	4 Apr 2005 13:06:20 -0000	1.5
-@@ -88,23 +88,33 @@ static void           dp_hal_device_prop
-                                                   dbus_bool_t    is_removed, 
-                                                   dbus_bool_t    is_added);
- 
-+#ifndef USE_NEW_DBUS_HAL_API
-+
- static void           dp_hal_device_condition_cb (LibHalContext *ctx, 
-                                                   const char    *udi, 
-                                                   const char    *cond_name, 
-                                                   DBusMessage   *msg);
-+#else
-+
-+static void           dp_hal_device_condition_cb (LibHalContext *ctx, 
-+                                                  const char    *udi, 
-+                                                  const char    *cond_name, 
-+                                                  const char    *cond_detail);
-+
-+#endif
- 
- /* variables */
- 
- static GObjectClass  *dp_parent_class;          /* NULL */
- 
- 
--
- /***************************************************************************
-  *
-  *   disc_drive_hal_cb_funcs
-  *
-  ***************************************************************************/
- 
-+#ifndef USE_NEW_DBUS_HAL_API
- static const LibHalFunctions disc_drive_hal_cb_funcs = 
- {
- 	dp_hal_main_loop_hook_cb,  /* main loop integration    */
-@@ -115,6 +125,7 @@ static const LibHalFunctions disc_drive_
- 	dp_hal_device_prop_mod_cb, /* device property modified */
- 	dp_hal_device_condition_cb /* device condiiton         */
- };
-+#endif /* USE_NEW_DBUS_HAL_API */
- 
- /***************************************************************************
-  *
-@@ -194,8 +205,38 @@ device_pool_instance_init (ThDevicePool 
- 
- 	pool->priv = g_new0 (ThDevicePoolPrivate, 1);
- 
-+#ifdef USE_NEW_DBUS_HAL_API
-+	new_hal_ctx = libhal_ctx_new();
-+	libhal_ctx_set_cache (new_hal_ctx, TRUE);
-+	libhal_ctx_set_device_added (new_hal_ctx, dp_hal_device_added_cb);
-+	libhal_ctx_set_device_removed (new_hal_ctx, dp_hal_device_removed_cb);
-+	libhal_ctx_set_device_new_capability (new_hal_ctx, dp_hal_device_new_cap_cb);
-+	libhal_ctx_set_device_lost_capability (new_hal_ctx, dp_hal_device_lost_cap_cb);
-+	libhal_ctx_set_device_property_modified (new_hal_ctx, dp_hal_device_prop_mod_cb);
-+	libhal_ctx_set_device_condition (new_hal_ctx, dp_hal_device_condition_cb);
-+
-+	{
-+		DBusConnection *conn = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
-+		if (conn == NULL)
-+		{
-+			g_warning ("dbus_bus_get(DBUS_BUS_SYSTEM) failed at %s!\n", G_STRLOC);
-+		}
-+		else
-+		{
-+			libhal_ctx_set_dbus_connection (new_hal_ctx, conn);
-+			dp_hal_main_loop_hook_cb (new_hal_ctx, conn);
-+		}
-+	}
-+
-+	if (!libhal_ctx_init (new_hal_ctx, NULL))
-+		g_warning ("libhal_ctx_init() failed at %s!\n", G_STRLOC);
-+
-+#else
-+
- 	new_hal_ctx = hal_initialize (&disc_drive_hal_cb_funcs, TRUE);
- 
-+#endif /* USE_NEW_DBUS_HAL_API */
-+
- 
- 	/* we will get a NULL context if libhal cannot connect
- 	 *  to the dbus message bus. we will get a valid context
-@@ -236,8 +277,14 @@ device_pool_finalize (GObject *object)
- 
- 	if (pool->priv->hal_ctx)
- 	{
-+#ifndef USE_NEW_DBUS_HAL_API
- 		if (hal_shutdown (pool->priv->hal_ctx) != 0)
--			g_printerr ("ThDevicePool: hal_shutdown() problem!?\n");
-+			g_printerr ("ThDevicePool: hal_shutdown() problem!\n");
-+#else
-+		if (!libhal_ctx_shutdown (pool->priv->hal_ctx, NULL))
-+			g_printerr ("ThDevicePool: libhal_ctx_shutdown() problem!\n");
-+		libhal_ctx_free (pool->priv->hal_ctx);
-+#endif
- 	}
- 	
- 	for (l = pool->priv->trackers;  l;  l = l->next)
-@@ -312,7 +359,34 @@ dp_reconnect_to_hal_cb (ThDevicePool *po
- 
- 	g_message ("Trying to reconnect to HAL...");
- 	
-+#ifdef USE_NEW_DBUS_HAL_API
-+	new_hal_ctx = libhal_ctx_new();
-+	libhal_ctx_set_cache (new_hal_ctx, TRUE);
-+	libhal_ctx_set_device_added (new_hal_ctx, dp_hal_device_added_cb);
-+	libhal_ctx_set_device_removed (new_hal_ctx, dp_hal_device_removed_cb);
-+	libhal_ctx_set_device_new_capability (new_hal_ctx, dp_hal_device_new_cap_cb);
-+	libhal_ctx_set_device_lost_capability (new_hal_ctx, dp_hal_device_lost_cap_cb);
-+	libhal_ctx_set_device_property_modified (new_hal_ctx, dp_hal_device_prop_mod_cb);
-+	libhal_ctx_set_device_condition (new_hal_ctx, dp_hal_device_condition_cb);
-+
-+	{
-+		DBusConnection *conn = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
-+		if (conn == NULL)
-+		{
-+			g_warning ("dbus_bus_get(DBUS_BUS_SYSTEM) failed at %s!\n", G_STRLOC);
-+		}
-+		else
-+		{
-+			libhal_ctx_set_dbus_connection (new_hal_ctx, conn);
-+			dp_hal_main_loop_hook_cb (new_hal_ctx, conn);
-+		}
-+	}
-+
-+	if (!libhal_ctx_init (new_hal_ctx, NULL))
-+		g_warning ("libhal_ctx_init() failed at %s!\n", G_STRLOC);
-+#else
- 	new_hal_ctx = hal_initialize (&disc_drive_hal_cb_funcs, TRUE);
-+#endif
- 
- 	if (new_hal_ctx) 
- 	{
-@@ -517,6 +591,8 @@ dp_hal_device_prop_mod_cb (LibHalContext
-  *
-  ***************************************************************************/
- 
-+#ifndef USE_NEW_DBUS_HAL_API
-+
- static void
- dp_hal_device_condition_cb (LibHalContext *ctx, const char *udi, const char *cond_name, DBusMessage *msg)
- {
-@@ -534,6 +610,27 @@ dp_hal_device_condition_cb (LibHalContex
- 	}
- }
- 
-+#else /* USE_NEW_DBUS_HAL_API */
-+
-+static void
-+dp_hal_device_condition_cb (LibHalContext *ctx, const char *udi, const char *cond_name, const char *msg_detail)
-+{
-+	ThDevicePool *pool; 
-+	GList        *l;
-+	
-+	pool = hal_ctx_get_device_pool (ctx);
-+	g_return_if_fail (TH_IS_DEVICE_POOL (pool));
-+	
-+	for (l = pool->priv->trackers;  l;  l = l->next)
-+	{
-+		ThDeviceTracker *tracker = TH_DEVICE_TRACKER (l->data);
-+	
-+		th_device_tracker_dev_condition (tracker, udi, cond_name, msg_detail);
-+	}
-+}
-+
-+#endif /* USE_NEW_DBUS_HAL_API */
-+
- /***************************************************************************
-  *
-  *   device_pool_device_is_volume
-Index: src/th-device-tracker.c
-===================================================================
-RCS file: /cvsroot/thoggen/thoggen/src/th-device-tracker.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -r1.1.1.1 -r1.2
---- src/th-device-tracker.c	25 Nov 2004 18:06:32 -0000	1.1.1.1
-+++ src/th-device-tracker.c	4 Apr 2005 13:06:21 -0000	1.2
-@@ -196,6 +196,8 @@ th_device_tracker_prop_mod (ThDeviceTrac
-  *
-  ***************************************************************************/
- 
-+#ifndef USE_NEW_DBUS_HAL_API
-+
- void  
- th_device_tracker_dev_condition (ThDeviceTracker *tracker, 
-                                  const gchar     *udi, 
-@@ -211,4 +213,21 @@ th_device_tracker_dev_condition (ThDevic
- 		TH_DEVICE_TRACKER_GET_IFACE (tracker)->dev_condition (tracker, udi, cond_name, msg);
- }
- 
-+#else
-+
-+void  
-+th_device_tracker_dev_condition (ThDeviceTracker *tracker, 
-+                                 const gchar     *udi, 
-+                                 const gchar     *cond_name,
-+                                 const gchar     *cond_detail)
-+{
-+	g_return_if_fail (TH_IS_DEVICE_TRACKER (tracker));
-+	g_return_if_fail (udi != NULL);
-+	g_return_if_fail (cond_name != NULL);
-+
-+	if (TH_DEVICE_TRACKER_GET_IFACE (tracker)->dev_condition != NULL)
-+		TH_DEVICE_TRACKER_GET_IFACE (tracker)->dev_condition (tracker, udi, cond_name, cond_detail);
-+}
-+
-+#endif /* USE_NEW_DBUS_HAL_API */
- 
-Index: src/th-device-tracker.h
-===================================================================
-RCS file: /cvsroot/thoggen/thoggen/src/th-device-tracker.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -r1.1.1.1 -r1.2
---- src/th-device-tracker.h	25 Nov 2004 18:06:32 -0000	1.1.1.1
-+++ src/th-device-tracker.h	4 Apr 2005 13:06:21 -0000	1.2
-@@ -21,6 +21,39 @@
- #include <libhal.h>
- #include <glib-object.h>
- 
-+#include <dbus/dbus-glib-lowlevel.h>
-+/* dbus-glib >= 0.30 */
-+#ifdef DBUS_TYPE_PENDING_CALL
-+# define USE_NEW_DBUS_HAL_API
-+# warning ****************************************************************
-+# warning *
-+# warning *  It seems like you are using dbus >= 0.30 and hal >= 0.5.0
-+# warning *
-+# warning *  Please be advised that this code has not been tested with
-+# warning *   this configuration yet, it has just been fixed to compile.
-+# warning *
-+# warning *  Please let me know whether DVD drive detection works on
-+# warning *   your system, and please do send the log as well (so I
-+# warning *   can see whether the drives were actually detected via
-+# warning *   HAL or using the backup methods). Thanks!
-+# warning *
-+# warning ****************************************************************
-+#endif
-+
-+#ifdef USE_NEW_DBUS_HAL_API
-+# define hal_ctx_get_user_data(ctx)                  libhal_ctx_get_user_data(ctx)
-+# define hal_ctx_set_user_data(ctx,user_data)        libhal_ctx_set_user_data(ctx,user_data)
-+# define hal_device_exists(ctx,udi)                  libhal_device_exists(ctx,udi,NULL)
-+# define hal_device_property_exists(ctx,udi,key)     libhal_device_property_exists(ctx,udi,key,NULL)
-+# define hal_device_get_property_string(ctx,udi,key) libhal_device_get_property_string(ctx,udi,key,NULL)
-+# define hal_device_get_property_uint64(ctx,udi,key) libhal_device_get_property_uint64(ctx,udi,key,NULL)
-+# define hal_device_get_property_bool(ctx,udi,key)   libhal_device_get_property_bool(ctx,udi,key,NULL)
-+# define hal_free_string(s)                          libhal_free_string(s)
-+# define hal_free_string_array(str_arr)              libhal_free_string_array(str_arr)
-+# define hal_get_all_devices(ctx,p_num_devices)      libhal_get_all_devices(ctx,p_num_devices,NULL)
-+# define DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL        DBUS_INTERFACE_LOCAL
-+#endif
-+
- #define TH_TYPE_DEVICE_TRACKER            (th_device_tracker_get_type ())
- #define TH_DEVICE_TRACKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TH_TYPE_DEVICE_TRACKER, ThDeviceTracker))
- #define TH_IS_DEVICE_TRACKER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TH_TYPE_DEVICE_TRACKER))
-@@ -50,10 +83,20 @@ struct _ThDeviceTrackerIface
- 	                                 gboolean         is_removed, 
- 	                                 gboolean         is_added);
- 	
-+#ifndef USE_NEW_DBUS_HAL_API
-+
- 	void          (*dev_condition)  (ThDeviceTracker *tracker, 
- 	                                 const gchar     *udi, 
- 	                                 const gchar     *cond_name,
- 	                                 DBusMessage     *msg);
-+#else
-+
-+	void          (*dev_condition)  (ThDeviceTracker *tracker, 
-+	                                 const gchar     *udi, 
-+	                                 const gchar     *cond_name,
-+	                                 const gchar     *cond_detail);
-+
-+#endif /* USE_NEW_DBUS_HAL_API */
- };
- 
- GType th_device_tracker_get_type       (void) G_GNUC_CONST;
-@@ -81,10 +124,20 @@ void  th_device_tracker_prop_mod       (
- 	                                      gboolean         is_removed, 
- 	                                      gboolean         is_added);
- 	
-+#ifndef USE_NEW_DBUS_HAL_API
-+
- void  th_device_tracker_dev_condition  (ThDeviceTracker *tracker, 
- 	                                      const gchar     *udi, 
- 	                                      const gchar     *cond_name,
- 	                                      DBusMessage     *msg);
-+#else
-+
-+void  th_device_tracker_dev_condition  (ThDeviceTracker *tracker, 
-+	                                      const gchar     *udi, 
-+	                                      const gchar     *cond_name,
-+	                                      const gchar     *cond_detail);
-+
-+#endif /* USE_NEW_DBUS_HAL_API */
- 
- #endif /* _th_device_tracker_h_included_ */
- 
-Index: src/th-disc-drive-pool.c
-===================================================================
-RCS file: /cvsroot/thoggen/thoggen/src/th-disc-drive-pool.c,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -p -r1.11 -r1.12
---- src/th-disc-drive-pool.c	16 Mar 2005 16:00:23 -0000	1.11
-+++ src/th-disc-drive-pool.c	4 Apr 2005 13:06:21 -0000	1.12
-@@ -119,11 +119,21 @@ static void           disc_pool_device_p
-                                                   gboolean         is_removed, 
-                                                   gboolean         is_added);
- 
-+#ifndef USE_NEW_DBUS_HAL_API
-+
- static void           disc_pool_device_condition (ThDeviceTracker *tracker,
-                                                   const char      *udi, 
-                                                   const char      *cond_name, 
-                                                   DBusMessage     *msg);
- 
-+#else
-+
-+static void           disc_pool_device_condition (ThDeviceTracker *tracker,
-+                                                  const char      *udi, 
-+                                                  const char      *cond_name, 
-+                                                  const gchar     *cond_detail);
-+#endif
-+
- /* variables */
- 
- static guint          ddp_signals[NUM_SIGNALS];  /* all 0 */
-@@ -892,7 +902,11 @@ static void
- disc_pool_device_condition (ThDeviceTracker *tracker, 
-                             const gchar     *udi, 
-                             const gchar     *cond_name, 
-+#ifndef USE_NEW_DBUS_HAL_API
-                             DBusMessage     *msg)
-+#else
-+                            const gchar     *cond_detail)
-+#endif
- {
- 	ThDiscDrivePool *disc_pool;
- 
diff --git a/media-video/thoggen/files/thoggen-0.4.1-libdvdread.diff b/media-video/thoggen/files/thoggen-0.4.1-libdvdread.diff
deleted file mode 100644
index 5acfe0e1779f..000000000000
--- a/media-video/thoggen/files/thoggen-0.4.1-libdvdread.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- thoggen-0.4.1/src/th-disc-drive.c.orig	2006-04-01 15:09:20.196382000 +0200
-+++ thoggen-0.4.1/src/th-disc-drive.c	2006-04-01 15:09:37.701476000 +0200
-@@ -24,6 +24,8 @@
- 

- #include <glib/gi18n.h>

- 

-+#include <stdint.h>

-+

- #include <dvdread/dvd_reader.h>

- #include <dvdread/ifo_types.h>

- #include <dvdread/ifo_read.h>