docbook2man configure fix, version bump, remove old versions. bug 173310.

(Portage version: 2.1.2.3)

7 files changed, 19 insertions, 120 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index 8394d1c5627a..5ce0912edd79 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xvidcap
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.31 2007/02/24 16:54:03 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.32 2007/04/04 13:23:06 drac Exp $
+
+*xvidcap-1.1.5_rc2 (04 Apr 2007)
+
+  04 Apr 2007; Samuli Suominen <drac@gentoo.org>
+  -files/xvidcap-1.1.4-xtoxwd.c.patch, -xvidcap-1.1.4.ebuild,
+  -xvidcap-1.1.5_rc1.ebuild, +xvidcap-1.1.5_rc2.ebuild:
+  Fix configure to find docbook2man in version bumped version for bug 173310.
+  Thanks to Branko Majic for reporting. Clean old versions.
 
 *xvidcap-1.1.5_rc1 (24 Feb 2007)
 
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.4 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.4
deleted file mode 100644
index fe4c2c94e89c..000000000000
--- a/x11-misc/xvidcap/files/digest-xvidcap-1.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ba8759f40977c4dd2f9afd6ca3cca8d8 xvidcap-1.1.4.tar.gz 4004780
-RMD160 506c85c2670e481833283b4f19de4d89ebcfabb3 xvidcap-1.1.4.tar.gz 4004780
-SHA256 9e0833795b88a2dd246e1f9cb9b4c347e2355f70826cddf34a35043f4e8afa35 xvidcap-1.1.4.tar.gz 4004780
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.5_rc1 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.5_rc1
deleted file mode 100644
index 397aabe23488..000000000000
--- a/x11-misc/xvidcap/files/digest-xvidcap-1.1.5_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cd6bece3c31ffdabc7b7d343f72330a5 xvidcap-1.1.5rc1.tar.gz 4036439
-RMD160 7bb0405405fcf72eb1bc111eac0dffd10ac77edb xvidcap-1.1.5rc1.tar.gz 4036439
-SHA256 2684fe5f575bfb8d25462eb0fcbc053e0b3e47943ba06b11539856293f95c6f2 xvidcap-1.1.5rc1.tar.gz 4036439
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.5_rc2 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.5_rc2
new file mode 100644
index 000000000000..b3aacd1e8c3e
--- /dev/null
+++ b/x11-misc/xvidcap/files/digest-xvidcap-1.1.5_rc2
@@ -0,0 +1,3 @@
+MD5 10e0a8bb376dce81232cc255a754e45c xvidcap-1.1.5rc2.tar.gz 4212772
+RMD160 7327ce16de039484030657c1780217cc4c5d98f8 xvidcap-1.1.5rc2.tar.gz 4212772
+SHA256 4da58b61c345b1b2088c1e25eb961d4f7fb44b3654bd7f8ef41591cbb91e4581 xvidcap-1.1.5rc2.tar.gz 4212772
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.4-xtoxwd.c.patch b/x11-misc/xvidcap/files/xvidcap-1.1.4-xtoxwd.c.patch
deleted file mode 100644
index 9382d43165e8..000000000000
--- a/x11-misc/xvidcap/files/xvidcap-1.1.4-xtoxwd.c.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru xvidcap-1.1.4.vanilla/src/xtoxwd.c xvidcap-1.1.4/src/xtoxwd.c
---- xvidcap-1.1.4.vanilla/src/xtoxwd.c	2007-01-10 11:57:05.000000000 +0100
-+++ xvidcap-1.1.4/src/xtoxwd.c	2007-01-10 11:58:28.000000000 +0100
-@@ -51,9 +51,9 @@
- }
- 
- /* 
-- * swap the byte order of a long integer (32 byte)
-+ * swap the byte order of a integer (32 byte)
-  */
--void swap_4byte(unsigned long *i)
-+void swap_4byte(unsigned int *i)
- {
-     unsigned char t;
-     unsigned char *p = (unsigned char *) i;
-@@ -69,10 +69,10 @@
- /* 
-  * swap the byte order of a 32 bit word;
-  */
--void swap_n_4byte(unsigned char *p, unsigned long n)
-+void swap_n_4byte(unsigned char *p, unsigned int n)
- {
-     register unsigned char t;
--    register unsigned long i;
-+    register unsigned int i;
-     for (i = 0; i < n; i++) {
-         t = p[0];
-         p[0] = p[3];
-@@ -87,7 +87,7 @@
- /* 
-  * swap n bytes in a char array
-  */
--void swap_n_bytes(unsigned char *p, unsigned long n)
-+void swap_n_bytes(unsigned char *p, unsigned int n)
- {
-     unsigned char t;
-     unsigned int i, h;
-@@ -104,7 +104,7 @@
- /* 
-  * global, we need this to check if we must swap some bytes
-  */
--static unsigned long little_endian = 1;
-+static unsigned int little_endian = 1;
- 
- /* 
-  * prepare the color table for the xwd file
-@@ -175,13 +175,13 @@
-         head.ncolors = (CARD32) job->ncolors;
-         head.window_width = (CARD32) win_attr.width;
-         head.window_height = (CARD32) win_attr.height;
--        head.window_x = (long) win_attr.x;
--        head.window_y = (long) win_attr.y;
-+        head.window_x = (CARD32) win_attr.x;
-+        head.window_y = (CARD32) win_attr.y;
-         head.window_bdrwidth = (CARD32) win_attr.border_width;
- 
-         if (*(char *) &little_endian)
-             swap_n_4byte((unsigned char *) &head,
--                         sizeof(head) / sizeof(long));
-+                         sizeof(head) / sizeof(int));
-     }
-     if (fwrite((char *) &head, sizeof(head), 1, fp) < 1)
-         perror(file);
diff --git a/x11-misc/xvidcap/xvidcap-1.1.4.ebuild b/x11-misc/xvidcap/xvidcap-1.1.4.ebuild
deleted file mode 100644
index ccbc6a067e73..000000000000
--- a/x11-misc/xvidcap/xvidcap-1.1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.4.ebuild,v 1.3 2007/02/03 14:14:57 nelchael Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Screen capture utility enabling you to create videos of your desktop for illustration or documentation purposes."
-HOMEPAGE="http://xvidcap.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xvidcap/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk"
-
-RDEPEND=">=media-video/ffmpeg-0.4.9_pre1
-	media-libs/libpng
-	media-libs/jpeg
-	sys-libs/zlib
-	gnome-base/libgnome
-	app-text/scrollkeeper
-	gnome-base/libgnomeui"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-xtoxwd.c.patch"
-
-}
-
-src_compile() {
-
-	econf `use_with gtk gtk2` || die "Configuration failed"
-	emake || die "Compilation failed"
-
-}
-
-src_install() {
-
-	einstall || die "Installation failed"
-
-	# Fix for #58322
-	rm -fr ${D}/usr/share/doc/${PN}_${PV}
-	dodoc NEWS README AUTHORS ChangeLog
-
-}
diff --git a/x11-misc/xvidcap/xvidcap-1.1.5_rc1.ebuild b/x11-misc/xvidcap/xvidcap-1.1.5_rc2.ebuild
index 0adf5b25bcca..513231298413 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.5_rc1.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.5_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.5_rc1.ebuild,v 1.1 2007/02/24 16:54:03 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.5_rc2.ebuild,v 1.1 2007/04/04 13:23:06 drac Exp $
 
 MY_PV="${PV/_/}"
 
@@ -32,6 +32,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:2x-man:2man:g' configure*
+}
+
 src_compile() {
 	econf --with-forced-embedded-ffmpeg
 	emake || die "emake failed."