diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2018-08-13 08:40:04 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-08-13 08:42:37 +0200 |
commit | 65fdabca3359fc56e507eeebdc3a95fb4b65cdde (patch) | |
tree | 5314b8cad2f12b88ab2e60dcda6ef298a2b6f0b3 /sys-block | |
parent | sys-block/di: Bump to version 4.47 (diff) | |
download | gentoo-65fdabca3359fc56e507eeebdc3a95fb4b65cdde.tar.gz gentoo-65fdabca3359fc56e507eeebdc3a95fb4b65cdde.tar.bz2 gentoo-65fdabca3359fc56e507eeebdc3a95fb4b65cdde.zip |
sys-block/di: Removed old.
Package-Manager: Portage-2.3.46, Repoman-2.3.10
Diffstat (limited to 'sys-block')
-rw-r--r-- | sys-block/di/Manifest | 2 | ||||
-rw-r--r-- | sys-block/di/di-4.44.ebuild | 36 | ||||
-rw-r--r-- | sys-block/di/di-4.45.ebuild | 39 | ||||
-rw-r--r-- | sys-block/di/files/di-4.45-no_echo-n.patch | 190 |
4 files changed, 0 insertions, 267 deletions
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest index e8e5a94b9fc6..b1a13b9f6d6c 100644 --- a/sys-block/di/Manifest +++ b/sys-block/di/Manifest @@ -1,5 +1,3 @@ DIST di-4.43.tar.gz 267160 BLAKE2B c8e56e07d82df21eb839e97ee1d20ca76530ad3485888523faffdf0ad79941b35da41fde83645b58a747c1b40882fe68838255d081bc5fa32d9a3dd4846b43a8 SHA512 5b84c2ebf6fa22f6c7fee5872cc81a76e897cadbdaf8ce1b1b8dac0d53d5460127c8144f94fad204bdc522117cd1fcbac2905a065057d83b8aed0d69a5b95f9a -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.44.ebuild b/sys-block/di/di-4.44.ebuild deleted file mode 100644 index 6ca0d1c3fa8b..000000000000 --- a/sys-block/di/di-4.44.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils 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="" - -RESTRICT="test" #405205, #405471 - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.33-build.patch -} - -src_configure() { - emake checkbuild - emake -C C config.h -} - -src_compile() { - emake prefix=/usr CC="$(tc-getCC)" -} - -src_install() { - emake install prefix="${D}/usr" - # default symlink is broken - dosym di /usr/bin/mi - dodoc README -} diff --git a/sys-block/di/di-4.45.ebuild b/sys-block/di/di-4.45.ebuild deleted file mode 100644 index 0f2ee5708aa4..000000000000 --- a/sys-block/di/di-4.45.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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.45-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.45-no_echo-n.patch b/sys-block/di/files/di-4.45-no_echo-n.patch deleted file mode 100644 index a15901a257b5..000000000000 --- a/sys-block/di/files/di-4.45-no_echo-n.patch +++ /dev/null @@ -1,190 +0,0 @@ -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.45/C/tests.d/rpmbuild.sh -+++ di-4.45/C/tests.d/rpmbuild.sh -@@ -12,13 +12,13 @@ - locatecmd locrpmbuild rpmbuild - - if [ "${locrpmbuild}" = "" ];then -- echo ${EN} " skipped${EC}" >&5 -+ printf '%s' " skipped" >&5 - exit 0 - fi - - rvers=`rpmbuild --version | tr -cd '0-9' | sed 's/^\(...\).*/\1/'` - if [ $rvers -lt 470 ]; then -- echo ${EN} " old version skipped${EC}" >&5 -+ printf '%s' " old version skipped" >&5 - exit 0 - fi - ---- di-4.45/mkconfig/bin/shellfuncs.sh -+++ di-4.45/mkconfig/bin/shellfuncs.sh -@@ -28,17 +28,6 @@ - echo "mkconfig version ${_MKCONFIG_VERSION}" - } - --setechovars () { -- EN='-n' -- EC='' -- if [ "`echo -n test`" = "-n test" ]; then -- EN='' -- EC='\c' -- fi -- export EN -- export EC --} -- - dosubst () { - subvar=$1 - shift ---- di-4.45/mkconfig/bin/testfuncs.sh -+++ di-4.45/mkconfig/bin/testfuncs.sh -@@ -19,14 +19,14 @@ - - chkccompiler () { - if [ "${CC}" = "" ]; then -- echo ${EN} " no C compiler; skipped${EC}" >&5 -+ printf '%s' " no C compiler; skipped" >&5 - exit 0 - fi - } - - chkdcompiler () { - if [ "${DC}" = "" ]; then -- echo ${EN} " no D compiler; skipped${EC}" >&5 -+ printf '%s' " no D compiler; skipped" >&5 - exit 0 - fi - } ---- di-4.45/mkconfig/mkconfig.sh -+++ di-4.45/mkconfig/mkconfig.sh -@@ -28,7 +28,6 @@ - . ${_MKCONFIG_DIR}/bin/shellfuncs.sh - - doshelltest $0 $@ --setechovars - - LOG="mkconfig.log" - _MKCONFIG_TMP="_tmp_mkconfig" -@@ -154,7 +153,7 @@ - tlabel=$2 - - echo " $ifleveldisp[${tname}] ${tlabel} ... " >&9 -- echo ${EN} "${ifleveldisp}${tlabel} ... ${EC}" >&1 -+ printf '%s' "${ifleveldisp}${tlabel} ... " >&1 - } - - _doexport () { ---- di-4.45/mkconfig/mkc.sh -+++ di-4.45/mkconfig/mkc.sh -@@ -16,7 +16,6 @@ - . ${_MKCONFIG_DIR}/bin/shellfuncs.sh - - doshelltest $0 $@ --setechovars - - rc=0 - args=$@ ---- di-4.45/mkconfig/units/c-main.sh -+++ di-4.45/mkconfig/units/c-main.sh -@@ -559,7 +559,7 @@ - eval $cmd - echo "## dcl(C): ${dcl}" >&9 - c=`echo ${dcl} | sed 's/[^,]*//g'` -- ccount=`echo ${EN} "$c${EC}" | wc -c` -+ ccount=`printf '%s' "$c" | wc -c` - domath ccount "$ccount + 1" # 0==1 also, unfortunately - c=`echo ${dcl} | sed 's/^[^(]*(//'` - c=`echo ${c} | sed 's/)[^)]*$//'` ---- di-4.45/mkconfig/units/d-main.sh -+++ di-4.45/mkconfig/units/d-main.sh -@@ -1680,7 +1680,7 @@ - echo "## tdcl(D): ${tdcl}" >&9 - if [ $argflag = 1 ]; then - c=`echo ${tdcl} | sed 's/[^,]*//g'` -- ccount=`echo ${EN} "$c${EC}" | wc -c` -+ ccount=`printf '%s' "$c" | wc -c` - domath ccount "$ccount + 1" # 0==1 also, unfortunately - c=`echo ${tdcl} | sed 's/^[^(]*(//'` - c=`echo ${c} | sed 's/)[^)]*$//'` ---- di-4.45/tests.d/buildsh.sh -+++ di-4.45/tests.d/buildsh.sh -@@ -43,7 +43,7 @@ - fi - fi - -- echo ${EN} " ${d}${EC}" >&5 -+ printf '%s' " ${d}" >&5 - ${MAKE:-make} ${TMAKEFLAGS} realclean - ${MAKE:-make} ${TMAKEFLAGS} -e prefix=${instdir} all > make.log 2>&1 - rc=$? ---- di-4.45/tests.d/diarg.sh -+++ di-4.45/tests.d/diarg.sh -@@ -93,7 +93,7 @@ - tdir=$_MKCONFIG_RUNTOPDIR/$d - - if [ -x ${tdir}/di ]; then -- echo ${EN} " ${d}${EC}" >&5 -+ printf '%s' " ${d}" >&5 - # most all unix - ${tdir}/di -n -f M / 2>/dev/null | grep '^/[ ]*$' > /dev/null 2>&1 - rc=$? -@@ -135,7 +135,7 @@ - done - - if [ $lrc -ne 0 ]; then -- echo ${EN} "*${EC}" >&5 -+ printf '%s' "*" >&5 - grc=1 - fi - else ---- di-4.45/tests.d/disort.sh -+++ di-4.45/tests.d/disort.sh -@@ -41,7 +41,7 @@ - fi - ) - if [ -x $tdir/di ]; then -- echo ${EN} " ${d}${EC}" >&5 -+ printf '%s' " ${d}" >&5 - echo "## regular sort first, then di sort" - echo "by special" - ${tdir}/di -n -a -f S | sort > s1 -@@ -118,12 +118,12 @@ - - rm -f s1 s2 - if [ $grc -ne 0 ]; then -- echo ${EN} "*${EC}" >&5 -+ printf '%s' "*" >&5 - fi - else - if [ $d = C ]; then - echo "## no di executable found for dir $d" -- echo ${EN} "*${EC}" >&5 -+ printf '%s' "*" >&5 - grc=1 - fi - fi ---- di-4.45/tests.d/ditot.sh -+++ di-4.45/tests.d/ditot.sh -@@ -27,7 +27,7 @@ - fi - ) - if [ -x ${tdir}/di ]; then -- echo ${EN} " ${d}${EC}" >&5 -+ printf '%s' " ${d}" >&5 - for format in $FORMATS; do - echo "Checking format: $format" - # have to exclude zfs, null (dragonflybsd) -@@ -37,7 +37,7 @@ - didata=`${tdir}/di -n -d1 -f $format -t -a -x null,zfs,ctfs,objfs,sharefs 2>/dev/null ` - summtot=`(echo "0 ";echo $didata | sed 's/ */ + /g'; echo " - p") | dc` - if [ $summtot -ne 0 ]; then -- echo ${EN} "*${EC}" >&5 -+ printf '%s' "*" >&5 - echo "## format: $format failed" - grc=1 - fi |