public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in www-client/htmlview/files: htmlview-3.0.0-prefix.patch
@ 2011-01-25 17:36 Jeremy Olexa (darkside)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa (darkside) @ 2011-01-25 17:36 UTC (permalink / raw
  To: gentoo-commits

darkside    11/01/25 17:36:14

  Added:                htmlview-3.0.0-prefix.patch
  Log:
  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)

Revision  Changes    Path
1.1                  www-client/htmlview/files/htmlview-3.0.0-prefix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/htmlview/files/htmlview-3.0.0-prefix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/htmlview/files/htmlview-3.0.0-prefix.patch?rev=1.1&content-type=text/plain

Index: htmlview-3.0.0-prefix.patch
===================================================================
--- 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"






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in www-client/htmlview/files: htmlview-3.0.0-prefix.patch
@ 2011-01-25 17:42 Jeremy Olexa (darkside)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa (darkside) @ 2011-01-25 17:42 UTC (permalink / raw
  To: gentoo-commits

darkside    11/01/25 17:42:50

  Modified:             htmlview-3.0.0-prefix.patch
  Log:
  drop useless hunk of patch
  
  (Portage version: 2.1.9.25/cvs/Linux i686)

Revision  Changes    Path
1.2                  www-client/htmlview/files/htmlview-3.0.0-prefix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/htmlview/files/htmlview-3.0.0-prefix.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/htmlview/files/htmlview-3.0.0-prefix.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/htmlview/files/htmlview-3.0.0-prefix.patch?r1=1.1&r2=1.2

Index: htmlview-3.0.0-prefix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/htmlview/files/htmlview-3.0.0-prefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- htmlview-3.0.0-prefix.patch	25 Jan 2011 17:36:14 -0000	1.1
+++ htmlview-3.0.0-prefix.patch	25 Jan 2011 17:42:50 -0000	1.2
@@ -1,11 +1,5 @@
 --- 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() {






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in www-client/htmlview/files: htmlview-3.0.0-prefix.patch
@ 2014-03-24  7:30 Dion Moult (moult)
  0 siblings, 0 replies; 3+ messages in thread
From: Dion Moult (moult) @ 2014-03-24  7:30 UTC (permalink / raw
  To: gentoo-commits

moult       14/03/24 07:30:25

  Removed:              htmlview-3.0.0-prefix.patch
  Log:
  www-client/htmlview removal (pending 12 Feb 2014), see #480522 for details


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-03-24  7:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-25 17:36 [gentoo-commits] gentoo-x86 commit in www-client/htmlview/files: htmlview-3.0.0-prefix.patch Jeremy Olexa (darkside)
  -- strict thread matches above, loose matches on Subject: below --
2011-01-25 17:42 Jeremy Olexa (darkside)
2014-03-24  7:30 Dion Moult (moult)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox