[gentoo-commits] repo/gentoo:master commit in: x11-misc/sux/files/, x11-misc/sux/

[Jeroen Roovers]

commit:     ee0376187fc13ba99ff5a458d8dae7f87fd81cda
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 11:17:23 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 11:26:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee037618

x11-misc/sux: Version 1.0.1

- Unify two patches
- Install suxterm, man pages, docs

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/sux/Manifest                              |  1 +
 ...x-1.0-r1.patch => sux-1.0-xauth-and-home.patch} | 10 ++++-----
 x11-misc/sux/files/sux-X11R6.patch                 | 24 --------------------
 x11-misc/sux/sux-1.0-r4.ebuild                     |  3 +--
 x11-misc/sux/sux-1.0.1.ebuild                      | 26 ++++++++++++++++++++++
 5 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index e2de646105b..ad1a45ff499 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -1 +1,2 @@
 DIST sux 9403 BLAKE2B 26df0f3759b4f4f70479d1532459e3e04da05098045bed7b1066a89f6c636a1200f28866c7ba251d54c24d621b658686889f2306ed797719dfb95a55fb7b3430 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598
+DIST sux-1.0.1.tar.gz 10614 BLAKE2B f22005a76194ff483ec24ad6ca1d92190fa9f2dbeabb96ad0343b06658b2bc2498e502e167e67df9ed335c74120b443e3daa31530aa18c615416d8464d758a5c SHA512 f121f70daa9e341ae636361675b1c73e3bb5c3f2301b93b32155c79175b3639d307b8fb0b63fbd51d98b6f3ae6c4530c0991343e86f95192a523a9a08a6048f3

diff --git a/x11-misc/sux/files/sux-1.0-r1.patch b/x11-misc/sux/files/sux-1.0-xauth-and-home.patch
similarity index 86%
rename from x11-misc/sux/files/sux-1.0-r1.patch
rename to x11-misc/sux/files/sux-1.0-xauth-and-home.patch
index 5be78fd7b7d..09bcf3826af 100644
--- a/x11-misc/sux/files/sux-1.0-r1.patch
+++ b/x11-misc/sux/files/sux-1.0-xauth-and-home.patch
@@ -13,11 +13,11 @@
    # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging 
    # around.
 -  export TERM="xauth -q remove $DISPLAY 2>/dev/null;"
-+  export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;"
++  export TERM="/usr/bin/xauth -q remove $DISPLAY 2>/dev/null;"
    if [ -n "$sux_unix_display" ]
    then
 -    TERM="$TERM xauth -q remove $sux_unix_display;"
-+    TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;"
++    TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;"
    fi
  
    # Note that there may be more than one cookie to transfer, hence 
@@ -26,11 +26,11 @@
      if [ $sux_i -eq 9 ]
      then
 -      TERM="$TERM | xauth nmerge - ;"
-+      TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;"
++      TERM="$TERM | /usr/bin/xauth nmerge - ;"
        sux_i=0
      fi
    done
-@@ -316,12 +316,12 @@
+@@ -316,12 +315,12 @@
  # wouldn't have the proper access rights anyway...
  unset XAUTHORITY
  
@@ -44,7 +44,7 @@
    if [ -z "$sux_home" ]
    then
      echo "WARNING: --preserve-environment has been set, but no good value was found for XAUTHORITY, expect trouble" >&2
-@@ -334,4 +334,4 @@
+@@ -334,4 +333,4 @@
  ##
  # Execute su
  exec su $sux_su_opts -c "$sux_xauth_cmd \

diff --git a/x11-misc/sux/files/sux-X11R6.patch b/x11-misc/sux/files/sux-X11R6.patch
deleted file mode 100644
index 6b345a64696..00000000000
--- a/x11-misc/sux/files/sux-X11R6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/sux
-+++ b/sux
-@@ -229,10 +229,10 @@
-   # Remove the old cookies. They may cause trouble if we transfer only one 
-   # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging 
-   # around.
--  export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;"
-+  export TERM="/usr/bin/xauth -q remove $DISPLAY 2>/dev/null;"
-   if [ -n "$sux_unix_display" ]
-   then
--    TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;"
-+    TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;"
-   fi
- 
-   # Note that there may be more than one cookie to transfer, hence 
-@@ -249,7 +249,7 @@
-     sux_i=`expr $sux_i + 1`
-     if [ $sux_i -eq 9 ]
-     then
--      TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;"
-+      TERM="$TERM | /usr/bin/xauth nmerge - ;"
-       sux_i=0
-     fi
-   done

diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
index a9b3f0087aa..1acd867a81c 100644
--- a/x11-misc/sux/sux-1.0-r4.ebuild
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -23,8 +23,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}-r1.patch \
-		"${FILESDIR}"/${PN}-X11R6.patch \
+		"${FILESDIR}"/${PN}-1.0-xauth-and-home.patch \
 		"${FILESDIR}"/${P}-dash.patch
 }
 

diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild
new file mode 100644
index 00000000000..8619606a884
--- /dev/null
+++ b/x11-misc/sux/sux-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="\"su\" wrapper which transfers X credentials"
+HOMEPAGE="http://fgouget.free.fr/sux/sux-readme.shtml"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="x11-apps/xauth"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-xauth-and-home.patch
+)
+
+
+src_install() {
+	dobin ${PN}{,term}
+	dodoc TODO
+	newdoc debian/changelog Debian.changelog
+	doman debian/${PN}{,term}.1
+}