Fixed bad installation for docs in 2.2.1 (#139812), added docbook-sgml-dtd-4.2 to deps in attempt to fix doc problems (#100660)(#139812), added patch to fix minor error in docgen for 2.1.6 (#134945)

Package-Manager: portage-2.1-r1

11 files changed, 0 insertions, 503 deletions

diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4
deleted file mode 100644
index 9244e6b04166..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a201650482bbc2edbd948449cf4d3f5a libgphoto2-2.1.4.tar.bz2 1819325
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.5 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.5
deleted file mode 100644
index aaa0e0f8416b..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 210844f0d88f58842917af6eaff06382 libgphoto2-2.1.5.tar.gz 2946757
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6
deleted file mode 100644
index 7f06b915ed0b..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1938cbd9718595fd419907bf2f7c3195 libgphoto2-2.1.6.tar.gz 3205731
-RMD160 ef32357d9722a69d20a02098bd30c13165c27e6a libgphoto2-2.1.6.tar.gz 3205731
-SHA256 f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80 libgphoto2-2.1.6.tar.gz 3205731
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r2 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r2
deleted file mode 100644
index 7f06b915ed0b..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1938cbd9718595fd419907bf2f7c3195 libgphoto2-2.1.6.tar.gz 3205731
-RMD160 ef32357d9722a69d20a02098bd30c13165c27e6a libgphoto2-2.1.6.tar.gz 3205731
-SHA256 f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80 libgphoto2-2.1.6.tar.gz 3205731
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.2.0 b/media-libs/libgphoto2/files/digest-libgphoto2-2.2.0
deleted file mode 100644
index eb7882440e68..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 33aca2d04917287472424fe73694cd3d libgphoto2-2.2.0.tar.gz 4473345
-RMD160 119ae418622ef94d1d56830299b30fa350b95425 libgphoto2-2.2.0.tar.gz 4473345
-SHA256 6de6a26a8c47c81af587240f9c0b7b7378574e1b5a86e579048229bf96dcbb84 libgphoto2-2.2.0.tar.gz 4473345
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.1-norpm.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.1-norpm.patch
deleted file mode 100644
index 93e10233cfa4..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.1.1-norpm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libgphoto2-2.1.1/configure	2002-12-01 21:46:42.000000000 +0000
-+++ libgphoto2-2.1.1/configure	2003-08-18 17:32:26.000000000 +0100
-@@ -13865,14 +13865,9 @@
- # packages we're going to build will depend on libusb and libusb-devel
- # RPM packages or not.
- 
--
--if rpm -q libusb-devel > /dev/null 2>&1; then
-+# remove rpm -q test to avoid breaking sandbox
-   RPM_LIBUSB_DEVEL_TRUE=
-   RPM_LIBUSB_DEVEL_FALSE='#'
--else
--  RPM_LIBUSB_DEVEL_TRUE='#'
--  RPM_LIBUSB_DEVEL_FALSE=
--fi
- 
- 
- 	# effective_target has to be determined in advance
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch
deleted file mode 100644
index 3b24e3b54299..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -r -u libgphoto2-2.1.2.orig/camlibs/canon/canon.c libgphoto2-2.1.2/camlibs/canon/canon.c
---- libgphoto2-2.1.2.orig/camlibs/canon/canon.c	2003-08-10 13:51:13.000000000 -0500
-+++ libgphoto2-2.1.2/camlibs/canon/canon.c	2003-10-12 11:21:10.000000000 -0500
-@@ -112,7 +112,7 @@
- 	{"Canon:PowerShot A20",		CANON_PS_A20,		0x04A9, 0x304E, CAP_SUP, S10M, S32K, NULL},
- 	{"Canon:PowerShot A10",		CANON_PS_A10,		0x04A9, 0x304F, CAP_SUP, S10M, S32K, NULL},
- 	/* Mac OS includes this as a valid ID; don't know which camera model --swestin */
--	/*{"Canon:PowerShot ??",		CANON_PS_A10,		0x04A9, 0x3050, CAP_SUP, S10M, S32K, NULL},*/
-+	{"Canon:PowerShot unknown 1",	CANON_PS_UNK1,		0x04A9, 0x3050, CAP_SUP, S10M, S32K, NULL},
- 	/* Canon IXY DIGITAL 200 here? */
- 	{"Canon:PowerShot S110",	CANON_PS_S100,		0x04A9, 0x3051, CAP_SUP, S10M, S32K, NULL},
- 	{"Canon:DIGITAL IXUS v",	CANON_PS_S100,		0x04A9, 0x3052, CAP_SUP, S10M, S32K, NULL},
-@@ -122,7 +122,7 @@
- 	{"Canon:PowerShot A40",		CANON_PS_A40,		0x04A9, 0x3058, CAP_SUP, S10M, S32K, NULL},
- 	{"Canon:PowerShot A30",		CANON_PS_A30,		0x04A9,	0x3059, CAP_SUP, S10M, S32K, NULL},
- 	/* 305c is in MacOS Info.plist, but I don't know what it is --swestin. */
--	/*{"Canon:PowerShot ????",		CANON_PS_A30,		0x04A9,	0x305c, CAP_SUP, S10M, S32K, NULL},*/
-+	{"Canon:PowerShot unknown 2",	CANON_PS_UNK2,		0x04A9,	0x305c, CAP_SUP, S10M, S32K, NULL},
- 	{"Canon:EOS D60",		CANON_EOS_D60,		0x04A9, 0x3060, CAP_SUP, S10M, S32K, NULL},
- 	{"Canon:PowerShot A100",	CANON_PS_A100,		0x04A9, 0x3061, CAP_SUP, S10M, S32K, NULL},
- 	{"Canon:PowerShot A200",	CANON_PS_A200,		0x04A9, 0x3062, CAP_SUP, S10M, S32K, NULL},
-@@ -131,10 +131,9 @@
- 	{"Canon:Digital IXUS v2",	CANON_PS_S200,		0x04A9, 0x3065, CAP_SUP, S10M, S32K, NULL},
- 	{"Canon:Digital IXUS 330",	CANON_PS_S330,		0x04A9, 0x3066, CAP_SUP, S10M, S32K, NULL},
- 	{"Canon:PowerShot S50 (normal mode)",	CANON_PS_S50,	0x04A9, 0x3077, CAP_SUP, S99M, S32K, NULL},
--	{"Canon:PowerShot S45 (normal mode)",	CANON_PS_S45,	0x04A9, 0x306C, CAP_SUP, S99M, S32K, NULL},
- 	/* 306a is in MacOS Info.plist, but I don't know what it is --swestin. */
--	/*{"Canon:Digital ???",	CANON_PS_??,		0x04A9, 0x3066, CAP_SUP, S10M, S32K, NULL},*/
--	{"Canon:PowerShot S45 (normal mode)",	CANON_PS_S45,	0x04A9, 0x306a, CAP_SUP, S99M, S32K, NULL},
-+	{"Canon:Digital unknown 3",	CANON_PS_UNK3,		0x04A9, 0x306a, CAP_SUP, S10M, S32K, NULL},
-+	{"Canon:PowerShot S45 (normal mode)",	CANON_PS_S45,	0x04A9, 0x306C, CAP_SUP, S99M, S32K, NULL},
-         /* 0x306D is S45 in PTP mode */
- 	{"Canon:PowerShot G3 (normal mode)",	CANON_PS_G3,	0x04A9, 0x306E, CAP_SUP, S99M, S32K, NULL},
-         /* 0x306F is G3 in PTP mode */
-@@ -157,11 +156,16 @@
- 	/* S400 product ID for PTP mode is 0x3075; there may be no
- 	 * "Canon" mode, so it will be supported by the PTP driver,
- 	 * not here. */
-+
- 	/* 3078 and 307a are in MacOS Info.plist, but I don't know
- 	 * what they are --swestin. */
--	/*{"Canon:PowerShot ?????",		CANON_PS_A60,		0x04A9, 0x3078, CAP_SUP, S10M, S32K, NULL},*/
--	/*{"Canon:PowerShot ?????",		CANON_PS_A60,		0x04A9, 0x307a, CAP_SUP, S10M, S32K, NULL},*/
-+	{"Canon:PowerShot unknown 4",		CANON_PS_UNK4,		0x04A9, 0x3078, CAP_SUP, S10M, S32K, NULL},
-+	{"Canon:PowerShot unknown 5",		CANON_PS_UNK5,		0x04A9, 0x307a, CAP_SUP, S10M, S32K, NULL},
-+
-+	/* MV630i seems to be a DV camcorder */
-+	{"Canon:MV630i",		CANON_MV630I,		0x04A9, 0x307b, CAP_SUP, S99M, S32K, NULL},
- 	{"Canon:EOS 10D",		CANON_EOS_10D,		0x04A9, 0x3083, CAP_SUP, S10M, S32K, NULL},
-+
- 	/* Canon MVX2i in some mode is 0x3067 - probably PTP */
- 	/* Apparently the MVX2i is the same as Optura 200 MC (Philippe
- 	 * Gramoulle), so share the code. */
-diff -r -u libgphoto2-2.1.2.orig/camlibs/canon/canon.h libgphoto2-2.1.2/camlibs/canon/canon.h
---- libgphoto2-2.1.2.orig/camlibs/canon/canon.h	2003-08-10 13:51:13.000000000 -0500
-+++ libgphoto2-2.1.2/camlibs/canon/canon.h	2003-10-12 11:48:40.000000000 -0500
-@@ -88,8 +88,14 @@
-  * @CANON_PS_G3: PowerShot G3
-  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
-  * @CANON_PS_A60: PowerShot A60
-+ * @CANON_MV630I: MV630i camcorder
-  * @CANON_EOS_10D: EOS 10D
-  * @CANON_OPT_200: Optura 200 MC, MVX2i
-+ * @CANON_PS_UNK1: Unknown camera seen in Mac OS X Image Capture
-+ * @CANON_PS_UNK2: Unknown camera seen in Mac OS X Image Capture
-+ * @CANON_PS_UNK3: Unknown camera seen in Mac OS X Image Capture
-+ * @CANON_PS_UNK4: Unknown camera seen in Mac OS X Image Capture
-+ * @CANON_PS_UNK5: Unknown camera seen in Mac OS X Image Capture
-  *
-  * Enumeration of all camera types currently supported.
-  *
-@@ -121,12 +127,19 @@
- 	CANON_PS_A100,
- 	CANON_PS_A200,
- 	CANON_PS_A300,
-+	CANON_PS_S50,
- 	CANON_PS_S45,
- 	CANON_PS_G3,
--	CANON_PS_S50,
- 	CANON_PS_S230,
-+	CANON_MV630I,
- 	CANON_EOS_10D,
--	CANON_OPT_200
-+	CANON_OPT_200,
-+	/* In Mac OS Image Capture, but not yet seen in the wild. */
-+	CANON_PS_UNK1,
-+	CANON_PS_UNK2,
-+	CANON_PS_UNK3,
-+	CANON_PS_UNK4,
-+	CANON_PS_UNK5
- } canonCamModel;
- 
- /**
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.3-canon.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.3-canon.patch
deleted file mode 100644
index 7bd93a740e15..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.1.3-canon.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gphoto/libgphoto2/camlibs/canon/canon.c,v
-retrieving revision 1.227
-retrieving revision 1.233
-diff -u -r1.227 -r1.233
---- gphoto/libgphoto2/camlibs/canon/canon.c	2003/10/10 10:54:32	1.227
-+++ gphoto/libgphoto2/camlibs/canon/canon.c	2003/11/08 11:55:27	1.233
- #include "config.h"
-@@ -78,11 +78,11 @@
-  * such that their camera name occurs in the list of supported
-  * cameras.
-  *
-- * Note:
-- * - at least some serial cameras require a certain name for correct
-+ * Notes:
-+ * - At least some serial cameras require a certain name for correct
-  *   detection.
-- * - newer Canon cameras USB also support a PTP mode. see ptp/ptp2 camlibs.
-- * - no IEEE1394 cameras supported yet
-+ * - Newer Canon USB cameras also support a PTP mode. See ptp2 camlib.
-+ * - No IEEE1394 cameras supported yet.
-  **/
- 
- #define S32K	(32 * 1024)
-@@ -135,36 +135,35 @@
- 	{"Canon:PowerShot S200",	CANON_PS_S200,		0x04A9, 0x3065, CAP_SUP, S10M, S32K, S2M, NULL},
- 	{"Canon:Digital IXUS v2",	CANON_PS_S200,		0x04A9, 0x3065, CAP_SUP, S10M, S32K, S2M, NULL},
- 	{"Canon:Digital IXUS 330",	CANON_PS_S330,		0x04A9, 0x3066, CAP_SUP, S10M, S32K, S2M, NULL},
--	/* Canon MVX2i in some mode is 0x3067 - probably PTP */
- 
- 	/* 306a is in MacOS Info.plist, but I don't know what it is --swestin. */
- 	{"Canon:Digital unknown 3",	CANON_PS_UNK3,		0x04A9, 0x306a, CAP_SUP, S10M, S32K, S2M, NULL},
--	/* Apparently the MVX2i is the same as Optura 200 MC (Philippe
--	 * Gramoulle), so share the code. */
-+	/* Canon MVX2i in some mode is 0x3067 - probably PTP */
- 	{"Canon:MVX2i",			CANON_OPT_200,		0x04A9, 0x306B, CAP_SUP, S99M, S32K, S2M, NULL},
- 	{"Canon:Optura 200 MC",		CANON_OPT_200,		0x04A9, 0x306B, CAP_SUP, S99M, S32K, S2M, NULL},
- 	{"Canon:PowerShot S45 (normal mode)",	CANON_PS_S45,	0x04A9, 0x306C, CAP_SUP, S99M, S32K, S2M, NULL},
--        /* 0x306D is S45 in PTP mode */
-+	/* 0x306D is S45 in PTP mode */
- 	{"Canon:PowerShot G3 (normal mode)",	CANON_PS_G3,	0x04A9, 0x306E, CAP_SUP, S99M, S32K, S2M, NULL},
--        /* 0x306F is G3 in PTP mode */
-+	/* 0x306F is G3 in PTP mode */
- 	{"Canon:PowerShot S230 (normal mode)",	CANON_PS_S230,	0x04A9, 0x3070, CAP_SUP, S99M, S32K, S2M, NULL},
- 	{"Canon:Digital IXUS v3 (normal mode)",	CANON_PS_S230,	0x04A9, 0x3070, CAP_SUP, S99M, S32K, S2M, NULL},
--        /* 0x3071 is S230/IXUS v3 in PTP mode */
-+	/* 0x3071 is S230/IXUS v3 in PTP mode */
- 
- 	{"Canon:PowerShot SD100 (normal mode)",	CANON_PS_SD100,	0x04A9, 0x3072, CAP_SUP, S99M, S32K, S2M, NULL},
- 	{"Canon:Digital IXUS II (normal mode)",	CANON_PS_SD100,	0x04A9, 0x3072, CAP_SUP, S99M, S32K, S2M, NULL},
- 	/* added from report on mailinglist. XXX: assuming capture works -Marcus */
--	/* reports suggest that they provide 1 interface which does
--	 * both PTP and Canon access modes.
--	 */
-+	/* PS A70 uses the same ProductID for PTP and Canon, with protocol autodetection */
- 	{"Canon:PowerShot A70",         CANON_PS_A70,           0x04A9, 0x3073, CAP_SUP, S99M, S32K, S2M, NULL},
-+	/* PS A60 uses the same ProductID for PTP and Canon, with protocol autodetection */
- 	{"Canon:PowerShot A60",         CANON_PS_A60,           0x04A9, 0x3074, CAP_SUP, S99M, S32K, S2M, NULL},
- 	/* reported working on SourceForge patch tracker. */
--	/* S400 product ID is 0x3075; this responds both to Canon
--	 * protocol and PTP. */
- 	{"Canon:Digital IXUS 400",      CANON_PS_S400,		0x04A9, 0x3075, CAP_SUP, S99M, S32K, S2M, NULL},
-+	/* PS S400 used the same ProductID for PTP and Canon, with protocol autodetection */
- 	{"Canon:PowerShot S400",        CANON_PS_S400,		0x04A9, 0x3075, CAP_SUP, S99M, S32K, S2M, NULL},
- 
-+	{"Canon:PowerShot A300",        CANON_PS_A300,          0x04A9, 0x3076, CAP_SUP, S99M, S32K, S2M, NULL},
-+	{"Canon:PowerShot S50 (normal mode)",   CANON_PS_S50,   0x04A9, 0x3077, CAP_SUP, S99M, S32K, S2M, NULL},
-+
- 	/* 3078 and 307a are in MacOS Info.plist, but I don't know
- 	 * what they are --swestin. */
- 	{"Canon:PowerShot unknown 4",		CANON_PS_UNK4,	0x04A9, 0x3078, CAP_SUP, S10M, S32K, S2M, NULL},
-@@ -172,13 +171,16 @@
- 	{"Canon:PowerShot unknown 5",		CANON_PS_UNK5,	0x04A9, 0x307a, CAP_SUP, S10M, S32K, S2M, NULL},
- 	/* MV630i seems to be a DV camcorder */
- 	{"Canon:MV630i",		CANON_MV630I,		0x04A9, 0x307b, CAP_SUP, S99M, S32K, S2M, NULL},
-+	{"Canon:Optura 20",		CANON_OPT_20,		0x04A9, 0x307f, CAP_SUP, S99M, S32K, S2M, NULL},
- 
- 	{"Canon:EOS 10D",		CANON_EOS_10D,		0x04A9, 0x3083, CAP_SUP, S10M, S32K, S2M, NULL},
- 	/* 0x3099 is the EOS 300D/Digital Rebel in PTP mode */
- 	{"Canon:EOS 300D (normal mode)",	CANON_EOS_300D, 0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL},
- 	{"Canon:EOS Digital Rebel (normal mode)",CANON_EOS_300D,0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL},
- 	{"Canon:EOS Kiss Digital (normal mode)",CANON_EOS_300D, 0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL},
--	{"Canon:PowerShot A80 (normal mode)",CANON_PS_A80,      0x04A9, 0x309A, CAP_SUP,  S99M, S32K, S2M, NULL},
-+	/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */
-+	{"Canon:PowerShot G5 (normal mode)",	CANON_PS_G5,	0x04A9, 0x3085, CAP_SUP, S99M, S32K, S2M, NULL},
-+	{"Canon:PowerShot A80 (normal mode)",CANON_PS_A80,      0x04A9, 0x309A, CAP_SUP, S99M, S32K, S2M, NULL},
- 
- 	{NULL}
- 	/* *INDENT-ON* */
-@@ -312,6 +314,7 @@
- 	case CANON_PS_S45:
- 	case CANON_PS_S400:
- 	case CANON_PS_G3:
-+	case CANON_PS_G5:
- 		break;
- 	default:
- 		GP_DEBUG ("canon_int_filename2audioname: camera model doesn't support audio files",
-@@ -864,10 +867,10 @@
- }
- 
- /**
-- * canon_int_find_new_image
-- * @camera Camera * to this camera
-- * @initial_state Camera directory dump before image capture
-- * @final_state Directory dump after image capture
-+ * canon_int_find_new_image:
-+ * @camera: Camera * to this camera
-+ * @initial_state: Camera directory dump before image capture
-+ * @final_state: Directory dump after image capture
-  * @path: Will be filled in with the path and filename of the captured
-  *        image, in canonical gphoto2 format.
-  *
-@@ -957,7 +960,7 @@
- }
- 
- /**
-- * canon_int_capture_image
-+ * canon_int_capture_image:
-  * @camera: camera to work with
-  * @path: gets filled in with the path and filename of the captured
-  *   image, in canonical gphoto2 format.
-@@ -1095,8 +1098,8 @@
- /**
-  * canon_int_set_file_attributes:
-  * @camera: camera to work with
-+ * @dir: directory to work in
-  * @file: file to work on
-- * @dir: directory to work in
-  * @attrs: #canonDirentAttributeBits with the bits to set
-  * @context: context for error reporting
-  *
---- gphoto/libgphoto2/camlibs/canon/canon.h	2003/10/10 10:54:32	1.83
-+++ gphoto/libgphoto2/camlibs/canon/canon.h	2003/11/08 11:55:27	1.86
-@@ -32,6 +32,12 @@
- /* #define CAMERA_ON_AC       16 obsolete; we now just use*/
- /* #define CAMERA_ON_BATTERY  48 the bit that makes the difference */
- 
-+/**
-+ * CAMERA_MASK_BATTERY
-+ *
-+ * Bit mask to use to find battery/AC flag
-+ *
-+ */
- #define CAMERA_MASK_BATTERY  32
- 
- /**
-@@ -87,17 +93,21 @@
-  * @CANON_PS_S330: Digital IXUS 330
-  * @CANON_PS_S45: PowerShot S45
-  * @CANON_PS_G3: PowerShot G3
-+ * @CANON_PS_G5: PowerShot G5
-  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
-- * @CANON_PS_A60: PowerShot A60
-  * @CANON_MV630I: MV630i camcorder
-  * @CANON_EOS_10D: EOS 10D
-  * @CANON_OPT_200: Optura 200 MC, MVX2i
-+ * @CANON_OPT_20: Optura 20
-  * @CANON_PS_UNK1: Unknown camera seen in Mac OS X Image Capture
-  * @CANON_PS_UNK2: Unknown camera seen in Mac OS X Image Capture
-  * @CANON_PS_UNK3: Unknown camera seen in Mac OS X Image Capture
-  * @CANON_PS_UNK4: Unknown camera seen in Mac OS X Image Capture
-  * @CANON_PS_UNK5: Unknown camera seen in Mac OS X Image Capture
-  * @CANON_EOS_300D: EOS 300D / Digital Rebel / KISS Rebel
-+ * @CANON_PS_S50: PowerShot S50
-+ * @CANON_PS_S400: PowerShot S400, Digital IXUS 400
-+ * @CANON_PS_SD100: PowerShot SD100, Digital IXUS II
-  *
-  * Enumeration of all camera types currently supported.
-  *
-@@ -146,7 +156,9 @@
- 	/* other cameras */
- 	CANON_PS_S400,
- 	CANON_PS_SD100,
--	CANON_EOS_300D
-+	CANON_EOS_300D,
-+	CANON_PS_G5,
-+	CANON_OPT_20
- } canonCamModel;
- 
- /**
-@@ -273,10 +285,8 @@
- 	 */
- 	int list_all_files; /* whether to list all files, not just know types */
- 
--#ifdef CANON_EXPERIMENTAL_UPLOAD
- 	int upload_keep_filename; /* 0=DCIF compatible filenames (AUT_*), 
- 				     1=keep original filename */
--#endif /* CANON_EXPERIMENTAL_UPLOAD */
- 
- 	char *cached_drive;	/* usually something like C: */
- 	int cached_ready;       /* whether the camera is ready to rock */
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.4-blink2.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.4-blink2.patch
deleted file mode 100644
index 1b286303e5ea..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.1.4-blink2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- libgphoto2-2.1.4-orig/camlibs/sipix/blink2.c	2004-03-26 12:16:13.000000000 +0100
-+++ libgphoto2-2.1.4/camlibs/sipix/blink2.c	2004-04-01 13:28:45.000000000 +0200
-@@ -55,8 +55,10 @@
- ) {
-     char buf[6];
-     int ret;
--
--    ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 6);
-+    
-+    ret = gp_port_usb_msg_read(port, 0x18, 0x03, 0, buf, 6);
-+    ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 2);
-+    ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 2);
-     if (ret<GP_OK)
- 	return ret;
-     *numpics = (buf[0]<<8) | buf[1];
-@@ -95,7 +97,7 @@
- 	if (ret < GP_OK) return ret;
- 
- 	xbuf = malloc(8*(1+numpics));
--	ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,8 );
-+	ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,1 );
- 	if (ret < GP_OK)  {
- 		free(xbuf);
- 		return ret;
-@@ -142,7 +144,7 @@
- 		free(xbuf);
- 		return GP_ERROR_NO_MEMORY;
- 	}
--	ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,8 );
-+	ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,1 );
- 	if (ret < GP_OK) {
- 		free(addrs);
- 		free(xbuf);
-@@ -375,10 +377,12 @@
- 	settings.usb.interface = 0;
- 	ret = gp_port_set_settings( camera->port, settings);
- 	if (ret < GP_OK) return ret;
--	ret = gp_port_usb_msg_read( camera->port, 0x18, 0x0300, 0x0000, buf, 6);
-+
-+	ret = gp_port_usb_msg_read( camera->port, 0x18, 0x03, 0, buf, 6);
- 	if (ret < GP_OK)
- 		return ret;
--	ret = gp_port_usb_msg_read( camera->port, 0x04, 0x0300, 0x0000, buf, 8);
-+
-+	ret = gp_port_usb_msg_read( camera->port, 0x04, 0x03, 0, buf, 1);
- 	if (ret < GP_OK)
- 		return ret;
- 	return GP_OK;
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.4-canon.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.4-canon.patch
deleted file mode 100644
index 118d67926a5b..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.1.4-canon.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- camlibs/canon/canon.c	22 Aug 2004 22:19:30 -0000	1.248
-+++ camlibs/canon/canon.c	9 Sep 2004 08:39:09 -0000
-@@ -184,6 +187,15 @@
- 	/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */
- 	{"Canon:PowerShot G5 (normal mode)",	CANON_PS_G5,	0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 	{"Canon:PowerShot A80 (normal mode)",CANON_PS_A80,      0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot S60 (normal mode)", CANON_PS_S60,     0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:Digital IXUS 500 (normal mode)",CANON_PS_S500,  0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	 {"Canon:PowerShot A75",        CANON_PS_A75, 	        0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	 {"Canon:PowerShot A400",	CANON_PS_A400,		0x0DA9, 0x30b7,	CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot A310",        CANON_PS_A310,          0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, 
-+	{"Canon:PowerShot S410 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:Digital IXUS 430 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot A95 (normal mode)",CANON_PS_A95,  0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot A85 (normal mode)",CANON_PS_A85,  0x04A9, 0x30be, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 
- 	{NULL}
- 	/* *INDENT-ON* */
-diff -u -3 -p -r1.95 canon.h
---- camlibs/canon/canon.h	14 Aug 2004 00:24:12 -0000	1.95
-+++ camlibs/canon/canon.h	9 Sep 2004 08:39:09 -0000
-@@ -68,7 +68,10 @@
-  * @CANON_PS_A50: PowerShot A50
-  * @CANON_PS_A60: PowerShot A60
-  * @CANON_PS_A70: PowerShot A70
-+ * @CANON_PS_A75: PowerShot A75
-+ * @CANON_PS_A85: PowerShot A95
-  * @CANON_PS_A80: PowerShot A80
-+ * @CANON_PS_A95: PowerShot A95
-  * @CANON_PS_PRO70: PowerShot Pro70
-  * @CANON_PS_S10: PowerShot S10
-  * @CANON_PS_S20: PowerShot S20
-@@ -91,11 +94,15 @@
-  * @CANON_PS_A300: PowerShot A300
-  * @CANON_PS_S200: PowerShot S200, Digital IXUS v2
-  * @CANON_PS_S330: Digital IXUS 330
-+ * @CANON_PS_S410: Digital IXUS 430
-+ * @CANON_PS_S500: Digital IXUS 500
-  * @CANON_PS_S45: PowerShot S45
-+ * @CANON_PS_S60: PowerShot S60
-  * @CANON_PS_G3: PowerShot G3
-  * @CANON_PS_G5: PowerShot G5
-  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
-  * @CANON_MV630I: MV630i camcorder
-+ * @CANON_MV650I: MV650i camcorder
-  * @CANON_EOS_10D: EOS 10D
-  * @CANON_OPT_10: Optura 10
-  * @CANON_OPT_20: Optura 20
-@@ -109,6 +116,7 @@
-  * @CANON_PS_S50: PowerShot S50
-  * @CANON_PS_S400: PowerShot S400, Digital IXUS 400
-  * @CANON_PS_SD100: PowerShot SD100, Digital IXUS II
-+ * @CANON_PS_A400: PowerShot A400
-  *
-  * Enumeration of all camera types currently supported.
-  *
-@@ -119,7 +127,10 @@
- 	CANON_PS_A50,
- 	CANON_PS_A60,
- 	CANON_PS_A70,
-+	CANON_PS_A75,
- 	CANON_PS_A80,
-+	CANON_PS_A85,
-+  	CANON_PS_A95,
- 	CANON_PS_S10,
- 	CANON_PS_S20,
- 	CANON_PS_S30,
-@@ -141,11 +152,14 @@
- 	CANON_PS_A100,
- 	CANON_PS_A200,
- 	CANON_PS_A300,
-+	CANON_PS_A310,
-+	CANON_PS_A400,
- 	CANON_PS_S50,
- 	CANON_PS_S45,
- 	CANON_PS_G3,
- 	CANON_PS_S230,
- 	CANON_MV630I,
-+	CANON_MV650I,
- 	CANON_EOS_10D,
- 	CANON_OPT_200,
- 	/* In Mac OS Image Capture, but not yet seen in the wild. */
-@@ -156,6 +170,9 @@
- 	CANON_PS_UNK5,
- 	/* other cameras */
- 	CANON_PS_S400,
-+	CANON_PS_S410,
-+	CANON_PS_S60,
-+	CANON_PS_S500,
- 	CANON_PS_SD100,
- 	CANON_EOS_300D,
- 	CANON_PS_G5,
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.4-gcc2_fixes.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.4-gcc2_fixes.patch
deleted file mode 100644
index 47a04870e985..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.1.4-gcc2_fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -NurdB libgphoto2-2.1.4-orig/camlibs/aox/aox.c libgphoto2-2.1.4/camlibs/aox/aox.c
---- libgphoto2-2.1.4-orig/camlibs/aox/aox.c	2004-05-06 00:19:28.000000000 -0500
-+++ libgphoto2-2.1.4/camlibs/aox/aox.c	2004-05-06 00:50:49.000000000 -0500
-@@ -39,10 +39,10 @@
- int aox_init (GPPort *port, Model *model, Info *info) 
- {
- 	unsigned char c[4];
--	memset(c,0,sizeof(c));
- 	unsigned char hi[2];
--	memset (hi,0,2);
- 	unsigned char lo[2];
-+	memset(c,0,sizeof(c));
-+	memset (hi,0,2);
- 	memset (lo,0,2);
- 
- 	GP_DEBUG("Running aox_init\n");
-@@ -86,11 +86,11 @@
- 
- int aox_get_picture_size  (GPPort *port, int lo, int hi, int n, int k) 
- {
-+	unsigned char c[4];
-+	unsigned int size;
- 	GP_DEBUG("Running aox_get_picture_size\n");
- 
--	unsigned char c[4];
- 	memset (c,0,4);
--        unsigned int size;
- 
- 	if ( ( (lo) && ( n ==k ) && (k ==0)) ) {
- 	    	READ(port, 0x04, 0x1, 0x1, c, 2);	
-diff -NurdB libgphoto2-2.1.4-orig/camlibs/aox/library.c libgphoto2-2.1.4/camlibs/aox/library.c
---- libgphoto2-2.1.4-orig/camlibs/aox/library.c	2004-05-06 00:19:28.000000000 -0500
-+++ libgphoto2-2.1.4/camlibs/aox/library.c	2004-05-06 00:20:27.000000000 -0500
-@@ -202,6 +202,7 @@
- 			gp_file_adjust_name_for_mime_type (file);
- 		}
- 		if ((w == 640)){
-+			int header_len;
- 			/* Stripping useless header */
- 			p_data = data + 0x98;
- 			/* Picture is mirror-imaged.*/
-@@ -222,7 +223,7 @@
- 			GP_DEBUG("size of data = %i\n", sizeof(data));
- 			GP_DEBUG("size of p_data = %i\n", sizeof(p_data));
- 			/* And now create a ppm file, with our own header */
--			int  header_len = snprintf(header, 127, 
-+			header_len = snprintf(header, 127, 
- 				"P6\n" 
- 				"# CREATOR: gphoto2, aox library\n" 
- 				"%d %d\n"