3.07 x86 stable, 3.10 version bump

(Portage version: 2.0.53_rc7)

8 files changed, 22 insertions, 55 deletions

diff --git a/media-gfx/album/ChangeLog b/media-gfx/album/ChangeLog
index de3c35b360be..09383e92032f 100644
--- a/media-gfx/album/ChangeLog
+++ b/media-gfx/album/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/album
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/ChangeLog,v 1.14 2005/09/09 00:42:06 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/ChangeLog,v 1.15 2005/11/12 14:37:12 vanquirius Exp $
+
+*album-3.10 (12 Nov 2005)
+
+  12 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> -album-2.44.ebuild,
+  -album-3.00.ebuild, album-3.07.ebuild, +album-3.10.ebuild:
+  3.07 x86 stable, 3.10 version bump.
 
   09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> album-3.07.ebuild:
   Add ~amd64 keyword. See bug 49688. Thanks to all testers.
diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index 6c59ea9ee043..ee4a4190d6fe 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -1,12 +1,10 @@
-MD5 cfb8c4e4f4884e485184f401319892fc album-2.44.ebuild 981
-MD5 869c6383bbb867dfe243c9b20e92dc96 album-3.05.ebuild 853
-MD5 d9470d8a8aa133b96d0c5d3a930d62ad album-3.00.ebuild 842
-MD5 4fc2ee195803285fb67a48fa34493012 album-3.07.ebuild 902
-MD5 ad799894df8b147b9ec85016e75867e4 album-2.52.ebuild 855
 MD5 2522732b3b863e436d0c3f6faceeeeb4 ChangeLog 1834
-MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
-MD5 1943128cd163fe0cfeee4673e6d14bb3 files/digest-album-2.44 127
+MD5 ad799894df8b147b9ec85016e75867e4 album-2.52.ebuild 855
+MD5 869c6383bbb867dfe243c9b20e92dc96 album-3.05.ebuild 853
+MD5 496a0a2b5260369baf06e40888edf412 album-3.07.ebuild 901
+MD5 4fc2ee195803285fb67a48fa34493012 album-3.10.ebuild 902
 MD5 6d281915e77f26a18007882af4c15c17 files/digest-album-2.52 61
-MD5 9e285abf7002d93721e358f2a489c4ae files/digest-album-3.00 61
 MD5 770fcb7e1b0874e8d067c1b63caae029 files/digest-album-3.05 61
 MD5 e124b73f09a588f2a2f1125343f0a5ff files/digest-album-3.07 61
+MD5 06f7ba4d6c5324c623c4dd70697a4f53 files/digest-album-3.10 62
+MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
diff --git a/media-gfx/album/album-2.44.ebuild b/media-gfx/album/album-2.44.ebuild
deleted file mode 100644
index e6f255c09246..000000000000
--- a/media-gfx/album/album-2.44.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-2.44.ebuild,v 1.6 2004/07/01 10:48:39 eradicator Exp $
-
-DESCRIPTION="HTML photo album generator"
-HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
-SRC_URI="http://MarginalHacks.com/bin/album.tar.gz
-	http://MarginalHacks.com/bin/album.versions/mpeg2decode.patch-1.tar.gz"
-
-LICENSE="marginalhacks"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="${DEPEND}
-	media-gfx/imagemagick
-	media-video/mpeg2vidcodec"
-
-S=${WORKDIR}
-
-src_install() {
-	dobin album
-	dodir /usr/share/${PN}
-	cp -R Themes/* ${D}/usr/share/${PN}/
-	dodoc mpeg2dec/{README,PATCH}
-	dohtml Documentation.html
-}
-
-pkg_postinst() {
-	einfo "For some optional themes please browse:"
-	einfo "http://MarginalHacks.com/Hacks/album/Themes/"
-	einfo
-	einfo "For some optional tools please browse:"
-	einfo "http://MarginalHacks.com/Hacks/album/tools/"
-}
diff --git a/media-gfx/album/album-3.07.ebuild b/media-gfx/album/album-3.07.ebuild
index 88e1fb858c88..76468443c4b2 100644
--- a/media-gfx/album/album-3.07.ebuild
+++ b/media-gfx/album/album-3.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-3.07.ebuild,v 1.3 2005/09/09 00:42:06 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-3.07.ebuild,v 1.4 2005/11/12 14:37:12 vanquirius Exp $
 
 DESCRIPTION="HTML photo album generator"
 HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
@@ -8,7 +8,7 @@ SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz"
 
 LICENSE="marginalhacks"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+KEYWORDS="x86 ~amd64 ~ppc ~ppc64"
 IUSE="ffmpeg"
 
 DEPEND="virtual/libc"
diff --git a/media-gfx/album/album-3.00.ebuild b/media-gfx/album/album-3.10.ebuild
index f2e9d7c7102e..277be37c3a41 100644
--- a/media-gfx/album/album-3.00.ebuild
+++ b/media-gfx/album/album-3.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-3.00.ebuild,v 1.2 2004/08/04 21:00:02 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-3.10.ebuild,v 1.1 2005/11/12 14:37:12 vanquirius Exp $
 
 DESCRIPTION="HTML photo album generator"
 HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
@@ -8,13 +8,14 @@ SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz"
 
 LICENSE="marginalhacks"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+IUSE="ffmpeg"
 
 DEPEND="virtual/libc"
 RDEPEND="dev-lang/perl
 	media-gfx/imagemagick
-	media-gfx/jhead"
+	media-gfx/jhead
+	ffmpeg? ( media-video/ffmpeg )"
 
 src_install() {
 	dobin album
diff --git a/media-gfx/album/files/digest-album-2.44 b/media-gfx/album/files/digest-album-2.44
deleted file mode 100644
index 419a07ab4c46..000000000000
--- a/media-gfx/album/files/digest-album-2.44
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bda62099a60f6a9a712533cc93625871 album.tar.gz 325317
-MD5 5760a7383f8186f0488c47aeb0f4f4f2 mpeg2decode.patch-1.tar.gz 40995
diff --git a/media-gfx/album/files/digest-album-3.00 b/media-gfx/album/files/digest-album-3.00
deleted file mode 100644
index 7734ad350c3f..000000000000
--- a/media-gfx/album/files/digest-album-3.00
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97ae9b7d2e908af03205b07fd3ff0fd3 album-3.00.tar.gz 84603
diff --git a/media-gfx/album/files/digest-album-3.10 b/media-gfx/album/files/digest-album-3.10
new file mode 100644
index 000000000000..96eec59390a9
--- /dev/null
+++ b/media-gfx/album/files/digest-album-3.10
@@ -0,0 +1 @@
+MD5 9cbbb650db20a2b0db0e77eccf25672b album-3.10.tar.gz 117748