diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-01-25 17:36:14 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-01-25 17:36:14 +0000 |
| commit | bcf5b0bb2751ffe75a9d8514703e622fa45fbe80 (patch) | |
| tree | 51725529ca5b08408364f94da6c3fc40b80f41e9 /www-client/htmlview/files/htmlview-3.0.0-prefix.patch | |
| parent | move sci-biology/allpaths sci-biology/allpathslg (diff) | |
| download | gentoo-2-bcf5b0bb2751ffe75a9d8514703e622fa45fbe80.tar.gz gentoo-2-bcf5b0bb2751ffe75a9d8514703e622fa45fbe80.tar.bz2 gentoo-2-bcf5b0bb2751ffe75a9d8514703e622fa45fbe80.zip | |
Port changes from Gentoo Prefix, add prefix patch, add KEYWORDS, convert to EAPI3. Remove old version.
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'www-client/htmlview/files/htmlview-3.0.0-prefix.patch')
| -rw-r--r-- | www-client/htmlview/files/htmlview-3.0.0-prefix.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/www-client/htmlview/files/htmlview-3.0.0-prefix.patch b/www-client/htmlview/files/htmlview-3.0.0-prefix.patch new file mode 100644 index 000000000000..ef749097b1fc --- /dev/null +++ b/www-client/htmlview/files/htmlview-3.0.0-prefix.patch @@ -0,0 +1,69 @@ +--- htmlview.orig 2007-10-01 20:46:02 +0200 ++++ htmlview 2007-10-01 20:45:51 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash + # + # Invoke HTML viewer + # Usage: +@@ -31,8 +31,8 @@ + + error_dialog() { + echo "$1" +- if [ -x /usr/bin/zenity ]; then +- /usr/bin/zenity --error --text="$1" ++ if [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/zenity ]; then ++ "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/zenity --error --text="$1" + else + xmessage "$1" + fi +@@ -47,7 +47,7 @@ + # Check if terminal exists + if ! exists "$PREFTERM"; then + error_dialog "ERROR: The terminal $PREFTERM does not exist. Please reconfigure." +- [ -x /usr/bin/gnome-default-applications-properties ] && exec /usr/bin/gnome-default-applications-properties ++ [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties ] && exec "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties + exit 1 + fi + # Special case: w3m +@@ -63,7 +63,7 @@ + # Check if GUI browser exists + if ! exists "$GCONF"; then + error_dialog "ERROR: The browser $GCONF does not exist. Please reconfigure." +- [ -x /usr/bin/gnome-default-applications-properties ] && exec /usr/bin/gnome-default-applications-properties ++ [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties ] && exec "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties + exit 1 + fi + # Special case: konqueror without arguments +@@ -85,7 +85,7 @@ + echo "$1" | grep -q "gnome-open" && INVALID="yes" + if [ "$INVALID" == "yes" ]; then + error_dialog "$1 is an invalid browser. Please reconfigure." +- [ -x /usr/bin/gnome-default-applications-properties ] && exec /usr/bin/gnome-default-applications-properties ++ [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties ] && exec "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties + exit 1 + fi + } +@@ -118,16 +118,16 @@ + + # Fallback to old htmlview + unset BROWSER CONSOLE TERMS_KDE TERMS_GNOME TERMS_GENERIC +-[ -e /etc/htmlview.conf ] && source /etc/htmlview.conf ++[ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/htmlview.conf ] && source "@GENTOO_PORTAGE_EPREFIX@"/etc/htmlview.conf + [ -e ~/.htmlviewrc ] && source ~/.htmlviewrc + + TERMS_KDE="konsole kvt" +-TERMS_GNOME="/usr/bin/gnome-terminal" +-TERMS_GENERIC="/usr/bin/rxvt /usr/bin/xterm /usr/bin/Eterm /usr/bin/aterm /usr/bin/hanterm /usr/bin/kterm /usr/bin/mlterm /usr/bin/mrxvt /usr/bin/urxvt" +-TTYBROWSERS="/usr/bin/links /usr/bin/lynx /usr/bin/w3m /usr/bin/elinks" ++TERMS_GNOME="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gnome-terminal" ++TERMS_GENERIC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/rxvt @GENTOO_PORTAGE_EPREFIX@/usr/bin/xterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/Eterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/aterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/hanterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/kterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/mlterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/mrxvt @GENTOO_PORTAGE_EPREFIX@/usr/bin/urxvt" ++TTYBROWSERS="@GENTOO_PORTAGE_EPREFIX@/usr/bin/links @GENTOO_PORTAGE_EPREFIX@/usr/bin/lynx @GENTOO_PORTAGE_EPREFIX@/usr/bin/w3m @GENTOO_PORTAGE_EPREFIX@/usr/bin/elinks" + X11BROWSERS_KDE="konqueror kfmbrowser" +-X11BROWSERS_GNOME="/usr/bin/mozilla /usr/bin/epiphany /usr/bin/galeon /usr/bin/kazehakase" +-X11BROWSERS_GENERIC="/usr/bin/mozilla /usr/bin/netscape /usr/bin/firefox" ++X11BROWSERS_GNOME="@GENTOO_PORTAGE_EPREFIX@/usr/bin/mozilla @GENTOO_PORTAGE_EPREFIX@/usr/bin/epiphany @GENTOO_PORTAGE_EPREFIX@/usr/bin/galeon @GENTOO_PORTAGE_EPREFIX@/usr/bin/kazehakase" ++X11BROWSERS_GENERIC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/mozilla @GENTOO_PORTAGE_EPREFIX@/usr/bin/netscape @GENTOO_PORTAGE_EPREFIX@/usr/bin/firefox" + + if [ "x`pidof gnome-session`" != "x" ]; then + X11BROWSERS="$GCONF $X11BROWSERS_GENERIC $X11BROWSERS_GNOME $X11BROWSERS_KDE" |