From 66667ba45c09629c04b196800a8a134801230cd3 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 4 Apr 2007 13:23:06 +0000 Subject: [PATCH] docbook2man configure fix, version bump, remove old versions. bug 173310. Package-Manager: portage-2.1.2.3 --- x11-misc/xvidcap/ChangeLog | 10 ++- x11-misc/xvidcap/Manifest | 36 ++++------- x11-misc/xvidcap/files/digest-xvidcap-1.1.4 | 3 - .../xvidcap/files/digest-xvidcap-1.1.5_rc1 | 3 - .../xvidcap/files/digest-xvidcap-1.1.5_rc2 | 3 + .../files/xvidcap-1.1.4-xtoxwd.c.patch | 63 ------------------- x11-misc/xvidcap/xvidcap-1.1.4.ebuild | 49 --------------- ....5_rc1.ebuild => xvidcap-1.1.5_rc2.ebuild} | 8 ++- 8 files changed, 31 insertions(+), 144 deletions(-) delete mode 100644 x11-misc/xvidcap/files/digest-xvidcap-1.1.4 delete mode 100644 x11-misc/xvidcap/files/digest-xvidcap-1.1.5_rc1 create mode 100644 x11-misc/xvidcap/files/digest-xvidcap-1.1.5_rc2 delete mode 100644 x11-misc/xvidcap/files/xvidcap-1.1.4-xtoxwd.c.patch delete mode 100644 x11-misc/xvidcap/xvidcap-1.1.4.ebuild rename x11-misc/xvidcap/{xvidcap-1.1.5_rc1.ebuild => xvidcap-1.1.5_rc2.ebuild} (89%) 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 + -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/Manifest b/x11-misc/xvidcap/Manifest index b7edf4bf7486..bb3b76c92ded 100644 --- a/x11-misc/xvidcap/Manifest +++ b/x11-misc/xvidcap/Manifest @@ -1,36 +1,24 @@ -AUX xvidcap-1.1.4-xtoxwd.c.patch 1986 RMD160 d80ffb5ddc262921ad94e0a7a16f839a477401ff SHA1 335a56a9898493f3f349894ed67350b6ca0f0f19 SHA256 9a5e897407a1f8cb00a1de88a9693112317d0835c72fb11368adead7a47760fb -MD5 e143d45f30736ba30b0b8853ebf655a6 files/xvidcap-1.1.4-xtoxwd.c.patch 1986 -RMD160 d80ffb5ddc262921ad94e0a7a16f839a477401ff files/xvidcap-1.1.4-xtoxwd.c.patch 1986 -SHA256 9a5e897407a1f8cb00a1de88a9693112317d0835c72fb11368adead7a47760fb files/xvidcap-1.1.4-xtoxwd.c.patch 1986 -DIST xvidcap-1.1.4.tar.gz 4004780 RMD160 506c85c2670e481833283b4f19de4d89ebcfabb3 SHA1 51b3a8e3fcc09ab0d2b224e9e6080def1c85ec09 SHA256 9e0833795b88a2dd246e1f9cb9b4c347e2355f70826cddf34a35043f4e8afa35 DIST xvidcap-1.1.4rc1.tar.gz 2642762 RMD160 9e0d13da57feb6991a6ebe0d42db399d97da3c18 SHA1 473c9d4dd7dcae645077b711de4d5fcb56bab9fd SHA256 912df39e610397e78d40197dc603178d62d1e9de1c522de53a82db92810d8648 -DIST xvidcap-1.1.5rc1.tar.gz 4036439 RMD160 7bb0405405fcf72eb1bc111eac0dffd10ac77edb SHA1 8f6695665d0392b89112a59694a3c9ecd0955f57 SHA256 2684fe5f575bfb8d25462eb0fcbc053e0b3e47943ba06b11539856293f95c6f2 -EBUILD xvidcap-1.1.4.ebuild 1070 RMD160 627d4606041c407fd38866e52380f6966d19586d SHA1 2a168f86abe667002721f3ba022849fe5cd63d6f SHA256 c649227542a7cad5a4aa125a38b9353458e423bd3e64b4e45becf2c3a7390086 -MD5 a65cf0ce802f39f337d929851dfa5bfc xvidcap-1.1.4.ebuild 1070 -RMD160 627d4606041c407fd38866e52380f6966d19586d xvidcap-1.1.4.ebuild 1070 -SHA256 c649227542a7cad5a4aa125a38b9353458e423bd3e64b4e45becf2c3a7390086 xvidcap-1.1.4.ebuild 1070 +DIST xvidcap-1.1.5rc2.tar.gz 4212772 RMD160 7327ce16de039484030657c1780217cc4c5d98f8 SHA1 59781377272c60cde41cdcb41b892ac70a0a137c SHA256 4da58b61c345b1b2088c1e25eb961d4f7fb44b3654bd7f8ef41591cbb91e4581 EBUILD xvidcap-1.1.4_rc1.ebuild 1019 RMD160 408c7ae362f95045c8f4593079b2d01d88bed3f0 SHA1 f2a1be1dceb3192ac21bb3941514f4801e052ba6 SHA256 84df47ac5ebeb3c8c90da534034aa72831d57af1d87b6989d342048744465b2c MD5 2f7bd715e9f6266adee17d8624ccaa40 xvidcap-1.1.4_rc1.ebuild 1019 RMD160 408c7ae362f95045c8f4593079b2d01d88bed3f0 xvidcap-1.1.4_rc1.ebuild 1019 SHA256 84df47ac5ebeb3c8c90da534034aa72831d57af1d87b6989d342048744465b2c xvidcap-1.1.4_rc1.ebuild 1019 -EBUILD xvidcap-1.1.5_rc1.ebuild 1186 RMD160 04df0f2909faa343bf9e5ab77ead8f6a79f4abf7 SHA1 07bb11d41d45b65b281fda815f33fb906be3b601 SHA256 77c99a62ba75dfac59b522d0304cb0a793c95aa6da287f0381fa1b7a145b0ad6 -MD5 b4e0aa4a0c660688d33ea30bd9b7e2c6 xvidcap-1.1.5_rc1.ebuild 1186 -RMD160 04df0f2909faa343bf9e5ab77ead8f6a79f4abf7 xvidcap-1.1.5_rc1.ebuild 1186 -SHA256 77c99a62ba75dfac59b522d0304cb0a793c95aa6da287f0381fa1b7a145b0ad6 xvidcap-1.1.5_rc1.ebuild 1186 -MISC ChangeLog 4465 RMD160 92e966fbcb337d22a36475963df451ebbf5423d7 SHA1 bb8f2894984615ab8cb053b5c100070fde49ae8f SHA256 7b295a36f0f8c4c0fee94af5ab3e93ee8172fd4781d744f4ed1a6af4e58a715e -MD5 4e20cddc235668c76de7d27c910c785f ChangeLog 4465 -RMD160 92e966fbcb337d22a36475963df451ebbf5423d7 ChangeLog 4465 -SHA256 7b295a36f0f8c4c0fee94af5ab3e93ee8172fd4781d744f4ed1a6af4e58a715e ChangeLog 4465 +EBUILD xvidcap-1.1.5_rc2.ebuild 1268 RMD160 9fe00302c510abc8acf77d0754316ae85796f0be SHA1 0909434ec5358da57304925a8bb9391d88af7cc9 SHA256 b95f6f7dfbce3e1a943cfb3d7b2dea3e9a3f06cfdfa99169a6d10793d33396dd +MD5 35279f2f6c94dbed445e0c859183410f xvidcap-1.1.5_rc2.ebuild 1268 +RMD160 9fe00302c510abc8acf77d0754316ae85796f0be xvidcap-1.1.5_rc2.ebuild 1268 +SHA256 b95f6f7dfbce3e1a943cfb3d7b2dea3e9a3f06cfdfa99169a6d10793d33396dd xvidcap-1.1.5_rc2.ebuild 1268 +MISC ChangeLog 4805 RMD160 73f43de30a741ad5f6267e8084b52652fa1bc2dd SHA1 59989887e6bc2f3882427ecefe307283f4cf3329 SHA256 af4765ed4a7a3c633407c10835ca617d6acdbaebc3fb400f8e763be00b958d80 +MD5 8ca3f8fe02e6bf811a1cc2c4e1e19a3f ChangeLog 4805 +RMD160 73f43de30a741ad5f6267e8084b52652fa1bc2dd ChangeLog 4805 +SHA256 af4765ed4a7a3c633407c10835ca617d6acdbaebc3fb400f8e763be00b958d80 ChangeLog 4805 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata.xml 166 -MD5 5916a838f5989d4c1c283888ef24bb5b files/digest-xvidcap-1.1.4 244 -RMD160 1540ce6627c9cbc70cf1ff3c0e934d955100ec8b files/digest-xvidcap-1.1.4 244 -SHA256 7ef96f227a9d7dc10b1d111739d4193e834cf7d8ca9e54ff62cb27be26f4a0f9 files/digest-xvidcap-1.1.4 244 MD5 164c233bad539af54d3bfbf11604a03e files/digest-xvidcap-1.1.4_rc1 253 RMD160 887e29c30f6635107a1f26440ae4daa0fcd27f9c files/digest-xvidcap-1.1.4_rc1 253 SHA256 80537b20385946efc650f02264f73e0c193a8138c55bab27bfb583e5241ccbfa files/digest-xvidcap-1.1.4_rc1 253 -MD5 2244230ff4243fb725bc608e16fa6fd0 files/digest-xvidcap-1.1.5_rc1 253 -RMD160 3cf118f555011c327c29ecd31c795ba037a662b4 files/digest-xvidcap-1.1.5_rc1 253 -SHA256 0c024899a3985118062dd88a056784ea9fa6eee53c76a8adc9331bf7079a2d84 files/digest-xvidcap-1.1.5_rc1 253 +MD5 f8ae3e5dcc73155a1c0c22de78f34160 files/digest-xvidcap-1.1.5_rc2 253 +RMD160 915c4910e4e741759bda2473db8455b83c48aa2f files/digest-xvidcap-1.1.5_rc2 253 +SHA256 51eeff5857bc6f76a3ac3a80f9b30bf38f0983316e6affa9edb870462ab03182 files/digest-xvidcap-1.1.5_rc2 253 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 similarity index 89% rename from x11-misc/xvidcap/xvidcap-1.1.5_rc1.ebuild rename to 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." -- 2.26.2