Version bump for bug 216078, thanks to Justin Clift for reporting and testing.

(Portage version: 2.1.5_rc5)

5 files changed, 20 insertions, 124 deletions

diff --git a/media-video/sswf/ChangeLog b/media-video/sswf/ChangeLog
index 64ec34713d57..74038d43accb 100644
--- a/media-video/sswf/ChangeLog
+++ b/media-video/sswf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/sswf
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sswf/ChangeLog,v 1.7 2007/11/27 12:01:26 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/sswf/ChangeLog,v 1.8 2008/04/21 17:20:42 drac Exp $
+
+*sswf-1.8.2 (21 Apr 2008)
+
+  21 Apr 2008; Samuli Suominen <drac@gentoo.org> -files/bitsize.patch,
+  -files/sound_wave_t.patch, -sswf-1.7.1.ebuild, -sswf-1.8.0-r1.ebuild,
+  +sswf-1.8.2.ebuild:
+  Version bump for bug 216078, thanks to Justin Clift for reporting and
+  testing.
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> sswf-1.7.1.ebuild:
   Fixed quoting.
diff --git a/media-video/sswf/files/bitsize.patch b/media-video/sswf/files/bitsize.patch
deleted file mode 100644
index 132a5102ac83..000000000000
--- a/media-video/sswf/files/bitsize.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- src.old/lib/libsswf_tags.c++	2005-01-14 03:27:39.000000000 -0500
-+++ src/lib/libsswf_tags.c++	2005-03-04 17:04:50.536424560 -0500
-@@ -3211,27 +3211,13 @@
- 
- 	if(value < 0) {
- 		// a special case
--		if(value == -1) {
--			return 1;
--		}
--		cnt = 33;
--		do {
--			cnt--;
--			value *= 2;
--		} while(value < 0);
-+		value =~ value;
- 	}
--	else {
--		// a special case
--		if(value == 0) {
--			return 1;
--		}
--		cnt = 33;
--		do {
--			cnt--;
--			value *= 2;
--		} while(value > 0);
-+	cnt = 1;
-+	while(value >0){
-+		cnt++;
-+		value = value / 2;
- 	}
--
- 	return cnt;
- }
- 
-@@ -3240,16 +3226,11 @@
- {
- 	long	cnt;
- 
--	// a special case
--	if(value == 0) {
--		return 1;
--	}
--	cnt = 32;
--	while((long) value > 0) {
--		cnt--;
--		value *= 2;
--	}
--
-+	cnt = 0;
-+	do {
-+		cnt++;
-+		value = value / 2;
-+	}while( value > 0); 
- 	return cnt;
- }
- 
diff --git a/media-video/sswf/files/sound_wave_t.patch b/media-video/sswf/files/sound_wave_t.patch
deleted file mode 100644
index f504656f1464..000000000000
--- a/media-video/sswf/files/sound_wave_t.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/sswf/libsswf.h.old	2005-01-14 03:27:39.000000000 -0500
-+++ include/sswf/libsswf.h	2005-03-08 23:38:40.524934320 -0500
-@@ -2157,8 +2157,9 @@
- 	struct sound_wave_t {
- 		short		format;			// the data format (we only support PCM)
- 		short		channels;		// number of channels (1 - mono, 2 - stereo)
--		long		rate;			// exact sample rate to play the sound at
--		long		avarage_rate;		// average rate for the entire set of samples (this may vary in compressed files)
-+/* rate and average_rate are 4 bytes each, long on some platforms is 8 bytes */
-+		int		rate;			// exact sample rate to play the sound at
-+		int		avarage_rate;		// average rate for the entire set of samples (this may vary in compressed files)
- 		short		align;			// byte alignment of the samples (every char, short, long...)
- 		/* the following is format dependent, but at this time doesn't vary for us */
- 		short		width;			// width of the samples (8 or 16)
diff --git a/media-video/sswf/sswf-1.7.1.ebuild b/media-video/sswf/sswf-1.7.1.ebuild
deleted file mode 100644
index bfe0aa5dd4e2..000000000000
--- a/media-video/sswf/sswf-1.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sswf/sswf-1.7.1.ebuild,v 1.4 2007/11/27 12:01:26 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 6."
-HOMEPAGE="http://sswf.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
-	doc? ( mirror://sourceforge/${PN}/${P}-doc.tar.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc debug"
-DEPEND="sys-libs/zlib
-	media-libs/jpeg
-	media-libs/freetype
-	sys-devel/flex
-	sys-devel/bison"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/bitsize.patch
-	epatch "${FILESDIR}"/sound_wave_t.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug) \
-		|| die "Configuration Failed!"
-
-	emake || die "Make Failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-}
diff --git a/media-video/sswf/sswf-1.8.0-r1.ebuild b/media-video/sswf/sswf-1.8.2.ebuild
index 134001b2c216..18f6fdfcaac1 100644
--- a/media-video/sswf/sswf-1.8.0-r1.ebuild
+++ b/media-video/sswf/sswf-1.8.2.ebuild
@@ -1,34 +1,32 @@
-# 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/sswf/sswf-1.8.0-r1.ebuild,v 1.1 2007/04/18 20:16:31 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sswf/sswf-1.8.2.ebuild,v 1.1 2008/04/21 17:20:42 drac Exp $
 
 DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 8."
 HOMEPAGE="http://sswf.sourceforge.net"
-SRC_URI="ftp://ftp.m2osw.com/${PN}/beta/${P}-src.tar.gz
-	ftp://ftp.m2osw.com/${PN}/beta/${P}-doc.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
+	mirror://sourceforge/${PN}/${P}-doc.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug doc examples"
 
-RDEPEND="sys-libs/zlib
-	media-libs/jpeg
-	media-libs/freetype
-	sys-devel/flex
-	sys-devel/bison"
+RDEPEND="media-libs/jpeg
+	media-libs/freetype"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
-	econf --disable-docs $(use_enable debug)
+	econf --disable-dependency-tracking --disable-docs \
+		$(use_enable debug) $(use_enable debug yydebug)
 	emake || die "emake failed."
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed."
 
-	dodoc README.txt doc/{NOTES,TODO,LINKS,AUTHORS,ASC-TODO,CHANGES}.txt
+	dodoc README.txt doc/{ASC-TODO,AUTHORS,CHANGES,LINKS,NOTES,TODO}.txt
 	rm -f "${D}"/usr/share/${PN}/*.txt
 
 	use examples || rm -rf "${D}"/usr/share/${PN}/samples