tweak tweak some sense is what i need

(Portage version: 2.0.51.19)

6 files changed, 26 insertions, 44 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index b1bcbcb97356..e75295f4d713 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gnome-media
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.75 2005/05/06 11:28:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.76 2005/06/06 13:28:38 foser Exp $
+
+  06 Jun 2005; Marinus Schraal <foser@gentoo.org> gnome-media-2*.ebuild :
+  Add workaround for #92920
 
   06 May 2005; Markus Rothe <corsair@gentoo.org> gnome-media-2.10.0.ebuild,
   gnome-media-2.10.2.ebuild:
diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-2.6.2 b/gnome-extra/gnome-media/files/digest-gnome-media-2.6.2
deleted file mode 100644
index 99f7b0e0b81b..000000000000
--- a/gnome-extra/gnome-media/files/digest-gnome-media-2.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1eb2d95f29ae908a6fd3c5295e3d740d gnome-media-2.6.2.tar.bz2 2970530
diff --git a/gnome-extra/gnome-media/gnome-media-2.10.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.10.0.ebuild
index 04e3be09d1c6..e3b2629e89e6 100644
--- a/gnome-extra/gnome-media/gnome-media-2.10.0.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.10.0.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/gnome-extra/gnome-media/gnome-media-2.10.0.ebuild,v 1.4 2005/06/05 18:57:46 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.10.0.ebuild,v 1.5 2005/06/06 13:28:38 foser Exp $
 
 inherit gnome2
 
@@ -42,3 +42,9 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 G2CONF="${G2CONF} $(use_enable ipv6) --disable-esdtest"
 
 USE_DESTDIR="1"
+
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
diff --git a/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild b/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild
index 5aa595f64613..be1eb0d319c5 100644
--- a/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.10.2.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/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild,v 1.2 2005/05/06 11:28:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild,v 1.3 2005/06/06 13:28:38 foser Exp $
 
 inherit gnome2
 
@@ -42,3 +42,10 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 G2CONF="${G2CONF} $(use_enable ipv6) --disable-esdtest"
 
 USE_DESTDIR="1"
+
+src_install() {
+
+	# fix #92920 FIXME
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
diff --git a/gnome-extra/gnome-media/gnome-media-2.6.2.ebuild b/gnome-extra/gnome-media/gnome-media-2.6.2.ebuild
deleted file mode 100644
index e17e328d6052..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.6.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.6.2.ebuild,v 1.8 2005/01/08 23:29:03 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="Multimedia related programs for the Gnome2 desktop"
-HOMEPAGE="http://www.prettypeople.org/~iain/gnome-media/"
-
-IUSE="oggvorbis mad"
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="x86 ~ppc sparc amd64 alpha hppa ~ia64 mips"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.3.1
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/gnome-desktop-2
-	>=gnome-base/gnome-vfs-2
-	dev-libs/libxml2
-	>=gnome-base/orbit-2.4.1
-	>=gnome-base/libbonobo-2
-	>=gnome-base/gail-0.0.3
-	>=media-sound/esound-0.2.23
-	>=media-libs/gstreamer-0.8
-	>=media-libs/gst-plugins-0.8
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8
-		>=media-plugins/gst-plugins-ogg-0.8 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.8 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-USE_DESTDIR="1"
diff --git a/gnome-extra/gnome-media/gnome-media-2.8.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.8.0.ebuild
index b5ad2425647b..43b9a3130d19 100644
--- a/gnome-extra/gnome-media/gnome-media-2.8.0.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.8.0.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/gnome-extra/gnome-media/gnome-media-2.8.0.ebuild,v 1.10 2005/04/02 04:59:28 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.8.0.ebuild,v 1.11 2005/06/06 13:28:38 foser Exp $
 
 inherit gnome2
 
@@ -37,3 +37,9 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
 
 USE_DESTDIR="1"
+
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}