gnome-extra/teatime: Fix deps for gnome3, ADded upstream debian patches

svn path=/sunrise/; revision=11972

10 files changed, 1163 insertions, 12 deletions

diff --git a/gnome-extra/teatime/ChangeLog b/gnome-extra/teatime/ChangeLog
index 6779f4be4..dcc30ba46 100644
--- a/gnome-extra/teatime/ChangeLog
+++ b/gnome-extra/teatime/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for gnome-extra/teatime
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/03_libexec.patch,
+  +files/04_intltool.patch, +files/70_cs.patch, +files/80_implicit.patch,
+  +files/81_implicit_vfs.patch, +files/90_gst.patch,
+  +files/91_gst_enable_playing.patch, teatime-2.8.0.ebuild:
+  Fix deps for gnome3, ADded upstream debian patches
+
   09 Aug 2010; Michael Weber (xmw) <gentoo@xmw.de> teatime-2.8.0.ebuild:
   resolved: SRC_URI switched to mirror://debian, unresolved: HOMEPAGE dead,
   doesn't respect LINGUAS
diff --git a/gnome-extra/teatime/Manifest b/gnome-extra/teatime/Manifest
index 4c0465578..6a1a743ad 100644
--- a/gnome-extra/teatime/Manifest
+++ b/gnome-extra/teatime/Manifest
@@ -1,5 +1,12 @@
+AUX 03_libexec.patch 460 RMD160 e6707fea118a10e449009aac47f1ef803fd95db7 SHA1 f49cc1267f590aaa5bc2a638558f0e2b88e448ba SHA256 d3211fd50f6d9926905b5144959d90bb5e6c894123ce35566e0477ee239f661d
+AUX 04_intltool.patch 17568 RMD160 37c450164f1b701234b583b9e386dc57cf3dd0fc SHA1 c6c5ec80aeea89a95d0bd16c10f3ec65945d12f8 SHA256 75c7a48abca6432ef4760f59e59f46b043cf7328f780658d749bfc22bc97c0d5
+AUX 70_cs.patch 6024 RMD160 919abdece7b4ae413f8c961cee45311e4ffe6fd1 SHA1 bde03756b6b3b34ffdb719f8894dce69d341a901 SHA256 60ec334ed61b426886f935ac260af9565b043585a97cf63d02b450caecedde7a
+AUX 80_implicit.patch 3412 RMD160 81d83231f2b23e80dc98d532539fdb41eed65513 SHA1 ebf2f9bd997a9ce5e5d0f1ceebb0fd9233379f48 SHA256 d2df3231eccf88829337458aae7466afa3771f71eeb14aa6e48e4d497cb6c975
+AUX 81_implicit_vfs.patch 297 RMD160 392cad559f00672d7bdbef43f856f3c85041fd6e SHA1 49be561ca9ceafb883760f69da69c732550af455 SHA256 9b245d5875b2aea3737b361efcbc496ba142ee91cc8d937a1eba655f00e209f8
+AUX 90_gst.patch 1507 RMD160 8b53006946863fcea0161a4c8a86462ec2128388 SHA1 942127fe418ca1356e0bbb5a7c3ee5b36e349e43 SHA256 d40895bed94b8c006b3ad0ff5be6df71e742575f48a9b286d2abf1f290b1ec8c
+AUX 91_gst_enable_playing.patch 4884 RMD160 c5257ba4f1fc6161b7d7addad236c10043193643 SHA1 85747adb5cdf7588aa570eb3582e538b0f707eae SHA256 7d59a86d9f7c2b513fe04a9374bffa2e974cbf7defdfee3b5b88ea5acd6b77be
 AUX teatime-2.8.0-adding-slash-for-pixmaps-dir.patch 431 RMD160 dd464c15c8ba19e6d7b1a188b30a8598a5f6b693 SHA1 8473919cf3547b7c67e178e3b8607176393064d6 SHA256 f71d6c4a588c6439cfe3ba7b74a975a0d5527f3dccb30b67838a0d6b3603aacf
 DIST teatime_2.8.0.orig.tar.gz 789317 RMD160 451ce14118bb1ae67bfdc9c3537ca7603ea79c0a SHA1 0adcfa42e2b059b3608118f5720aebb2fc49f86c SHA256 0e8ef7b5a7029fa1386b3d228ee25317ca5d33b1f64e4e0b2f4094417dc1e3f8
-EBUILD teatime-2.8.0.ebuild 778 RMD160 e7afd661dea53d7f645b3ddbe5af6098704a87d8 SHA1 926d969de93f842265516a1eb408cbec370a1e47 SHA256 0d52a07acd6ffb3cd4d0f61ce6b2dd76bd1e71f995f6b8457f35dfa658933f1b
-MISC ChangeLog 664 RMD160 c41b4166ef4497986f62866b33e2db7f660a3125 SHA1 b0ded2c1ea1b4d23396e76ab945ff0fbc17d0999 SHA256 dd2c9a404282f95a46100e1945934bfcd02c1b7428f46bd7383737a8debea368
+EBUILD teatime-2.8.0.ebuild 1001 RMD160 98f9ee30a2740998f912416b21073a71942c2959 SHA1 9e70155f575b9b374016b7f5ce77ac3276f66034 SHA256 b421d28b2c348ed30cbf636e418d9e191532d256ba0fa48f51b8884176e8b676
+MISC ChangeLog 977 RMD160 07ebc688805cf9159bb8c6e8c32c3e733f957b3d SHA1 e7723879d40b8434724f4efe4efc0500f0081705 SHA256 331c564ede7242c0263c0aa033162b412a6e34b68345d4de00e56f1a8c9cd6e0
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/gnome-extra/teatime/files/03_libexec.patch b/gnome-extra/teatime/files/03_libexec.patch
new file mode 100644
index 000000000..1c1d2432d
--- /dev/null
+++ b/gnome-extra/teatime/files/03_libexec.patch
@@ -0,0 +1,12 @@
+diff -urN teatime_applet_2-2.6.0.orig/Makefile.am teatime_applet_2-2.6.0/Makefile.am
+--- teatime_applet_2-2.6.0.orig/Makefile.am	2004-11-01 10:26:21.000000000 +0100
++++ teatime_applet_2-2.6.0/Makefile.am	2006-07-16 19:48:49.000000000 +0200
+@@ -7,8 +7,6 @@
+ 
+ CLEANFILES = $(server_in_files) $(server_DATA)
+ 
+-libexecdir = $(prefix)/libexec
+-
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+ 	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+ 
diff --git a/gnome-extra/teatime/files/04_intltool.patch b/gnome-extra/teatime/files/04_intltool.patch
new file mode 100644
index 000000000..c295c9f4f
--- /dev/null
+++ b/gnome-extra/teatime/files/04_intltool.patch
@@ -0,0 +1,607 @@
+--- intltool-extract.in	2007-02-04 02:52:50.000000000 +1100
++++ teatime-2.8.0-intl/intltool-extract.in	2007-08-17 18:02:38.000000000 +1000
+@@ -32,7 +32,7 @@
+ ## Release information
+ my $PROGRAM      = "intltool-extract";
+ my $PACKAGE      = "intltool";
+-my $VERSION      = "0.35.0";
++my $VERSION      = "0.36.0";
+ 
+ ## Loaded modules
+ use strict; 
+@@ -114,6 +114,11 @@
+ sub place_normal {
+     $FILE	 = $ARGV[0];
+     $OUTFILE     = "$FILE.h";
++
++    my $dirname = dirname ($OUTFILE);
++    if (! -d "$dirname" && $dirname ne "") {
++        system ("mkdir -p $dirname");
++    }
+ }   
+ 
+ sub place_local {
+@@ -156,7 +161,7 @@
+       --type=TYPE   Specify the file type of FILENAME. Currently supports:
+                     "gettext/glade", "gettext/ini", "gettext/keys"
+                     "gettext/rfc822deb", "gettext/schemas",
+-                    "gettext/scheme", "gettext/xml"
++                    "gettext/scheme", "gettext/xml", "gettext/quoted"
+   -l, --local       Writes output into current working directory
+                     (conflicts with --update)
+       --update      Writes output into the same directory the source file 
+@@ -212,6 +217,7 @@
+     &type_scheme if $gettext_type eq "scheme";
+     &type_schemas  if $gettext_type eq "schemas";
+     &type_rfc822deb  if $gettext_type eq "rfc822deb";
++    &type_quoted if $gettext_type eq "quoted";
+ }
+ 
+ sub entity_decode_minimal
+@@ -231,9 +237,9 @@
+ 
+     s/&apos;/'/g; # '
+     s/&quot;/"/g; # "
+-    s/&amp;/&/g;
+     s/&lt;/</g;
+     s/&gt;/>/g;
++    s/&amp;/&/g;
+ 
+     return $_;
+ }
+@@ -242,7 +248,7 @@
+ {
+     return '\"' if $_ eq '"';
+     return '\n' if $_ eq "\n";
+-    return '\\' if $_ eq '\\';
++    return '\\\\' if $_ eq '\\';
+ 
+     return $_;
+ }
+@@ -255,8 +261,11 @@
+ 
+ sub type_ini {
+     ### For generic translatable desktop files ###
+-    while ($input =~ /^_.*=(.*)$/mg) {
+-        $messages{$1} = [];
++    while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
++        if (defined($2))  {
++            $comments{$3} = $2;
++        }
++        $messages{$3} = [];
+     }
+ }
+ 
+@@ -711,6 +720,17 @@
+     return @list;
+ }
+ 
++sub type_quoted {
++    while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++        my $message = $1;
++        my $before = $`;
++        $message =~ s/\\\"/\"/g;
++        $before =~ s/[^\n]//g;
++        $messages{$message} = [];
++        $loc{$message} = length ($before) + 2;
++    }
++}
++
+ sub type_glade {
+     ### For translatable Glade XML files ###
+ 
+--- intltool-merge.in	2007-02-04 02:52:50.000000000 +1100
++++ teatime-2.8.0-intl/intltool-merge.in	2007-08-17 18:02:47.000000000 +1000
+@@ -35,7 +35,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-merge";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.36.0";
+ 
+ ## Loaded modules
+ use strict; 
+@@ -60,6 +60,7 @@
+ my $DESKTOP_STYLE_ARG = 0;
+ my $SCHEMAS_STYLE_ARG = 0;
+ my $RFC822DEB_STYLE_ARG = 0;
++my $QUOTED_STYLE_ARG = 0;
+ my $QUIET_ARG = 0;
+ my $PASS_THROUGH_ARG = 0;
+ my $UTF8_ARG = 0;
+@@ -79,6 +80,7 @@
+  "desktop-style|d" => \$DESKTOP_STYLE_ARG,
+  "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
+  "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
++ "quoted-style" => \$QUOTED_STYLE_ARG,
+  "pass-through|p" => \$PASS_THROUGH_ARG,
+  "utf8|u" => \$UTF8_ARG,
+  "multiple-output|m" => \$MULTIPLE_OUTPUT,
+@@ -91,9 +93,35 @@
+ 
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
++my $iconv = $ENV{"ICONV"} || "iconv";
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+ 
++sub isProgramInPath
++{
++    my ($file) = @_;
++    # If either a file exists, or when run it returns 0 exit status
++    return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++    return 0;
++}
++
++sub isGNUGettextTool
++{
++    my ($file) = @_;
++    # Check that we are using GNU gettext tools
++    if (isProgramInPath ($file)) {
++        my $version = `$file --version`;
++        return 1 if ($version =~ m/.*\(GNU .*\).*/);
++    }
++    return 0;
++}
++
++if (! isGNUGettextTool ("$iconv"))
++{
++	print STDERR " *** GNU iconv is not found on this system!\n".
++		     " *** Without it, intltool-merge can not convert encodings.\n";
++	exit;
++}
++
+ # Use this instead of \w for XML files to handle more possible characters.
+ my $w = "[-A-Za-z0-9._:]";
+ 
+@@ -157,6 +185,14 @@
+ 	&rfc822deb_merge_translations;
+ 	&finalize;
+ } 
++elsif ($QUOTED_STYLE_ARG && @ARGV > 2) 
++{
++	&utf8_sanity_check;
++	&preparation;
++	&print_message;
++	&quoted_merge_translations;
++	&finalize;
++} 
+ else 
+ {
+ 	&print_help;
+@@ -193,6 +229,7 @@
+   -k, --keys-style       includes translations in the keys style
+   -s, --schemas-style    includes translations in the schemas style
+   -r, --rfc822deb-style  includes translations in the RFC822 style
++      --quoted-style     includes translations in the quoted string style
+   -x, --xml-style        includes translations in the standard xml style
+ 
+ Other options:
+@@ -415,7 +452,7 @@
+         {
+ 	    $nextfuzzy = 1 if /^#, fuzzy/;
+        
+-	    if (/^msgid "((\\.|[^\\])*)"/ ) 
++	    if (/^msgid "((\\.|[^\\]+)*)"/ ) 
+             {
+ 		$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
+ 		$msgid = "";
+@@ -431,14 +468,14 @@
+ 		$nextfuzzy = 0;
+ 	    }
+ 
+-	    if (/^msgstr "((\\.|[^\\])*)"/) 
++	    if (/^msgstr "((\\.|[^\\]+)*)"/) 
+             {
+ 	        $msgstr = unescape_po_string($1);
+ 		$inmsgstr = 1;
+ 		$inmsgid = 0;
+ 	    }
+ 
+-	    if (/^"((\\.|[^\\])*)"/) 
++	    if (/^"((\\.|[^\\]+)*)"/) 
+             {
+ 	        $msgid .= unescape_po_string($1) if $inmsgid;
+ 	        $msgstr .= unescape_po_string($1) if $inmsgstr;
+@@ -483,16 +520,15 @@
+     return $string;
+ }
+ 
+-## NOTE: deal with < - &lt; but not > - &gt;  because it seems its ok to have 
+-## > in the entity. For further info please look at #84738.
+ sub entity_decode
+ {
+     local ($_) = @_;
+ 
+     s/&apos;/'/g; # '
+     s/&quot;/"/g; # "
+-    s/&amp;/&/g;
+     s/&lt;/</g;
++    s/&gt;/>/g;
++    s/&amp;/&/g;
+ 
+     return $_;
+ }
+@@ -1006,8 +1042,8 @@
+ 
+     if ($MULTIPLE_OUTPUT) {
+         for my $lang (sort keys %po_files_by_lang) {
+-	    if ( ! -e $lang ) {
+-	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
++	    if ( ! -d $lang ) {
++	        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+             }
+             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+             binmode (OUTPUT) if $^O eq 'MSWin32';
+@@ -1354,3 +1390,39 @@
+     return @list;
+ }
+ 
++sub quoted_translation
++{
++    my ($lang, $string) = @_;
++
++    $string =~ s/\\\"/\"/g;
++
++    my $translation = $translations{$lang, $string};
++    $translation = $string if !$translation;
++
++    $translation =~ s/\"/\\\"/g;
++    return $translation
++}
++
++sub quoted_merge_translations
++{
++    if (!$MULTIPLE_OUTPUT) {
++        print "Quoted only supports Multiple Output.\n";
++        exit(1);
++    }
++
++    for my $lang (sort keys %po_files_by_lang) {
++        if ( ! -d $lang ) {
++            mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++        }
++        open INPUT, "<${FILE}" or die;
++        open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
++        binmode (OUTPUT) if $^O eq 'MSWin32';
++        while (<INPUT>) 
++        {
++            s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . &quoted_translation($lang, $1) . "\""/ge;
++            print OUTPUT;
++        }
++        close OUTPUT;
++        close INPUT;
++    }
++}
+--- intltool-update.in	2007-02-04 02:52:50.000000000 +1100
++++ teatime-2.8.0-intl/intltool-update.in	2007-08-17 18:02:54.000000000 +1000
+@@ -30,7 +30,7 @@
+ 
+ ## Release information
+ my $PROGRAM = "intltool-update";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.36.0";
+ my $PACKAGE = "intltool";
+ 
+ ## Loaded modules
+@@ -71,7 +71,8 @@
+ "sheet(?:\\.in)+|".	# ?
+ "schemas(?:\\.in)+|".	# GConf specific
+ "pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+";	# GOK specific. 
++"kbd(?:\\.in)+|".	# GOK specific. 
++"policy(?:\\.in)+";	# PolicyKit files
+ 
+ my $ini_support =
+ "icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
+@@ -90,10 +91,9 @@
+ $| = 1;
+ 
+ ## Sometimes the source tree will be rooted somewhere else.
+-my $SRCDIR = ".";
++my $SRCDIR = $ENV{"srcdir"} || ".";
+ my $POTFILES_in;
+ 
+-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
+ $POTFILES_in = "<$SRCDIR/POTFILES.in";
+ 
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+@@ -124,8 +124,10 @@
+ 
+ &Console_Write_IntltoolHelp if $arg_count > 1;
+ 
++my $PKGNAME = FindPackageName ();
++
+ # --version and --help don't require a module name
+-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
++my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
+ 
+ if ($POT_ARG)
+ {
+@@ -316,7 +318,8 @@
+ 	@buf_potfiles_ignore,
+ 	@buf_allfiles,
+ 	@buf_allfiles_sorted,
+-	@buf_potfiles_sorted
++	@buf_potfiles_sorted,
++        @buf_potfiles_ignore_sorted
+     );
+ 
+     ## Search and find all translatable files
+@@ -326,7 +329,12 @@
+ 	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
+ 	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+ 	}, "..";
+-
++    find sub { 
++	push @buf_i18n_plain,        "$File::Find::name" if /\.($buildin_gettext_support)$/;
++	push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_support)$/;
++	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
++	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
++	}, "$SRCDIR/..";
+ 
+     open POTFILES, $POTFILES_in or die "$PROGRAM:  there's no POTFILES.in!\n";
+     @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
+@@ -342,7 +350,7 @@
+     ## comparing with POTFILES.in
+     foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
+     {
+-	(-s $ignore) or next;
++	(-s "$SRCDIR/$ignore") or next;
+ 
+ 	if ("$ignore" eq "POTFILES.ignore")
+ 	{
+@@ -351,7 +359,7 @@
+ 	}
+ 
+ 	print "Found $ignore: Ignoring files...\n" if $VERBOSE;
+-	open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
++	open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
+ 	    
+ 	while (<FILE>)
+ 	{
+@@ -359,7 +367,7 @@
+ 	}
+ 	close FILE;
+ 
+-	@buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
++	@buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
+     }
+ 
+     foreach my $file (@buf_i18n_plain)
+@@ -417,7 +425,7 @@
+ 		}
+ 	    }	    
+ 
+-	    if (/\.GetString ?\(QUOTEDTEXT/)
++	    if (/\w\.GetString *\(QUOTEDTEXT/)
+ 	    {
+                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+                     ## Remove the first 3 chars and add newline
+@@ -426,7 +434,8 @@
+ 		last;
+ 	    }
+ 
+-	    if (/_\(QUOTEDTEXT/)
++            ## N_ Q_ and _ are the three macros defined in gi8n.h
++	    if (/[NQ]?_ *\(QUOTEDTEXT/)
+ 	    {
+                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+                     ## Remove the first 3 chars and add newline
+@@ -486,6 +495,15 @@
+     my %in2;
+     foreach (@buf_potfiles_sorted) 
+     {
++        s#^$SRCDIR/../##;
++        s#^$SRCDIR/##;
++	$in2{$_} = 1;
++    }
++
++    foreach (@buf_potfiles_ignore_sorted) 
++    {
++        s#^$SRCDIR/../##;
++        s#^$SRCDIR/##;
+ 	$in2{$_} = 1;
+     }
+ 
+@@ -493,9 +511,16 @@
+ 
+     foreach (@buf_allfiles_sorted)
+     {
+-	if (!exists($in2{$_}))
++        my $dummy = $_;
++        my $srcdir = $SRCDIR;
++
++        $srcdir =~ s#^../##;
++        $dummy =~ s#^$srcdir/../##;
++        $dummy =~ s#^$srcdir/##;
++        $dummy =~ s#_build/##;
++	if (!exists($in2{$dummy}))
+ 	{
+-	    push @result, $_
++	    push @result, $dummy
+ 	}
+     }
+ 
+@@ -504,7 +529,7 @@
+     foreach (@buf_potfiles_sorted)
+     {
+ 	chomp (my $dummy = $_);
+-	if ("$dummy" ne "" and ! -f "../$dummy")
++	if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
+ 	{
+ 	    push @buf_potfiles_notexist, $_;
+ 	}
+@@ -537,7 +562,7 @@
+ 	    warn "\n" if ($VERBOSE or @result);
+ 	    warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
+ 	    warn @buf_potfiles_notexist, "\n";
+-	    warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
++	    warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
+ 		 "containing this list of absent files has been written in the current directory.\n";
+ 	}
+     }
+@@ -555,16 +580,33 @@
+     exit 1;
+ }
+ 
+-sub GenerateHeaders
++sub isProgramInPath
+ {
+-    my $EXTRACT = "@INTLTOOL_EXTRACT@";
+-    chomp $EXTRACT;
++    my ($file) = @_;
++    # If either a file exists, or when run it returns 0 exit status
++    return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++    return 0;
++}
+ 
+-    $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
++sub isGNUGettextTool
++{
++    my ($file) = @_;
++    # Check that we are using GNU gettext tools
++    if (isProgramInPath ($file))
++    {
++        my $version = `$file --version`;
++        return 1 if ($version =~ m/.*\(GNU .*\).*/);
++    }
++    return 0;
++}
++
++sub GenerateHeaders
++{
++    my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
+ 
+     ## Generate the .h header files, so we can allow glade and
+     ## xml translation support
+-    if (! -x "$EXTRACT")
++    if (! isProgramInPath ("$EXTRACT"))
+     {
+ 	print STDERR "\n *** The intltool-extract script wasn't found!"
+ 	     ."\n *** Without it, intltool-update can not generate files.\n";
+@@ -611,13 +653,13 @@
+ #
+ sub GeneratePOTemplate
+ {
+-    my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
++    my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
+     my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
+     chomp $XGETTEXT;
+ 
+-    if (! -x $XGETTEXT)
++    if (! isGNUGettextTool ("$XGETTEXT"))
+     {
+-	print STDERR " *** xgettext is not found on this system!\n".
++	print STDERR " *** GNU xgettext is not found on this system!\n".
+ 		     " *** Without it, intltool-update can not extract strings.\n";
+ 	exit;
+     }
+@@ -671,12 +713,8 @@
+ 	} 
+ 	else 
+ 	{
+-	    if ($SRCDIR eq ".") {
+-	        print OUTFILE "../$_\n";
+-	    } else {
+-	        print OUTFILE "$SRCDIR/../$_\n";
+-	    }
+-	    $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
++            print OUTFILE "$SRCDIR/../$_\n";
++	    $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ 	}
+ 
+ 	next if (! $gettext_support_nonascii);
+@@ -717,7 +755,23 @@
+     unlink "$MODULE.pot";
+     my @xgettext_argument=("$XGETTEXT",
+ 			   "--add-comments",
+-			   "--directory\=\.",
++			   "--directory\=.",
++                           "--default-domain\=$MODULE",
++                           "--flag\=g_strdup_printf:1:c-format",
++                           "--flag\=g_string_printf:2:c-format",
++                           "--flag\=g_string_append_printf:2:c-format",
++                           "--flag\=g_error_new:3:c-format",
++                           "--flag\=g_set_error:4:c-format",
++                           "--flag\=g_markup_printf_escaped:1:c-format",
++                           "--flag\=g_log:3:c-format",
++                           "--flag\=g_print:1:c-format",
++                           "--flag\=g_printerr:1:c-format",
++                           "--flag\=g_printf:1:c-format",
++                           "--flag\=g_fprintf:2:c-format",
++                           "--flag\=g_sprintf:2:c-format",
++                           "--flag\=g_snprintf:3:c-format",
++                           "--flag\=g_scanner_error:2:c-format",
++                           "--flag\=g_scanner_warn:2:c-format",
+ 			   "--output\=$MODULE\.pot",
+ 			   "--files-from\=\.\/POTFILES\.in\.temp");
+     my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
+@@ -784,9 +838,16 @@
+ {
+     -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
+ 
+-    my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
++    my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
+     my ($lang, $outfile) = @_;
+ 
++    if (! isGNUGettextTool ("$MSGMERGE"))
++    {
++	print STDERR " *** GNU msgmerge is not found on this system!\n".
++		     " *** Without it, intltool-update can not extract strings.\n";
++	exit;
++    }
++
+     print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
+ 
+     my $infile = "$SRCDIR/$lang.po";
+@@ -827,7 +888,14 @@
+ sub Console_Write_TranslationStatus
+ {
+     my ($lang, $output_file) = @_;
+-    my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++    my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++    if (! isGNUGettextTool ("$MSGFMT"))
++    {
++	print STDERR " *** GNU msgfmt is not found on this system!\n".
++		     " *** Without it, intltool-update can not extract strings.\n";
++	exit;
++    }
+ 
+     $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
+ 
+@@ -836,7 +904,14 @@
+ 
+ sub Console_Write_CoverageReport
+ {
+-    my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++    my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++    if (! isGNUGettextTool ("$MSGFMT"))
++    {
++	print STDERR " *** GNU msgfmt is not found on this system!\n".
++		     " *** Without it, intltool-update can not extract strings.\n";
++	exit;
++    }
+ 
+     &GatherPOFiles;
+ 
+@@ -924,13 +999,13 @@
+ 
+ 	    $conf_in || die "Cannot find top_builddir in Makevars.";
+ 	}
+-	elsif (-f "../configure.ac") 
++	elsif (-f "$SRCDIR/../configure.ac") 
+ 	{
+-	    $conf_in = "../configure.ac";
++	    $conf_in = "$SRCDIR/../configure.ac";
+ 	} 
+-	elsif (-f "../configure.in") 
++	elsif (-f "$SRCDIR/../configure.in") 
+ 	{
+-	    $conf_in = "../configure.in";
++	    $conf_in = "$SRCDIR/../configure.in";
+ 	} 
+ 	else 
+ 	{
diff --git a/gnome-extra/teatime/files/70_cs.patch b/gnome-extra/teatime/files/70_cs.patch
new file mode 100644
index 000000000..638aa7cb7
--- /dev/null
+++ b/gnome-extra/teatime/files/70_cs.patch
@@ -0,0 +1,240 @@
+Index: teatime-2.8.0/po/LINGUAS
+===================================================================
+--- teatime-2.8.0.orig/po/LINGUAS	2008-12-17 10:42:53.000000000 -0800
++++ teatime-2.8.0/po/LINGUAS	2008-12-17 10:42:57.000000000 -0800
+@@ -1 +1 @@
+-de es fr it ja pl ro ru
++de es fr it ja pl ro ru cs
+Index: teatime-2.8.0/po/cs.po
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ teatime-2.8.0/po/cs.po	2008-12-17 10:43:09.000000000 -0800
+@@ -0,0 +1,228 @@
++# Czech translation of teatime.
++# Copyright (C) 2008
++# This file is distributed under the same license as the PACKAGE package.
++# Slush <slush@centrum.cz>, 2008.
++# , fuzzy
++#
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: Teatime 2.8\n"
++"Report-Msgid-Bugs-To: detlef!reichl()gmx!org\n"
++"POT-Creation-Date: 2007-02-03 16:01+0100\n"
++"PO-Revision-Date: 2008-12-02 23:53+0100\n"
++"Last-Translator: Marek Palatinus <marek@palatinus.cz>\n"
++"Language-Team: Czech\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: src/image-loader.c:17
++#, c-format
++msgid ""
++"Only images with a color depth of 24 or 32 Bit are allowed for the Teatime Aplett\n"
++"The requested images %s* have a depth of %i"
++msgstr ""
++
++#: src/properties.c:184
++#, fuzzy, c-format
++msgid "%i std %-2.2i min"
++msgstr "%i min %-2.2i sek"
++
++#: src/properties.c:186
++#, c-format
++msgid "%i min %-2.2i sec"
++msgstr "%i min %-2.2i sek"
++
++#: src/properties.c:188
++#, c-format
++msgid "%i sec"
++msgstr "%i sekund"
++
++#: src/properties.c:307
++#, c-format
++msgid "%s drawing time"
++msgstr "Čas luhování %s"
++
++#: src/properties.c:349
++msgid "Remove "
++msgstr "Odstranit "
++
++#: src/properties.c:400
++#: src/properties.c:499
++msgid "New tea"
++msgstr "Nový druh čaje"
++
++#: src/properties.c:466
++msgid "Teatime Properties"
++msgstr "Vlastnosti Teatime"
++
++#: src/properties.c:476
++msgid "drawing time"
++msgstr "Čas luhování"
++
++#: src/properties.c:477
++msgid "tea cup"
++msgstr "Hrníček"
++
++#: src/properties.c:478
++msgid "alarm"
++msgstr "Zvonek"
++
++#: src/properties.c:497
++msgid "Add tea"
++msgstr "Přidat čaj"
++
++#: src/properties.c:520
++msgid "Chose your teacup"
++msgstr "Vyberte si svůj hrníček"
++
++#: src/properties.c:550
++msgid "Open window if tea is ready"
++msgstr "Otevřít okno, pokud je čaj hotový"
++
++#: src/properties.c:551
++msgid "Play sound if tea is ready"
++msgstr "Přehrát zvuk, když je čaj hotový"
++
++#: src/properties.c:553
++msgid "Sound to play"
++msgstr "Zvuk pro přehrání"
++
++#: src/properties.c:555
++msgid "Show clock while drawing"
++msgstr "Zobrazovat hodiny během luhování"
++
++#: src/teatime.c:16
++#, c-format
++msgid "%s %i s left"
++msgstr "Zbývá %s %i sec"
++
++#: src/teatime.c:22
++#, c-format
++msgid "%s (%is)"
++msgstr "%s (%is)"
++
++#: src/teatime.c:126
++#: src/teatime.c:164
++msgid ""
++"Your Tea\n"
++"is ready"
++msgstr ""
++"Váš čaj\n"
++"je hotov"
++
++#: src/teatime.c:354
++msgid ""
++"Detlef Reichl\n"
++"\tdetlef ! reichl () gmx ! org"
++msgstr ""
++
++#: src/teatime.c:356
++msgid ""
++"Visit the Teatime website\n"
++"http://det.cable.nu/teatime/"
++msgstr ""
++"Navštivte webovou stránku Teatime\n"
++"http://det.cable.nu/teatime/"
++
++#: src/teatime.c:370
++msgid "Teatime"
++msgstr "Teatime"
++
++#: src/teatime.c:372
++msgid "Copyright (C) 1998-2007 Detlef Reichl"
++msgstr ""
++
++#: src/teatime.c:373
++msgid ""
++"A\n"
++"tea-drawing-time-observer.\n"
++"The most useful GNOME program ;-)"
++msgstr ""
++"Hlídač luhování čaje.\n"
++"Nejužitečnější GNOME aplikace ;-)"
++
++#: src/teatime.c:379
++msgid ""
++"This crappy English is from\n"
++"Detlef Reichl <detlef ! reichl () gmx ! org>"
++msgstr ""
++"Tenhle hrozný překlad do češtiny spáchal\n"
++"Slush <slush@centrum.cz>"
++
++#: src/teatime.c:403
++msgid "Restart drawing?"
++msgstr "Znovu spustit luhování?"
++
++#: src/teatime.c:574
++msgid "Properties ..."
++msgstr "Vlastnosti ..."
++
++#: src/teatime.c:575
++msgid "About"
++msgstr "O programu"
++
++#~ msgid "Enabled to play a sound"
++#~ msgstr "Odtwarzaj dźwięk"
++#~ msgid ""
++#~ "Show a clock in the applet while drawing, which shows the remeaning "
++#~ "drawing time"
++#~ msgstr ""
++#~ "Pokaż zegar w aplecie podczas parzenia, który pokaże pozostały czas "
++#~ "parzenia "
++#~ msgid "Sound"
++#~ msgstr "Dźwięk"
++#~ msgid "The applets cup"
++#~ msgstr "Kubki apletu"
++#~ msgid "The cup, that will be shown in the panel"
++#~ msgstr "Kubek, który będzie widoczny w panelu"
++
++#, fuzzy
++#~ msgid "The drawingtimes"
++#~ msgstr "Czas parzenia herbaty assam"
++#~ msgid "The last tea the user selected"
++#~ msgstr "Ostatnio parzona herbata"
++#~ msgid "The sound that shall be played on end of the drawingtime"
++#~ msgstr "Dźwięk, który powinien być odtwarzany na koniec czasu parzenia"
++
++#, fuzzy
++#~ msgid "drawing times"
++#~ msgstr "Czas parzenia"
++#~ msgid "Accessories"
++#~ msgstr "Akcesoria"
++#~ msgid "Tea Drawing Time Observer"
++#~ msgstr "Obserwator czasu parzenia herbaty"
++#~ msgid "The assam drawing time"
++#~ msgstr "Czas parzenia herbaty assam"
++#~ msgid "The darjeling drawing time"
++#~ msgstr "Czas parzenia darjeling"
++#~ msgid "The fruit tea drawing time"
++#~ msgstr "Czas parzenia owocowej herbaty"
++#~ msgid "The green tea drawing time"
++#~ msgstr "Czas parzenia zielonej herbaty"
++#~ msgid "The herbal tea drawing time"
++#~ msgstr "Czas parzenia ziołowej herbaty"
++#~ msgid "The peppermint tea drawing time"
++#~ msgstr "Czas parzenia miętowej herbaty"
++#~ msgid ""
++#~ "Do you realy want to reset your tea's\n"
++#~ "drawing times to the default values?"
++#~ msgstr ""
++#~ "Czy naprawdę chcesz zresetować czasy parzenia \n"
++#~ "herbat do domyślnych wartości?"
++#~ msgid "reset to defaults"
++#~ msgstr "zresetuj do domyślnych"
++#~ msgid "Assam"
++#~ msgstr "Assam"
++#~ msgid "Darjeling"
++#~ msgstr "Darjeling"
++#~ msgid "Fruit Tea"
++#~ msgstr "Owocowa"
++#~ msgid "Green Tea"
++#~ msgstr "Zielona"
++#~ msgid "Herbal Tea"
++#~ msgstr "Ziołowa"
++#~ msgid "Peppermint Tea"
++#~ msgstr "Miętowa"
++
diff --git a/gnome-extra/teatime/files/80_implicit.patch b/gnome-extra/teatime/files/80_implicit.patch
new file mode 100644
index 000000000..f7717de7e
--- /dev/null
+++ b/gnome-extra/teatime/files/80_implicit.patch
@@ -0,0 +1,86 @@
+From dannf@ldl.fc.hp.com Mon Jul 17 17:00:00 2006
+Received: (at submit) by bugs.debian.org; 18 Jul 2006 00:00:00 +0000
+Return-path: <dannf@ldl.fc.hp.com>
+Received: from atlrel7.hp.com ([156.153.255.213])
+	by spohr.debian.org with esmtp (Exim 4.50)
+	id 1G2d0K-00077b-DO
+	for submit@bugs.debian.org; Mon, 17 Jul 2006 17:00:00 -0700
+Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127])
+	by atlrel7.hp.com (Postfix) with ESMTP id A1D8C34991;
+	Mon, 17 Jul 2006 19:59:27 -0400 (EDT)
+Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30])
+	by smtp1.fc.hp.com (Postfix) with ESMTP id 6AB024E48D;
+	Mon, 17 Jul 2006 23:59:27 +0000 (UTC)
+Received: from localhost (ldl.lart [127.0.0.1])
+	by ldl.fc.hp.com (Postfix) with ESMTP id E464D1344CA;
+	Mon, 17 Jul 2006 17:59:26 -0600 (MDT)
+Received: from ldl.fc.hp.com ([127.0.0.1])
+	by localhost (ldl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
+	id 00865-03; Mon, 17 Jul 2006 17:59:23 -0600 (MDT)
+Received: from krebs (krebs.dannf [10.8.0.7])
+	by ldl.fc.hp.com (Postfix) with ESMTP id B185C13415B;
+	Mon, 17 Jul 2006 17:59:22 -0600 (MDT)
+Received: by krebs (Postfix, from userid 20800)
+	id 78F4A3B64E2; Mon, 17 Jul 2006 17:59:23 -0600 (MDT)
+Date: Mon, 17 Jul 2006 17:59:23 -0600
+From: dann frazier <dannf@debian.org>
+To: submit@bugs.debian.org
+Cc: David Mosberger <David.Mosberger@acm.org>
+Subject: teatime: implicit pointer conversion
+Message-ID: <20060717235922.GB14496@krebs.dannf>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+User-Agent: mutt-ng/devel-r804 (Debian)
+X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ldl.fc.hp.com
+Delivered-To: submit@bugs.debian.org
+X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
+	(1.212-2003-09-23-exp) on spohr.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
+	autolearn=no version=2.60-bugs.debian.org_2005_01_02
+
+Package: teatime
+Version: 2.6.0-2
+Severity: important
+Tags: patch
+
+Our automated buildd log filter[1] detected a problem that will cause
+your package to segfault on architectures where the size of a pointer
+is greater than the size of an integer, such as ia64 and amd64.
+
+[1]http://people.debian.org/~dannf/check-implicit-pointer-functions
+
+----- Forwarded message from Build Daemon <buildd@excelsior.roeckx.be> -----
+
+Subject: Log for successful build of teatime_2.6.0-2 (dist=unstable)
+Date: Sun, 16 Jul 2006 18:53:18 +0000 (UTC)
+From: Build Daemon <buildd@excelsior.roeckx.be>
+To: undisclosed-recipients: ;
+X-PMX-Version: 5.1.2.240295, Antispam-Engine: 2.3.0.1, Antispam-Data: 2006.7.16.113932
+X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ldl.fc.hp.com
+X-Spam-Checker-Version: SpamAssassin 3.0.3 (2005-04-27) on ldl.lart
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.3 required=3.5 tests=AWL,BAYES_00,UNDISC_RECIPS 
+	autolearn=no version=3.0.3
+Debian-Buildd-Error: Yes
+
+Function `panel_applet_gconf_get_string' implicitly converted to pointer at properties.c:47
+
+----- End forwarded message -----
+
+--- teatime-2.6.0/src/properties.c~	2005-08-28 12:27:14.000000000 -0600
++++ teatime-2.6.0/src/properties.c	2006-07-17 17:56:04.000000000 -0600
+@@ -1,6 +1,7 @@
+ #include "config.h"
+ #include <string.h>
+ #include <panel-applet.h>
++#include <panel-applet-gconf.h>
+ 
+ #include "image-loader.h"
+ #include "properties.h"
+
+-- 
+dann frazier | HP Open Source and Linux Organization
+
+
diff --git a/gnome-extra/teatime/files/81_implicit_vfs.patch b/gnome-extra/teatime/files/81_implicit_vfs.patch
new file mode 100644
index 000000000..61ffe68cf
--- /dev/null
+++ b/gnome-extra/teatime/files/81_implicit_vfs.patch
@@ -0,0 +1,10 @@
+--- ./src/teatime.c.old	2006-07-20 15:56:49.000000000 +1000
++++ ./src/teatime.c	2006-07-20 15:58:14.000000000 +1000
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <panel-applet.h>
++#include <libgnomevfs/gnome-vfs-utils.h>
+ 
+ #include "image-loader.h"
+ #include "properties.h"
diff --git a/gnome-extra/teatime/files/90_gst.patch b/gnome-extra/teatime/files/90_gst.patch
new file mode 100644
index 000000000..b199dc568
--- /dev/null
+++ b/gnome-extra/teatime/files/90_gst.patch
@@ -0,0 +1,38 @@
+ src/teatime.c |   16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/teatime.c b/src/teatime.c
+index 2e472f9..33d1fd5 100644
+--- a/src/teatime.c
++++ b/src/teatime.c
+@@ -258,7 +258,7 @@ bus_callback (GstBus     *bus,
+   switch (GST_MESSAGE_TYPE (msg)) {
+     case GST_MESSAGE_ERROR:
+     case GST_MESSAGE_EOS:
+-      gst_element_set_state (GST_ELEMENT (data), GST_STATE_READY);
++      gst_element_set_state (GST_ELEMENT (data), GST_STATE_NULL);
+       break;
+     default:
+       break;
+@@ -626,9 +626,19 @@ teatime_applet_new (PanelApplet *applet)
+   teatime->sound = gst_element_factory_make ("playbin", "playbin");
+   if (teatime->sound) {
+       GstBus *bus;
++      GstElement *sink;
+ 
+-      g_object_set (G_OBJECT (teatime->sound), "video-sink", NULL, NULL);
+-      g_object_set (G_OBJECT (teatime->sound), "vis-plugin", NULL, NULL);
++      sink = gst_element_factory_make ("gconfaudiosink", "audiosink");
++      if (sink)
++          g_object_set (G_OBJECT (teatime->sound), "audio-sink", sink, NULL);
++
++      sink = gst_element_factory_make ("fakesink", "fakevideosink");
++      if (sink)
++          g_object_set (G_OBJECT (teatime->sound), "video-sink", sink, NULL);
++
++      sink = gst_element_factory_make ("fakesink", "fakevis");
++      if (sink)
++          g_object_set (G_OBJECT (teatime->sound), "vis-plugin", sink, NULL);
+ 
+       bus = gst_pipeline_get_bus (GST_PIPELINE (teatime->sound));
+       gst_bus_add_watch (bus, bus_callback, teatime->sound);
diff --git a/gnome-extra/teatime/files/91_gst_enable_playing.patch b/gnome-extra/teatime/files/91_gst_enable_playing.patch
new file mode 100644
index 000000000..676b395fa
--- /dev/null
+++ b/gnome-extra/teatime/files/91_gst_enable_playing.patch
@@ -0,0 +1,136 @@
+diff -Nur -x '*.orig' -x '*~' old/src/teatime.c old.new/src/teatime.c
+--- old/src/teatime.c	2008-04-20 18:22:02.000000000 +0200
++++ old.new/src/teatime.c	2008-04-20 18:27:15.000000000 +0200
+@@ -88,16 +88,21 @@
+ }
+ 
+ static void
+-popup_hide (GtkWidget *widget, GdkEvent *event, TeatimePopup *popup)
++popup_hide (GtkWidget *widget, GdkEvent *event, Teatime *teatime)
+ {
+-  gtk_timeout_remove (popup->timer_handle);
+-  gtk_widget_hide (popup->cup_window);
+-  gtk_widget_hide (popup->label_window);
+-  popup->visible = FALSE;
++  gtk_timeout_remove (teatime->popup.timer_handle);
++  gtk_widget_hide (teatime->popup.cup_window);
++  gtk_widget_hide (teatime->popup.label_window);  
++
++  GstState state = GST_STATE (teatime->sound);
++  if (state == GST_STATE_PLAYING || state == GST_STATE_PAUSED || GST_STATE_READY)
++    gst_element_set_state (GST_ELEMENT (teatime->sound), GST_STATE_NULL);
++
++  teatime->popup.visible = FALSE;
+ }
+ 
+ static void
+-cup_popup (TeatimePopup *popup)
++cup_popup (Teatime *teatime)
+ {
+   static GdkPixbuf *pixbuf;
+   static GdkPixmap *pixmap;
+@@ -105,20 +110,20 @@
+   GtkWidget *eventbox;
+   gint i;
+     
+-  popup->cup_window = gtk_window_new (GTK_WINDOW_POPUP);
+-  gtk_widget_set_usize (popup->cup_window, CUP_WIDTH, CUP_HEIGHT);
++  teatime->popup.cup_window = gtk_window_new (GTK_WINDOW_POPUP);
++  gtk_widget_set_usize (teatime->popup.cup_window, CUP_WIDTH, CUP_HEIGHT);
+   hbox = gtk_hbox_new (TRUE, 0);
+   for (i=0; i<ROT_FRAMES; i++)
+-    gtk_box_pack_start (GTK_BOX (hbox), popup->image[i], FALSE, FALSE, 0);
+-  gtk_widget_shape_combine_mask (popup->cup_window, popup->bitmap[0], 0, 0);
++    gtk_box_pack_start (GTK_BOX (hbox), teatime->popup.image[i], FALSE, FALSE, 0);
++  gtk_widget_shape_combine_mask (teatime->popup.cup_window, teatime->popup.bitmap[0], 0, 0);
+   eventbox = gtk_event_box_new ();
+   gtk_container_add (GTK_CONTAINER (eventbox), hbox);	
+-  gtk_container_add (GTK_CONTAINER (popup->cup_window), eventbox);
++  gtk_container_add (GTK_CONTAINER (teatime->popup.cup_window), eventbox);
+   g_signal_connect (G_OBJECT (eventbox), "button_release_event",
+-                    G_CALLBACK (popup_hide), popup);
++                    G_CALLBACK (popup_hide), teatime);
+   gtk_widget_show (eventbox);
+   gtk_widget_show (hbox);
+-  gtk_widget_show (popup->image[0]);
++  gtk_widget_show (teatime->popup.image[0]);
+ }
+ 
+ static void
+@@ -273,7 +278,7 @@
+   GstElement *audio_sink;
+   gint center_x, center_y;
+  
+-  if (--teatime->time_left)
++  if (--(teatime->time_left))
+   {
+     animate (teatime);
+     return TRUE;
+@@ -295,7 +300,7 @@
+     if (uri) {
+       g_object_set (G_OBJECT (teatime->sound), "uri", uri, NULL);
+       g_free (uri);
+-      gst_element_set_state (teatime->sound, GST_STATE_PLAYING);
++      gst_element_set_state (GST_ELEMENT (teatime->sound), GST_STATE_PLAYING);
+     }
+   }
+   if (!teatime->properties.popup)
+@@ -312,7 +317,7 @@
+   }
+   else
+   {
+-    cup_popup (&teatime->popup);
++    cup_popup (teatime);
+     label_popup (&teatime->popup, teatime->border);
+   }
+   teatime->popup.frame = 0;    
+@@ -413,7 +418,7 @@
+   if (teatime->timer_handle)
+     gtk_timeout_remove (teatime->timer_handle);
+   if (teatime->popup.visible)
+-    popup_hide (NULL, NULL, &teatime->popup);
++    popup_hide (NULL, NULL, teatime);
+   teatime->full = TRUE;
+   teatime->time_left = teatime->drawing_time * FRAMES;
+   teatime->timer_handle = gtk_timeout_add (333, (GtkFunction)timer, teatime);
+@@ -622,25 +627,25 @@
+   
+   gdk_rgb_init();
+ 
+-  gst_init (0, NULL);
++  gst_init (NULL, NULL);
+ 
+   teatime->sound = gst_element_factory_make ("playbin", "playbin");
+   if (teatime->sound) {
+       GstBus *bus;
+-      GstElement *sink;
+-
+-      sink = gst_element_factory_make ("gconfaudiosink", "audiosink");
+-      if (sink)
+-          g_object_set (G_OBJECT (teatime->sound), "audio-sink", sink, NULL);
+-
+-      sink = gst_element_factory_make ("fakesink", "fakevideosink");
+-      if (sink)
+-          g_object_set (G_OBJECT (teatime->sound), "video-sink", sink, NULL);
+-
+-      sink = gst_element_factory_make ("fakesink", "fakevis");
+-      if (sink)
+-          g_object_set (G_OBJECT (teatime->sound), "vis-plugin", sink, NULL);
+-
++//      GstElement *sink;
++//
++//      sink = gst_element_factory_make ("gconfaudiosink", "audiosink");
++//      if (sink)
++//          g_object_set (G_OBJECT (teatime->sound), "audio-sink", sink, NULL);
++//
++//      sink = gst_element_factory_make ("fakesink", "fakevideosink");
++//      if (sink)
++//          g_object_set (G_OBJECT (teatime->sound), "video-sink", sink, NULL);
++//
++//      sink = gst_element_factory_make ("fakesink", "fakevis");
++//      if (sink)
++//          g_object_set (G_OBJECT (teatime->sound), "vis-plugin", sink, NULL);
++//
+       bus = gst_pipeline_get_bus (GST_PIPELINE (teatime->sound));
+       gst_bus_add_watch (bus, bus_callback, teatime->sound);
+       gst_object_unref (bus);
diff --git a/gnome-extra/teatime/teatime-2.8.0.ebuild b/gnome-extra/teatime/teatime-2.8.0.ebuild
index 80c2c3fd4..39e7aa6c4 100644
--- a/gnome-extra/teatime/teatime-2.8.0.ebuild
+++ b/gnome-extra/teatime/teatime-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,18 +15,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	|| ( >=media-plugins/gst-plugins-gconf-0.10
-	     >=media-libs/gstreamer-0.8 )
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/gnome-panel-2.6
-	>=dev-libs/libxml2-2.6"
+DEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	|| ( media-plugins/gst-plugins-gconf
+	     media-libs/gstreamer )
+	gnome-base/gnome-vfs:2
+	gnome-base/gnome-panel
+	dev-libs/libxml2"
 RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${PN}_applet_2-${PV}
 
 src_prepare() {
-	epatch "${FILESDIR}/teatime-2.8.0-adding-slash-for-pixmaps-dir.patch"
+	epatch \
+		"${FILESDIR}"/teatime-2.8.0-adding-slash-for-pixmaps-dir.patch \
+		"${FILESDIR}"/03_libexec.patch \
+		"${FILESDIR}"/04_intltool.patch \
+		"${FILESDIR}"/70_cs.patch \
+		"${FILESDIR}"/80_implicit.patch \
+		"${FILESDIR}"/81_implicit_vfs.patch \
+		"${FILESDIR}"/90_gst.patch \
+		"${FILESDIR}"/91_gst_enable_playing.patch
 	gnome2_omf_fix
 }