add some fixes & bump

5 files changed, 33 insertions, 7 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index d10a2df28142..266954d65af5 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.40 2005/01/08 23:31:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.41 2005/01/09 22:24:35 foser Exp $
+
+*totem-0.100-r1 (09 Jan 2005)
+
+  09 Jan 2005; foser <foser@gentoo.org> totem-0.100-r1.ebuild :
+  Add fix for #68087 & #77204
 
 *totem-0.100 (09 Jan 2005)
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index b02b414ccc4b..57a0a3ac09ad 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,11 +1,14 @@
 MD5 2fa9295189faf40791670a895cb1d171 totem-0.99.19.ebuild 1739
 MD5 c844cbe6376059896095a29349689b61 totem-0.99.22-r1.ebuild 1924
 MD5 3a099802658c8b0f280b577253e04088 totem-0.99.15.1.ebuild 1585
+MD5 11be88619467f4266d7ff85185becaa9 totem-0.100-r1.ebuild 1839
 MD5 9701d5c25ac78595ad79de499d4a8962 ChangeLog 5725
 MD5 373bb5bc6b3a30589c041dbe1f6a1bdb totem-0.100.ebuild 1761
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
+MD5 50a343412446e05871e042a7b5958c93 files/totem-0.100-fix_desktop_item.patch 558
 MD5 8c12406bb21e95feaeb34355f9fd301b files/totem-0.99.22-gst_object_rename.patch 1290
 MD5 8dd0c2a14c9603045fb2eebd0ee50534 files/digest-totem-0.100 65
+MD5 8dd0c2a14c9603045fb2eebd0ee50534 files/digest-totem-0.100-r1 65
 MD5 eeba2ab1c3ed87a4a630addd709262ea files/digest-totem-0.99.19 67
 MD5 1c2c4aab10d4dbff69612b377a4aba0a files/digest-totem-0.99.22-r1 67
 MD5 572a285ceed98dcaa61cf9520e7e59f7 files/totem-0.99.22-x_includes.patch 1330
diff --git a/media-video/totem/files/digest-totem-0.100 b/media-video/totem/files/digest-totem-0.100-r1
index b18a963468ee..b18a963468ee 100644
--- a/media-video/totem/files/digest-totem-0.100
+++ b/media-video/totem/files/digest-totem-0.100-r1
diff --git a/media-video/totem/files/totem-0.100-fix_desktop_item.patch b/media-video/totem/files/totem-0.100-fix_desktop_item.patch
new file mode 100644
index 000000000000..c5c3c0a592f3
--- /dev/null
+++ b/media-video/totem/files/totem-0.100-fix_desktop_item.patch
@@ -0,0 +1,14 @@
+--- totem-0.100/data/Makefile.am	2005-01-03 17:10:26.000000000 +0100
++++ totem-0.100.patched/data/Makefile.am	2005-01-09 14:42:29.000000000 +0100
+@@ -34,9 +34,9 @@
+ desktop_in_in_files_all = totem.desktop.in.in.in vanity.desktop.in.in
+ desktop_in_files_all = totem.desktop.in.in vanity.desktop.in
+ if TOTEM_VANITY
+-desktop_in_files = totem.desktop.in.in vanity.desktop.in
++desktop_in_files = totem.desktop.in vanity.desktop.in
+ else
+-desktop_in_files = totem.desktop.in.in
++desktop_in_files = totem.desktop.in
+ endif
+ 
+ desktopdir = $(datadir)/applications/
diff --git a/media-video/totem/totem-0.100.ebuild b/media-video/totem/totem-0.100-r1.ebuild
index e5221dae83da..1290fa37aaba 100644
--- a/media-video/totem/totem-0.100.ebuild
+++ b/media-video/totem/totem-0.100-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.100.ebuild,v 1.1 2005/01/08 23:31:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.100-r1.ebuild,v 1.1 2005/01/09 22:24:35 foser Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils linux-info
 
 DESCRIPTION="Media player for GNOME"
 HOMEPAGE="http://www.hadess.net/totem.php3"
@@ -34,7 +34,8 @@ RDEPEND=">=dev-libs/glib-2.2
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0"
+	>=dev-util/pkgconfig-0.12.0
+	sys-devel/automake"
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
 
@@ -61,9 +62,12 @@ src_unpack() {
 	# violations, see bug #48800 <obz@gentoo.org>
 	gnome2_omf_fix
 
-#might be needed for #68087
-#	kernel_is 2 4 && \
-#		sed -i "s:#include <netinet/in.h>::" somefile
+	epatch ${FILESDIR}/${P}-fix_desktop_item.patch
+
+	WANT_AUTOMAKE=1.4 automake
+
+	# should solve #68087
+	kernel_is 2 4 && CFLAGS="${CFLAGS} -D_NETINET_IN_H"
 
 }