media-sound/mad updates

5 files changed, 112 insertions, 12 deletions

diff --git a/app-misc/evidence/ChangeLog b/app-misc/evidence/ChangeLog
index d2d076a5dd39..ab1f87820a82 100644
--- a/app-misc/evidence/ChangeLog
+++ b/app-misc/evidence/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/evidence
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/evidence/ChangeLog,v 1.8 2003/06/30 04:18:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/evidence/ChangeLog,v 1.9 2003/07/18 13:05:12 raker Exp $
+
+*evidence-0.9.6.20030629_pre1-r1 (18 Jul 2003)
+
+  18 Jul 2003; Nick Hadaway <raker@gentoo.org> 
+  evidence-0.9.6.20030629-{,r1}.ebuild:
+  Fixed invalid USE variables and added support for 
+  media-libs/{libmad,libid3tag} instead of media-sound/mad
 
 *evidence-0.9.6.20030629_pre1 (30 Jun 2003)
 
diff --git a/app-misc/evidence/Manifest b/app-misc/evidence/Manifest
index fb0a4207d8db..faab41cd945c 100644
--- a/app-misc/evidence/Manifest
+++ b/app-misc/evidence/Manifest
@@ -1,6 +1,8 @@
-MD5 50a05a2589e9e1fee69274dcbed65eeb files/digest-evidence-0.9.6.20030629_pre1 82
+MD5 689e70bbbd459e0d6adf912da6284800 evidence-0.9.6.20030629_pre1.ebuild 2436
+MD5 bfedf4e9ef31d9cba581caeace90814c evidence-0.9.6.20030629_pre1-r1.ebuild 2459
+MD5 f73fddc66a5ab2fbaafa2ea5c80ffea8 evidence-0.9.4.20030220-r2.ebuild 2204
+MD5 fae4f3a46029f42f994df121197a7c9b ChangeLog 1652
 MD5 5429bbafbe264bdce537fe2f6f027622 files/digest-evidence-0.9.4.20030220-r2 77
+MD5 50a05a2589e9e1fee69274dcbed65eeb files/digest-evidence-0.9.6.20030629_pre1-r1 82
 MD5 e43a7922d7bbbbc6a859880fdafbc173 files/evidence-info-direntry.patch 326
-MD5 a6dc1fd28575efdeb34319aa1bbf6389 ChangeLog 1403
-MD5 127c253dacbeaa7404e360f5d4af16b0 evidence-0.9.6.20030629_pre1.ebuild 2564
-MD5 f73fddc66a5ab2fbaafa2ea5c80ffea8 evidence-0.9.4.20030220-r2.ebuild 2204
+MD5 50a05a2589e9e1fee69274dcbed65eeb files/digest-evidence-0.9.6.20030629_pre1 82
diff --git a/app-misc/evidence/evidence-0.9.6.20030629_pre1-r1.ebuild b/app-misc/evidence/evidence-0.9.6.20030629_pre1-r1.ebuild
new file mode 100644
index 000000000000..1d40f51d6ca2
--- /dev/null
+++ b/app-misc/evidence/evidence-0.9.6.20030629_pre1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/evidence/evidence-0.9.6.20030629_pre1-r1.ebuild,v 1.1 2003/07/18 13:05:12 raker Exp $
+
+inherit enlightenment eutils
+
+DESCRIPTION="GTK2 file-manager"
+HOMEPAGE="http://evidence.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~ppc"
+IUSE="${IUSE} perl X mad oggvorbis truetype"
+
+#	gnome? ( >=gnome-base/gnome-vfs-2.0 >=gnome-base/libgnomecanvas-2.0 )
+DEPEND=">=dev-util/pkgconfig-0.5
+	=x11-libs/gtk+-2*
+	oggvorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	perl? ( dev-libs/libpcre )
+	X? ( virtual/x11 )
+	gnome? ( >=gnome-base/gnome-vfs-2.0
+		>=media-libs/libart_lgpl-2.0
+		>=gnome-base/libgnomecanvas-2.0 )
+	mad? ( media-libs/libmad media-libs/libid3tag )
+	truetype? ( =media-libs/freetype-2* )
+	media-libs/libao
+	virtual/glibc
+	sys-devel/gcc
+	app-admin/fam-oss
+	>=sys-apps/efsd-0.0.1.2003*
+	>=x11-libs/evas-1.0.0.2003*
+	>=dev-db/edb-1.0.3.2003*
+	>=dev-libs/eet-0.0.1.2003*
+	>=media-libs/ebg-1.0.0.2003*
+	>=media-libs/ebits-1.0.1.2003*
+	>=media-libs/imlib2-1.0.6.2003*"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-info-direntry.patch || die "patch failed"
+
+	for x in evidence.themes/engines/sb_edb.c setup/* ; do
+		if [ -f "${x}" ] ; then
+			cp ${x} ${x}.orig
+			sed -e 's|usr/local|usr|g' ${x}.orig > ${x}
+			rm -f ${x}.orig
+		fi
+	done
+}
+
+src_compile() {
+	env NOCONFIGURE=no WANT_AUTOCONF_2_5=1 \
+	./autogen.sh || die "could not autogen"
+
+	# causes compilation to fail: [has undefine constants]
+	# --enable-backend-script
+	#use gnome && myconf="${myconf} --enable-backend-gnomevfs --enable-canvas-gnomecanvas"
+
+	# cannot use use_enable constructs because configure script is wrong
+	local myconf=""
+	use perl || myconf="${myconf} --disable-pcre"
+	use X || myconf="${myconf} --disable-x"
+	use mad || myconf="${myconf} --disable-libmad"
+	use oggvorbis || myconf="${myconf} --disable-plugin-vorbis"
+	use truetype || myconf="${myconf} --disable-plugin-ttf"
+
+	econf \
+		${myconf} \
+		--enable-backend-efsd \
+		--enable-extra-themes \
+		--enable-extra-iconsets \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	
+	find ${D} -name CVS -type d -exec rm -rf '{}' \;
+
+	# Fixup broken symlinks
+	dosym gfilerunner /usr/share/evidence/icons/default
+	dosym efm /usr/share/evidence/themes/default
+
+	dodoc AUTHORS ChangeLog NEWS README docs/*
+}
diff --git a/app-misc/evidence/evidence-0.9.6.20030629_pre1.ebuild b/app-misc/evidence/evidence-0.9.6.20030629_pre1.ebuild
index fd4a716bbd78..e2b38b2b6363 100644
--- a/app-misc/evidence/evidence-0.9.6.20030629_pre1.ebuild
+++ b/app-misc/evidence/evidence-0.9.6.20030629_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/evidence/evidence-0.9.6.20030629_pre1.ebuild,v 1.2 2003/06/30 23:56:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/evidence/evidence-0.9.6.20030629_pre1.ebuild,v 1.3 2003/07/18 13:05:12 raker Exp $
 
 inherit enlightenment eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://evidence.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~ppc"
-IUSE="${IUSE} perl X libao libmad oggvorbis id3 truetype"
+IUSE="${IUSE} perl X mad oggvorbis truetype"
 
 #	gnome? ( >=gnome-base/gnome-vfs-2.0 >=gnome-base/libgnomecanvas-2.0 )
 DEPEND=">=dev-util/pkgconfig-0.5
@@ -22,9 +22,9 @@ DEPEND=">=dev-util/pkgconfig-0.5
 	gnome? ( >=gnome-base/gnome-vfs-2.0
 		>=media-libs/libart_lgpl-2.0
 		>=gnome-base/libgnomecanvas-2.0 )
-	libao? ( media-libs/libao )
-	libmad? ( media-sound/mad )
+	mad? ( media-sound/mad )
 	truetype? ( =media-libs/freetype-2* )
+	media-libs/libao
 	virtual/glibc
 	sys-devel/gcc
 	app-admin/fam-oss
@@ -65,10 +65,8 @@ src_compile() {
 	local myconf=""
 	use perl || myconf="${myconf} --disable-pcre"
 	use X || myconf="${myconf} --disable-x"
-	use libao || myconf="${myconf} --disable-ao"
-	use libmad || myconf="${myconf} --disable-libmad"
+	use mad || myconf="${myconf} --disable-libmad"
 	use oggvorbis || myconf="${myconf} --disable-plugin-vorbis"
-	use id3 || myconf="${myconf} --disable-plugin-id3"
 	use truetype || myconf="${myconf} --disable-plugin-ttf"
 
 	econf \
diff --git a/app-misc/evidence/files/digest-evidence-0.9.6.20030629_pre1-r1 b/app-misc/evidence/files/digest-evidence-0.9.6.20030629_pre1-r1
new file mode 100644
index 000000000000..23c9fd01e413
--- /dev/null
+++ b/app-misc/evidence/files/digest-evidence-0.9.6.20030629_pre1-r1
@@ -0,0 +1 @@
+MD5 a837a39255ee138dd761a5b34c079d4b evidence-0.9.6.20030629_pre1.tar.bz2 4623388