clean up these ebuilds

8 files changed, 42 insertions, 173 deletions

diff --git a/media-video/camserv/ChangeLog b/media-video/camserv/ChangeLog
index 4aec6d4e16ba..3ffffd298ec4 100644
--- a/media-video/camserv/ChangeLog
+++ b/media-video/camserv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/camserv
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.10 2004/04/27 20:52:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.11 2004/06/11 13:53:20 vapier Exp $
+
+  11 Jun 2004; Mike Frysinger <vapier@gentoo.org> camserv-0.5.0.ebuild,
+  -camserv-0.5.1-r1.ebuild, camserv-0.5.1-r2.ebuild, -camserv-0.5.1.ebuild:
+  Fix the ugly hack to work around the old libtool configure files.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> camserv-0.5.1-r1.ebuild,
   camserv-0.5.1-r2.ebuild, camserv-0.5.1.ebuild:
diff --git a/media-video/camserv/Manifest b/media-video/camserv/Manifest
index 7e2398bec429..6e3118df6392 100644
--- a/media-video/camserv/Manifest
+++ b/media-video/camserv/Manifest
@@ -1,11 +1,17 @@
-MD5 05b98c7aa8904624f7a2e708dc5f8a27 ChangeLog 1787
-MD5 c3351723bfe151e450525c68c3b2baf4 camserv-0.5.0.ebuild 807
-MD5 0084e9f349955323923e8bdc2fb8e7d6 camserv-0.5.1-r1.ebuild 1189
-MD5 7143408d4bcff2289b93b80124bb1ab4 camserv-0.5.1.ebuild 795
-MD5 13ccd23641ed334b7ed5e0a854e9cfc8 camserv-0.5.1-r2.ebuild 1301
-MD5 c473cf955721d867b267d2ca2c0d32ae files/digest-camserv-0.5.0 65
-MD5 0cc8188d6f8abfc2eb25e9b9352283ac files/digest-camserv-0.5.1 65
-MD5 0cc8188d6f8abfc2eb25e9b9352283ac files/digest-camserv-0.5.1-r1 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47cd9e13f8a8e90935ed413cd5a5f530 ChangeLog 2001
+MD5 794e0e3e37f63acb2cfdc7a06c411124 camserv-0.5.0.ebuild 731
+MD5 115596943f20a06dc6ba0b5395fbed3b camserv-0.5.1-r2.ebuild 845
+MD5 fb27a1787753b6c9ee46b573c6b8fc5e files/camserv-0.5-errno.patch 3105
 MD5 e071f954a6684d1a34a7afe4efe807bc files/camserv.init 561
+MD5 c473cf955721d867b267d2ca2c0d32ae files/digest-camserv-0.5.0 65
 MD5 0cc8188d6f8abfc2eb25e9b9352283ac files/digest-camserv-0.5.1-r2 65
-MD5 fb27a1787753b6c9ee46b573c6b8fc5e files/camserv-0.5-errno.patch 3105
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFAybpOHTu7gpaalycRAkMNAKC9uZlsJlVRA25ihOH5bkqC/+BotACg3cUj
+auAycVFB5cZ+QVqWvB82R+M=
+=itK0
+-----END PGP SIGNATURE-----
diff --git a/media-video/camserv/camserv-0.5.0.ebuild b/media-video/camserv/camserv-0.5.0.ebuild
index 3cba70d6e7c4..12afee5f5f41 100644
--- a/media-video/camserv/camserv-0.5.0.ebuild
+++ b/media-video/camserv/camserv-0.5.0.ebuild
@@ -1,41 +1,30 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.0.ebuild,v 1.10 2004/04/27 20:52:02 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.0.ebuild,v 1.11 2004/06/11 13:53:20 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A streaming video server."
-SRC_URI="http://cserv.sourceforge.net/current/${P}.tar.gz"
+DESCRIPTION="A streaming video server"
 HOMEPAGE="http://cserv.sourceforge.net/"
+SRC_URI="http://cserv.sourceforge.net/current/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=media-libs/jpeg-6b-r2
 	>=media-libs/imlib-1.9.13-r2"
 
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-0.5-errno.patch
 }
 
-src_compile() {
-
-	econf || die
-	emake || die
-
-}
-
-src_install () {
-
+src_install() {
 	einstall datadir=${D}/usr/share/${PN} || die
 
-	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO javascript.txt
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO javascript.txt
 	dohtml defpage.html
-
 }
diff --git a/media-video/camserv/camserv-0.5.1-r1.ebuild b/media-video/camserv/camserv-0.5.1-r1.ebuild
deleted file mode 100644
index 5d745989ed19..000000000000
--- a/media-video/camserv/camserv-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r1.ebuild,v 1.5 2004/04/27 20:52:02 agriffis Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A streaming video server."
-SRC_URI="mirror://sourceforge/cserv/${P}.tar.gz"
-HOMEPAGE="http://cserv.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=media-libs/jpeg-6b-r2
-	>=media-libs/imlib-1.9.13-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.5-errno.patch
-}
-
-src_compile() {
-
-	_CC="${CC}"
-	_CFLAGS="${CFLAGS}"
-	_CXXFLAGS="${CXXFLAGS}"
-	_CHOST="${CHOST}"
-	unset CC
-	unset CFLAGS
-	unset CXXFLAGS
-	unset CHOST
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib || die "./configure failed"
-
-	CC="${_CC}"
-	CFLAGS="${_CFLAGS}"
-	CXXFLAGS="${_CXXFLAGS}"
-	CHOST="${_CHOST}"
-
-	emake || die
-
-}
-
-src_install () {
-
-	einstall datadir=${D}/usr/share/${PN} || die
-
-	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO javascript.txt
-	dohtml defpage.html
-
-}
diff --git a/media-video/camserv/camserv-0.5.1-r2.ebuild b/media-video/camserv/camserv-0.5.1-r2.ebuild
index 0bd90363e1e1..b5fce1ae64fc 100644
--- a/media-video/camserv/camserv-0.5.1-r2.ebuild
+++ b/media-video/camserv/camserv-0.5.1-r2.ebuild
@@ -1,64 +1,35 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4 2004/04/27 20:52:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.5 2004/06/11 13:53:20 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A streaming video server."
-SRC_URI="mirror://sourceforge/cserv/${P}.tar.gz"
+DESCRIPTION="A streaming video server"
 HOMEPAGE="http://cserv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cserv/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=media-libs/jpeg-6b-r2
-	>=media-libs/imlib-1.9.13-r2"
+	>=media-libs/imlib-1.9.13-r2
+	>=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-0.5-errno.patch
+	cd libltdl
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
 }
 
-src_compile() {
-
-	_CC="${CC}"
-	_CFLAGS="${CFLAGS}"
-	_CXXFLAGS="${CXXFLAGS}"
-	_CHOST="${CHOST}"
-	unset CC
-	unset CFLAGS
-	unset CXXFLAGS
-	unset CHOST
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib || die "./configure failed"
-
-	CC="${_CC}"
-	CFLAGS="${_CFLAGS}"
-	CXXFLAGS="${_CXXFLAGS}"
-	CHOST="${_CHOST}"
-
-	emake || die
-
-}
-
-src_install () {
-
-	einstall datadir=${D}/usr/share/${PN} || die
+src_install() {
+	make install DESTDIR=${D} || die
 
-	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO javascript.txt
-	dohtml defpage.html
-	# new init script
-	insinto /etc/init.d
-	newins ${FILESDIR}/camserv.init camserv
-	fperms +x /etc/init.d/camserv
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO javascript.txt
 
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/camserv.init camserv
 }
diff --git a/media-video/camserv/camserv-0.5.1.ebuild b/media-video/camserv/camserv-0.5.1.ebuild
deleted file mode 100644
index cfbaec03636a..000000000000
--- a/media-video/camserv/camserv-0.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1.ebuild,v 1.4 2004/04/27 20:52:02 agriffis Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A streaming video server."
-SRC_URI="mirror://sourceforge/cserv/${P}.tar.gz"
-HOMEPAGE="http://cserv.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=media-libs/jpeg-6b-r2
-	>=media-libs/imlib-1.9.13-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.5-errno.patch
-}
-
-src_compile() {
-
-	econf || die
-	emake || die
-
-}
-
-src_install () {
-
-	einstall datadir=${D}/usr/share/${PN} || die
-
-	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO javascript.txt
-	dohtml defpage.html
-
-}
diff --git a/media-video/camserv/files/digest-camserv-0.5.1 b/media-video/camserv/files/digest-camserv-0.5.1
deleted file mode 100644
index f567dc140232..000000000000
--- a/media-video/camserv/files/digest-camserv-0.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad6a1c9a5b522a4ee2189c66d7fbda72 camserv-0.5.1.tar.gz 487645
diff --git a/media-video/camserv/files/digest-camserv-0.5.1-r1 b/media-video/camserv/files/digest-camserv-0.5.1-r1
deleted file mode 100644
index f567dc140232..000000000000
--- a/media-video/camserv/files/digest-camserv-0.5.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad6a1c9a5b522a4ee2189c66d7fbda72 camserv-0.5.1.tar.gz 487645