Attempt to fix broken libtool handling wrt #188149.

Package-Manager: portage-2.1.4

5 files changed, 141 insertions, 40 deletions

diff --git a/media-video/camserv/ChangeLog b/media-video/camserv/ChangeLog
index d9c7b3747e15..c103bd5ff57d 100644
--- a/media-video/camserv/ChangeLog
+++ b/media-video/camserv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/camserv
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.19 2007/11/27 11:58:01 zzam Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.20 2008/01/22 13:57:39 drac Exp $
+
+  22 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/camserv-0.5.1-libtool.patch, +files/camserv-0.5.1-memcpy.patch,
+  camserv-0.5.1-r2.ebuild:
+  Attempt to fix broken libtool handling wrt #188149.
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org>
   camserv-0.5.1-r2.ebuild:
diff --git a/media-video/camserv/Manifest b/media-video/camserv/Manifest
index bf25cb73590d..901336fc10a5 100644
--- a/media-video/camserv/Manifest
+++ b/media-video/camserv/Manifest
@@ -1,23 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX camserv-0.5-errno.patch 3105 RMD160 f6722b8eb4568bae063acffd44f09ea6d2f80aec SHA1 5abaffdc05c721e987f4c0c383118bb6f69c9349 SHA256 b5ac3c1de498c7ab5595708544d66b84e48d4759a3354b1f648851ee02a45357
 MD5 fb27a1787753b6c9ee46b573c6b8fc5e files/camserv-0.5-errno.patch 3105
 RMD160 f6722b8eb4568bae063acffd44f09ea6d2f80aec files/camserv-0.5-errno.patch 3105
 SHA256 b5ac3c1de498c7ab5595708544d66b84e48d4759a3354b1f648851ee02a45357 files/camserv-0.5-errno.patch 3105
+AUX camserv-0.5.1-libtool.patch 2936 RMD160 d88a835753194167cd91d6c9482a8ed9c94f1a90 SHA1 272bf97dfabc8a165e522d4794759936a714ae0c SHA256 8890596b0f7f659908185adb967abde87cbb499ae90f2c988fdcbd320cd52be3
+MD5 b2d0e0077edb24f329d12815eedec183 files/camserv-0.5.1-libtool.patch 2936
+RMD160 d88a835753194167cd91d6c9482a8ed9c94f1a90 files/camserv-0.5.1-libtool.patch 2936
+SHA256 8890596b0f7f659908185adb967abde87cbb499ae90f2c988fdcbd320cd52be3 files/camserv-0.5.1-libtool.patch 2936
+AUX camserv-0.5.1-memcpy.patch 382 RMD160 db3d8fcf080bf32051701444d3589cb859162484 SHA1 15eb11db8b4233a5dc60fce9c21bb8f927f0a15b SHA256 6c105afe1f44fed8717dd095866bb3104938c3a5bb0f56a87dfbba2f7fe76132
+MD5 35937e78fcb262e2daf2a17e50fb0554 files/camserv-0.5.1-memcpy.patch 382
+RMD160 db3d8fcf080bf32051701444d3589cb859162484 files/camserv-0.5.1-memcpy.patch 382
+SHA256 6c105afe1f44fed8717dd095866bb3104938c3a5bb0f56a87dfbba2f7fe76132 files/camserv-0.5.1-memcpy.patch 382
 AUX camserv.init 553 RMD160 892e90e073c20615ac44f4f4be679ebae54147b9 SHA1 b1a5a9342d46d78556fccac66e839b4a264375e6 SHA256 f0abc4ef202d1bc24acfba85103e46b4aba3712a3f39bdd6a4558199d0163fb1
 MD5 bf0782107eda233c33ce533acf362e48 files/camserv.init 553
 RMD160 892e90e073c20615ac44f4f4be679ebae54147b9 files/camserv.init 553
 SHA256 f0abc4ef202d1bc24acfba85103e46b4aba3712a3f39bdd6a4558199d0163fb1 files/camserv.init 553
 DIST camserv-0.5.1.tar.gz 487645 RMD160 053f54f96cbb387f8657a424ab5775d158cd80ba SHA1 660e3aa127a042c9be3dd9ec768098834e6dce06 SHA256 034c08aac228587a1c46d35e345e1be653f5149bb4648b3e5ef937ccd5e5b24f
-EBUILD camserv-0.5.1-r2.ebuild 1018 RMD160 77da9c7a79a10c3d0cfdd8250bef7fd7484ffb49 SHA1 35ae9c845b249cf2cd9989925d0221d7132bd71c SHA256 4e60812bb24b3da9ee7066aca9bb59696af4bb69c797929a22c159d153e7b224
-MD5 4e55c746b68e1b77e3936c572028fbd4 camserv-0.5.1-r2.ebuild 1018
-RMD160 77da9c7a79a10c3d0cfdd8250bef7fd7484ffb49 camserv-0.5.1-r2.ebuild 1018
-SHA256 4e60812bb24b3da9ee7066aca9bb59696af4bb69c797929a22c159d153e7b224 camserv-0.5.1-r2.ebuild 1018
-MISC ChangeLog 2878 RMD160 188d31876a00dfd7cab5e380645871716a359940 SHA1 4a2619008c6634b017f15abe6f8d93ff2f571410 SHA256 06d6f5b34d66f9d3b4a30a1402177d35f8b409f81a933f8f56fd9298aba91231
-MD5 bdad8c753116aa75794de000698f4c88 ChangeLog 2878
-RMD160 188d31876a00dfd7cab5e380645871716a359940 ChangeLog 2878
-SHA256 06d6f5b34d66f9d3b4a30a1402177d35f8b409f81a933f8f56fd9298aba91231 ChangeLog 2878
+EBUILD camserv-0.5.1-r2.ebuild 930 RMD160 3839ff7d0f1b4ef1741c58c529ab4ed693ba85ec SHA1 dc8966af9e9f61292f2629c41c513b501f14a89e SHA256 b5e324edc01807751edb31780183dff1b1ec55085dd42757d43aea49de6774cf
+MD5 b2fcd218e01b78512698c94972ac3d44 camserv-0.5.1-r2.ebuild 930
+RMD160 3839ff7d0f1b4ef1741c58c529ab4ed693ba85ec camserv-0.5.1-r2.ebuild 930
+SHA256 b5e324edc01807751edb31780183dff1b1ec55085dd42757d43aea49de6774cf camserv-0.5.1-r2.ebuild 930
+MISC ChangeLog 3082 RMD160 3268cc48034ff49d03ea3f3b0a2a23a19b47193f SHA1 24e73658ea4f4de55c6448004f3eb60299f0049e SHA256 0f41777ffec8799d2e120570dbee1cabdf0f701a18605d10f64416ba7082a0b9
+MD5 5dcf8d396327895e1c9e176fc8d3a1f8 ChangeLog 3082
+RMD160 3268cc48034ff49d03ea3f3b0a2a23a19b47193f ChangeLog 3082
+SHA256 0f41777ffec8799d2e120570dbee1cabdf0f701a18605d10f64416ba7082a0b9 ChangeLog 3082
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -25,10 +30,3 @@ SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata
 MD5 cfdc6097dc4db0c922337ecd614a410c files/digest-camserv-0.5.1-r2 241
 RMD160 fd64f0c7c69a965ca65446f8ce51d1354d2b9122 files/digest-camserv-0.5.1-r2 241
 SHA256 e6b749898bdecf9080b18d16598a172bd1412d709c75fb48bc6ffb93c138237a files/digest-camserv-0.5.1-r2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHTAZPt2vP6XvVdOcRArneAJ40aIQL7rKfSPLz3VhOWyadwysFMQCgj/Xm
-OqJMrUJhqENLjImVSmnKM1c=
-=BVUd
------END PGP SIGNATURE-----
diff --git a/media-video/camserv/camserv-0.5.1-r2.ebuild b/media-video/camserv/camserv-0.5.1-r2.ebuild
index bb1257d1a935..5665d90f7634 100644
--- a/media-video/camserv/camserv-0.5.1-r2.ebuild
+++ b/media-video/camserv/camserv-0.5.1-r2.ebuild
@@ -1,41 +1,36 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.10 2007/11/27 11:58:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.11 2008/01/22 13:57:39 drac Exp $
 
-inherit eutils autotools
+WANT_AUTOCONF=2.5
+WANT_AUTOMAKE=1.6
+
+inherit autotools eutils
 
 DESCRIPTION="A streaming video server"
-HOMEPAGE="http://cserv.sourceforge.net/"
+HOMEPAGE="http://cserv.sourceforge.net"
 SRC_URI="mirror://sourceforge/cserv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND=">=media-libs/jpeg-6b-r2
-	>=media-libs/imlib-1.9.13-r2"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	=sys-devel/automake-1.6*
-	sys-devel/libtool"
+RDEPEND="media-libs/jpeg
+	media-libs/imlib"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
-	# make sure it uses autoconf 2.5 as there seems to be problems.
-	# See bug #106013
-	export WANT_AUTOCONF="2.5"
-	export WANT_AUTOMAKE="1.6"
-
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.5-errno.patch"
+	epatch "${FILESDIR}"/${P/.1}-errno.patch
+	epatch "${FILESDIR}"/${P}-libtool.patch
+	epatch "${FILESDIR}"/${P}-memcpy.patch
 	AT_M4DIR="${S}/macros" eautoreconf
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS BUGS ChangeLog NEWS README TODO javascript.txt
-
 	newinitd "${FILESDIR}"/camserv.init camserv
 }
diff --git a/media-video/camserv/files/camserv-0.5.1-libtool.patch b/media-video/camserv/files/camserv-0.5.1-libtool.patch
new file mode 100644
index 000000000000..f7b1e478537c
--- /dev/null
+++ b/media-video/camserv/files/camserv-0.5.1-libtool.patch
@@ -0,0 +1,92 @@
+diff -ur camserv-0.5.1.orig/camserv/filter.c camserv-0.5.1/camserv/filter.c
+--- camserv-0.5.1.orig/camserv/filter.c	2002-05-12 21:05:55.000000000 +0300
++++ camserv-0.5.1/camserv/filter.c	2008-01-22 15:43:05.000000000 +0200
+@@ -20,8 +20,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <ltdl.h>
+ 
+-#include "ltdl.h"
+ #include "log.h"
+ #include "camconfig.h"
+ #include "filter.h"
+diff -ur camserv-0.5.1.orig/camserv/Makefile.am camserv-0.5.1/camserv/Makefile.am
+--- camserv-0.5.1.orig/camserv/Makefile.am	2002-09-16 01:17:54.000000000 +0300
++++ camserv-0.5.1/camserv/Makefile.am	2008-01-22 15:48:37.000000000 +0200
+@@ -5,8 +5,7 @@
+ LDFLAGS  = @LDFLAGS@ -export-dynamic
+ 
+ bin_PROGRAMS = camserv
+-camserv_LDADD        = $(LIBLTDL) $(top_srcdir)/common/libcommon.a
+-camserv_DEPENDENCIES = $(LIBLTDL)
++camserv_LDADD        = -lltdl $(top_srcdir)/common/libcommon.a
+ camserv_SOURCES= \
+ 	camconfig.c	\
+ 	camserv.c	\
+diff -ur camserv-0.5.1.orig/camserv/video.c camserv-0.5.1/camserv/video.c
+--- camserv-0.5.1.orig/camserv/video.c	2002-05-12 21:05:55.000000000 +0300
++++ camserv-0.5.1/camserv/video.c	2008-01-22 15:43:05.000000000 +0200
+@@ -20,8 +20,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <ltdl.h>
+ 
+-#include "ltdl.h"
+ #include "log.h"
+ #include "video.h"
+ 
+diff -ur camserv-0.5.1.orig/common/Makefile.am camserv-0.5.1/common/Makefile.am
+--- camserv-0.5.1.orig/common/Makefile.am	2002-09-16 00:33:10.000000000 +0300
++++ camserv-0.5.1/common/Makefile.am	2008-01-22 15:43:05.000000000 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(srcdir)/include -I${top_srcdir}/libltdl
++INCLUDES = -I$(srcdir)/include
+ CFLAGS = @CFLAGS@ -g -DNDEBUG
+ 
+ common_sources =      \
+diff -ur camserv-0.5.1.orig/common/modinfo.c camserv-0.5.1/common/modinfo.c
+--- camserv-0.5.1.orig/common/modinfo.c	2002-05-12 21:05:55.000000000 +0300
++++ camserv-0.5.1/common/modinfo.c	2008-01-22 15:43:05.000000000 +0200
+@@ -20,9 +20,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <ltdl.h>
+ 
+ #include "log.h"
+-#include "ltdl.h"
+ #include "modinfo.h"
+ 
+ #define MODNAME "modinfo"
+diff -ur camserv-0.5.1.orig/configure.in camserv-0.5.1/configure.in
+--- camserv-0.5.1.orig/configure.in	2002-05-12 21:06:12.000000000 +0300
++++ camserv-0.5.1/configure.in	2008-01-22 15:48:17.000000000 +0200
+@@ -12,12 +12,8 @@
+ AM_ACLOCAL_INCLUDE(macros)
+ 
+ AC_PROG_CC
+-AC_LIBLTDL_CONVENIENCE
+-AC_LIBTOOL_DLOPEN
+-AM_PROG_LIBTOOL
+-AC_SUBST(LIBLTDL)
+ 
+-AC_CONFIG_SUBDIRS(libltdl)
++AC_PROG_LIBTOOL
+ 
+ AC_CHECK_LIB(m,sqrt)
+ AC_CHECK_LIB(jpeg,jpeg_start_compress)
+diff -ur camserv-0.5.1.orig/Makefile.am camserv-0.5.1/Makefile.am
+--- camserv-0.5.1.orig/Makefile.am	2002-03-11 02:52:29.000000000 +0200
++++ camserv-0.5.1/Makefile.am	2008-01-22 15:43:05.000000000 +0200
+@@ -4,8 +4,7 @@
+ 
+ datadir = @datadir@/camserv
+ 
+-SUBDIRS = 	libltdl \
+-		common \
++SUBDIRS = 	common \
+ 		${camserv_subdir} \
+ 		include \
+ 		macros  \
diff --git a/media-video/camserv/files/camserv-0.5.1-memcpy.patch b/media-video/camserv/files/camserv-0.5.1-memcpy.patch
new file mode 100644
index 000000000000..d3daa1cad3dc
--- /dev/null
+++ b/media-video/camserv/files/camserv-0.5.1-memcpy.patch
@@ -0,0 +1,11 @@
+diff -ur camserv-0.5.1.orig/camserv/jpg_filter.c camserv-0.5.1/camserv/jpg_filter.c
+--- camserv-0.5.1.orig/camserv/jpg_filter.c	2002-05-12 21:05:55.000000000 +0300
++++ camserv-0.5.1/camserv/jpg_filter.c	2008-01-22 01:41:14.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
++#include <string.h>
+ 
+ #include "camserv.h"
+ #include "log.h"