From 0bd11f8244d3c83037a41b92b317483c336d5167 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Mon, 13 Aug 2018 08:38:44 +0200
Subject: sys-block/di: Bump to version 4.47

Package-Manager: Portage-2.3.46, Repoman-2.3.10
---
 sys-block/di/Manifest                      |  1 +
 sys-block/di/di-4.47.ebuild                | 39 ++++++++++++++++++++++++++++++
 sys-block/di/files/di-4.47-no_echo-n.patch | 24 ++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 sys-block/di/di-4.47.ebuild
 create mode 100644 sys-block/di/files/di-4.47-no_echo-n.patch

(limited to 'sys-block')

diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index e722326542b8..e8e5a94b9fc6 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -2,3 +2,4 @@ DIST di-4.43.tar.gz 267160 BLAKE2B c8e56e07d82df21eb839e97ee1d20ca76530ad3485888
 DIST di-4.44.tar.gz 267509 BLAKE2B 0dd84906a1e710db9868c15cbc3334976469206d44d302a4ec31bad05cbc43643acd1076f0c12a22c9d642e21c6a9a03d6359db62902da5814bba73a346fae3d SHA512 e4d04def74ee1d9349daa8f01519243833135d63220678b3841505ba2d4667d1d5ec81a09e891bf1abb5e0016fc9cb6e674292665d0d29af7371160ff6eced5c
 DIST di-4.45.tar.gz 213282 BLAKE2B aafeed268940a9680e21cdbf6b3b21c7636d6638f35347be8389af7654fa993839c85845468ba7cb44bacc63a71efe9db36dcf9bea8fb4ef03a91f04d93c13c3 SHA512 f66fbc69f984b3a3bebbec935f583fb1ad84e33265ebb2734486f784459604071d9ec1639fa0edec5a4b48397f465656d40570f42d10fa0ef50dea17ed9cdd75
 DIST di-4.46.tar.gz 217096 BLAKE2B 4757dec7d9c0da121d0057e8088ecb5994f60eec8de49db4a12e84a68d2ad9dc86462f01370786e0c03a792f39984aead2d838d34b4881396aacb39386635bfd SHA512 ead1172dfa9db74d6a8378f8ded460b365c0445d75d71154c67446585d63c0824f8fdc4818438b3d9c3c4795af518f1499c29762712fd62ab97e9be7e680d133
+DIST di-4.47.tar.gz 250479 BLAKE2B 64156867ab31c448dfc428331a54900a54df4689f851f86f6b8e33403b2f0b785aadd8140576bc75f03ed675cf31fffe15d577b477e5d07a4e678bf625f46f49 SHA512 6bb004a9230dd59174c59b823a80ccc9b237a08947ac15502a805cf95e8803c05ac4e8c2282164130db2e23e8f521bf16c30f2c0996c96a9612d139d66df89f5
diff --git a/sys-block/di/di-4.47.ebuild b/sys-block/di/di-4.47.ebuild
new file mode 100644
index 000000000000..129c2ef259fc
--- /dev/null
+++ b/sys-block/di/di-4.47.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Disk Information Utility"
+HOMEPAGE="http://www.gentoo.com/di/"
+SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RESTRICT="test" #405205, #405471
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.33-build.patch
+	"${FILESDIR}"/${PN}-4.47-no_echo-n.patch
+)
+
+src_configure() {
+	emake checkbuild
+	emake -C C config.h
+}
+
+src_compile() {
+	emake prefix=/usr CC="$(tc-getCC)" NLS=$(usex nls T F)
+}
+
+src_install() {
+	emake install prefix="${D}/usr"
+	# default symlink is broken
+	dosym di /usr/bin/mi
+	dodoc README
+}
diff --git a/sys-block/di/files/di-4.47-no_echo-n.patch b/sys-block/di/files/di-4.47-no_echo-n.patch
new file mode 100644
index 000000000000..ff6c2045f23f
--- /dev/null
+++ b/sys-block/di/files/di-4.47-no_echo-n.patch
@@ -0,0 +1,24 @@
+Neither "echo -n" nor "echo ... \c" is POSIX compliant.
+
+See "man 1p echo" section "APPLICATION USAGE" or
+https://www.in-ulm.de/%7Emascheck/various/echo+printf/
+
+--- di-4.47/mkconfig/bin/shellfuncs.sh
++++ di-4.47/mkconfig/bin/shellfuncs.sh
+@@ -45,15 +45,7 @@
+ 
+ test_echo () {
+   # It was suggested to use printf().
+-  # printf does not quite work the same in the Tru64 shell.
+-  # Of course no one uses that any more...
+-  _tEN='-n'
+-  _tEC=''
+-  if [ "`echo -n test`" = "-n test" ]; then
+-    _tEN=''
+-    _tEC='\c'
+-  fi
+-  eval 'putsnonl () { echo ${_tEN} "$*"${_tEC}; }'
++  eval 'putsnonl () { printf '%s' "$*"; }'
+   eval 'puts () { echo "$*"; }'
+ }
+ 
-- 
cgit v1.2.3-65-gdbad