Version bump. Removed old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

8 files changed, 26 insertions, 171 deletions

diff --git a/sys-block/di/ChangeLog b/sys-block/di/ChangeLog
index e4150883e77b..bd370fa790a9 100644
--- a/sys-block/di/ChangeLog
+++ b/sys-block/di/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/di
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/ChangeLog,v 1.47 2015/03/29 14:33:25 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/di/ChangeLog,v 1.48 2015/05/19 07:33:33 polynomial-c Exp $
+
+*di-4.36 (19 May 2015)
+
+  19 May 2015; Lars Wendler <polynomial-c@gentoo.org> -di-4.31.ebuild,
+  -di-4.32.ebuild, -di-4.33.ebuild, -di-4.34.ebuild, +di-4.36.ebuild,
+  -files/di-4.31-mkdir.patch, -files/di-4.32-build.patch:
+  Version bump. Removed old.
 
   29 Mar 2015; Mikle Kolyada <zlogene@gentoo.org> di-4.35.ebuild:
   x86 stable wrt bug #530312
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 0eeb69cfb029..b4a6f6d34b56 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX di-4.31-mkdir.patch 460 SHA256 ff6d1f0d0e13a2c7e8931865965f282478b05cdafd80b61d993e366c2bf03fec SHA512 a67ff41d9806877c3f5b0f998acf0c2ad262216764049df5a0a88226b4ff0f4fc63bd200ac533b27207cb15eadbd8002a52c6016083bce8d3feffbd4f7be7971 WHIRLPOOL 1b8f9c906e341029320bf0518cf532cff309bacebea25f4a5943033fd33f5296fa87040b456a6e020f6df8d2820e68fbaa231a83f0b84fb23004cdac72ca74b6
-AUX di-4.32-build.patch 928 SHA256 fb785d084415b751db3b9ec0f359edf86d10768073ea653d98f05944bf42a0c4 SHA512 680c523747939aa405c2969087c735dfc39caa43491c00893b0f24db172f63384c004a7b69cdfd4d1ccbaee125b26a6b603ce0bc64173f1899ea52f2ff754fc8 WHIRLPOOL 4608e9c21cfc1f7be1868bfc15cba5cfa71722036bdd79ce9e85f5755489f87eba342bd8261a021ebebed710a34e1e8fe4b9fc19491acbd4f824fe2a2327bbe2
 AUX di-4.33-build.patch 1037 SHA256 c8f6c67ce48b3740351c2bb19835abd8adf7c7c3fc58fd7bb1f1155e2ea05092 SHA512 d55e665f89c9089c783d515ded56a9a5e49c76f51216971146cb5ee60becc1b61998cf4c2a72ab328ed7952734f5b39f651e1e1276d37f43c4d5397fcd09c75e WHIRLPOOL 5cfffbfe84abc963609a131ba0a416222f45997255d55306d612f9c407f46cb6de5887eeb9d65bf6b81547269a53daff4d9772b5b80a6dde3db54eca4eb7f4d5
-DIST di-4.31.tar.gz 184703 SHA256 148c263a1058f6643bd7e347d8f34e59caa9fcb71d1938f1344b077784f7f8fb SHA512 1386660eb74fb42d02890f0071c449d4308e9c1601b7c9f0a29e5f70bfa675259bba160311e9bae636f927be940dced3c5af81d88ba3e3ff29fdbb00384b70ca WHIRLPOOL 7a9c533d526e7f7a88f737201e3b6bc8df82752a72b525b85bd66210be9ecdc91d015398fc8f6d1b3e8f229c33cadba09fa5c96a7268015884d1a7c660e28991
-DIST di-4.32.tar.gz 212774 SHA256 b6483327484b9bd5a63eb7d3c51bdfa9f5614c06a1fc37b3b05ad710821a0dc8 SHA512 ecd48c241dead0c0e7b5f37759b6103b046226abb3b922e691c24ee60dc3988ffd79e69d5e910dca8ced6fc3193421519d18e8f10767f00b93d8e9e0060f7402 WHIRLPOOL 0a41837eae28778be91711fb79cec9c1415f0de4efda258c780526b429ee0c888a5c7d258448d9481bd4cdb9bfd7ef01f2bfdac6d67b6eaddb75ef43a2c74900
-DIST di-4.33.tar.gz 211519 SHA256 9887921ee518840c06c0372622b8c4e7f2651cbef4a9b14868b1ae23c463bcde SHA512 0f69399b0fee13e7824c6c66218839e7dc2bf803877dd609ccd5b1f569193bcfc8e53a1bd889276209f4d1eb536e6d46782251bc8136d3428b4e45366540d82a WHIRLPOOL 098a61b41441ac736d7e9eef602f9a63b071088036236973a7e24add352ccc7626999526ead1f5c6893a9f0b745cae453d76bf6a42b03c6ac1a1c1af4982378d
-DIST di-4.34.tar.gz 213367 SHA256 c2bdb2aab01da3fadd45037b37e11532316237c8bd8103e9c6307571c5876feb SHA512 34ba4bb800a5153aa1e4a2c2807f4a828e3e76817e2591847f29afcb79c4249ad77fbce0d9ceb00416c14b66cb6cde0daf9c8062d50f5e8cd3ba2a17f55e8f40 WHIRLPOOL 0378bf470a5f817b4c2644ef3dd4c7b28056dfe5d8d5c621deee3196fae82c9ad3123b1f820942a7028efed9ebb5f2641002f500593c479a69125d45bb7b4c62
 DIST di-4.35.tar.gz 212325 SHA256 2cdfface7a85e3a359cb228277b090a0648cabe18520e43b09919bdaf67b71d2 SHA512 5b7e7bd347b1ea285c4410e864f29cf475015a560baf450e558d3f8e1994b10822d6c3e18c04447c6a229d6d5e991194a4a3b155f3b36a8acfee866c8d048cec WHIRLPOOL 2891f70976f5818aa73ec3a07dc4afda678ae02c63b5a018cfb538a78d25f0432d70a7104ef1fe5f6e23e8e5f301430f4cc39b1538a83ea35d1a4748d4e55929
-EBUILD di-4.31.ebuild 677 SHA256 f5f280a11170f8577ac69050208b5aab0b70de9bf0a86be096dddfb145d0abf9 SHA512 60ac198e1eb9c4d68d2cc266b2a5c9b8af27810b530271417d6aecd56f5540b9658ad9acb7042c4763532e61103082171d83ff8e1ad0433a1b704c9500bb30fa WHIRLPOOL 6f2a04b97f089a129d4c696c1d94e2334ec20c6b56868309714e16ddab99e9c89838b63f5b607877a0430afeff0d057ad639f5e9d501965c5c1d69dbd38c888e
-EBUILD di-4.32.ebuild 768 SHA256 265cbbba2d088737602b0d76800fa22c449a49646ac578457e6d8738792da540 SHA512 991b2e07d5b48bb4fcde3210d97d736e043d84855aca9085cc37d43120fa88deba0f8cbe337e8e90faf066ee29d55e945f60616d7c6e347cf0815cea1263c32d WHIRLPOOL 6ad2bd4df167ea66fe10f3b8e07b6dbdefa4548c4c94410a1b7e8b26570322d952b7ada1428657d10c98485d317c48f23db9f76f04b1ed822b3e646b4c07a2b4
-EBUILD di-4.33.ebuild 780 SHA256 5187cba7ad035d04f79d9db385700d7170f9ceb529ecbb3681c4b863d34bba45 SHA512 1398d0159f9b4010c821e4226a384dea46c26a00715fc7ac19d966f627faacfef7285c46c53876c99873d5e04f0456e1adb36bb82daacc49232a352eb6d43504 WHIRLPOOL b9bb9e27086f425a1f0d6064d6b36545564167bd7faba88315c0b1a0e6767147237715eb3b4ed422a351346e07cf4356a3489a26cf15edf0127bf0451aadb8a5
-EBUILD di-4.34.ebuild 783 SHA256 8af5267bc990913c5fdc458f6bcded8c36f58e13972608091906b5a8673d35d2 SHA512 785144bb28e6d8a455d84d457da1e1435d46876951ba9653e0e3bdd77faa81a43aac5d6ebbde4b0229a8336d237db9e31c37c82e3f53cbb42a3c7d107fe55e61 WHIRLPOOL 987890d9c10841f3b72e2bdb918b2b532a2a10864a9a4705f661bf96958fa50e47b8a5fd9d88941787fac86027e5b46937cdeb7f42286a128601d5620504e2b8
+DIST di-4.36.tar.gz 212957 SHA256 eb03d2ac0a3df531cdcb64b3667dbaebede60a4d3a4626393639cecb954c6d86 SHA512 ce7d38d3e23e68caa70bc85b623b7f4f633e2abf11b5df66b7104be49f1a1b2e64754d51ed00dd9ae629409e2a4760424f781e0351697b077e6aafb64bedad78 WHIRLPOOL 8f2c486d02dbe3f41d74d8a4e1df006ef0fa690bd0e5f3d71c6c47813724a899088fe51da2cdbb5407c27626949b1d048dc0bc1f20a8d964288c0abd8bbdb058
 EBUILD di-4.35.ebuild 777 SHA256 630da6072b9b4f59f584165313d9a7065cfd924abe134432eba5e02d384f7a9d SHA512 735a21578b537c57fc692facffdca6c12edf32fdf31bf4a681c2bb23d08827f2332fa0d454a7eec07538c18cd6cb5797369c20429660c3c9bbbc6871c7a635d1 WHIRLPOOL 1fdf17fb2d40285b8a8b955100b147bb44f1a39a5ec62c5cc7d28d4a86fcfc473e224bcc6704bafdf018a95d89f8d7ad3669e8831af6794b18da7103acbd9bef
-MISC ChangeLog 6582 SHA256 94a9ac3bbe51b510b3159a64e0a0ca7e99f2fa07abaa24e24827c18ea9daf3a8 SHA512 da1e6663e924545e90c7a64e8491b967b28cecd832358a9159b692640db47731389d8a1077295557459c8f2241e5c24c3b44d29ab6859c2b54fa1292ca892c72 WHIRLPOOL 68bbd1c04b7eb1bd22e19b1eb6c2616be59f45d7add108c9d976b0e2c0692c33a128a6bff52f8bfa14def0ef6287b8b00c40ad342c731a357269591ef02bd3b0
+EBUILD di-4.36.ebuild 786 SHA256 2a68112f4314e78844478178eec2a507da375eceb609b06711651095bed6b1aa SHA512 0a7e4cb45d49af9f1b1a9cb998e072a758b2922b56ca514aa8d39997f824edb5d9e95026c15f3d4a15d411a8783185f44900035c4e41bfc60b62f188531b9660 WHIRLPOOL 4635c3c31479f79779b50cef0752daa5a371bd7a4ec671edf82a3ef14611c9b704e2ae19407dfada6d1103ce3682951d270cd1bcfb85954d335e007c4c9f77b8
+MISC ChangeLog 6840 SHA256 fd91cea46d862bc161019dba3c688388fbd3fb61c5c02b27d4274bd2397cfe9c SHA512 815f7765f1a248197cde22941d5989a0ee4f93209232c54777f314a35145423293719e77fa8dd7f9e94facd08fbcf9066187477fda880764638992e428215f81 WHIRLPOOL a8d24c8e3c683b15c88ddc160f5c9a6fbb3c5f5bc2c10cfdceca5d72ee4be62745a917480c15d1c747b3bfb5df4b6e855dfb5cbbe8989fff37042fa4c48add76
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlUYDMcACgkQG9wOWsQutdY4gQQAmYeS7his+YPoNCTB2ysSn05w
-Q8y8uZDKDJNqoq5vWaUzIRicZjZVdsKfpxEIMii8wzrrIEX7ErtcCE8t5t8pE4Oo
-idA9CUxTDc+5H6kimrgGULz2X7en6ha3Rw9YcjJyjcVhZYzBQH9XfBLMdqoHB3W0
-5UbT3adddH6MTxCWUSE=
-=U0up
+iQIcBAEBCAAGBQJVWudOAAoJEPiazRVxLXTFGgEQANOMoehYXRY+c6k9iTnl6fAg
+C7X1RXYlHgD7tcTuH4/SpChw/DqkQCfpO1iQg+yekG1ShiWKIXWshlXuafUu1jK4
+8OUOZeKMdeSqFiLEnmsfirC7Wf031m09ZzjJ/gD5BsHmINOgV2XjBL7Av/dH6t2s
+6owEkwp/sOrms1wis50EZKfK4yMHRtEY9Outy7BWLwb0x2WM3hNvpYkTURM0HWT3
+LlQ8j/mtbPvnxBAkSBtTaSK61gYXYxb2sZ7uMMQSN0QWi4QFgTQFNTROBKycNrF6
+c7TtlTqJQsmnL1aGFBk/77kb6V/C6N/f8aBC+3hE3JU0gEZRpaSCUXjls8hBjgdE
++pSNa91aCsYlhXPuYulGHX/DiOYyruKnuBzWrgG0NFtY+QRY2Vxax8DDK5I0+X6e
+HVSiOd/pgMuTuRLfj8O8HTC/0hFSqkvVgC3ebminfn+6cJsfKscx+Cu+RKmS+7LO
+eGsHr4xLfrR/K1ZWbaE9t+fCkhIvq7E2fV01mhzU9/cMtrJeaxFuYbYmaFmzvBt0
+6PvOMiI7wKSzyxRqrt4Daie0Cw67TKlRCwdAB4OEbyFLcLI2GngrnUZDNDO0rDKM
+Ft1isvHHdQ4IEl4QANwu6gWeWdb1+TKqmzB/AtUlMjubikkTTrtH9sAhiqluzZig
+b1r4zkJWvUJSVcAdFrMF
+=e95G
 -----END PGP SIGNATURE-----
diff --git a/sys-block/di/di-4.31.ebuild b/sys-block/di/di-4.31.ebuild
deleted file mode 100644
index b79573e75f2c..000000000000
--- a/sys-block/di/di-4.31.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.31.ebuild,v 1.6 2012/05/23 00:31:01 jdhore Exp $
-
-EAPI=4
-
-inherit toolchain-funcs eutils
-
-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=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-mkdir.patch
-}
-
-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.32.ebuild b/sys-block/di/di-4.32.ebuild
deleted file mode 100644
index 9f0678da0f4d..000000000000
--- a/sys-block/di/di-4.32.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.32.ebuild,v 1.1 2012/10/24 07:01:52 ssuominen Exp $
-
-EAPI=4
-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.31-mkdir.patch \
-		"${FILESDIR}"/${PN}-4.32-build.patch
-}
-
-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.34.ebuild b/sys-block/di/di-4.34.ebuild
deleted file mode 100644
index 5ed18e6bd1c1..000000000000
--- a/sys-block/di/di-4.34.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.34.ebuild,v 1.1 2013/01/24 08:48:23 radhermit Exp $
-
-EAPI=4
-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.33.ebuild b/sys-block/di/di-4.36.ebuild
index d7ae5915f864..76ab6dfa684d 100644
--- a/sys-block/di/di-4.33.ebuild
+++ b/sys-block/di/di-4.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.33.ebuild,v 1.1 2013/01/06 21:26:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.36.ebuild,v 1.1 2015/05/19 07:33:33 polynomial-c Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
diff --git a/sys-block/di/files/di-4.31-mkdir.patch b/sys-block/di/files/di-4.31-mkdir.patch
deleted file mode 100644
index 05fc923e7820..000000000000
--- a/sys-block/di/files/di-4.31-mkdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -134,8 +134,8 @@
- 
- .PHONY: install-prog
- install-prog:
--	$(TEST) -d $(INSTALL_DIR) || $(MKDIR) $(INSTALL_DIR)
--	$(TEST) -d $(INSTALL_BIN_DIR) || $(MKDIR) $(INSTALL_BIN_DIR)
-+	$(TEST) -d $(INSTALL_DIR) || $(MKDIR) -p $(INSTALL_DIR)
-+	$(TEST) -d $(INSTALL_BIN_DIR) || $(MKDIR) -p $(INSTALL_BIN_DIR)
- 	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(TARGET)
- 	-$(RM) -f $(MTARGET) > /dev/null 2>&1
- 	-$(LN) -s $(PROG)$(EXE_EXT) $(MTARGET)
diff --git a/sys-block/di/files/di-4.32-build.patch b/sys-block/di/files/di-4.32-build.patch
deleted file mode 100644
index 501cdfbe26fc..000000000000
--- a/sys-block/di/files/di-4.32-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-These are the first errors occuring:
-
-di.h:82:4: error: unknown type name ‘error’
-di.h:82:19: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘/’ token
-di.h:143:5: error: unknown type name ‘_fs_size_t’
-
-Then there is a lot more errors after above.
-
---- C/di.h
-+++ C/di.h
-@@ -9,6 +9,8 @@
- 
- #include "config.h"
- 
-+#include <string.h>
-+
- /*****************************************************/
- 
- #include <stdio.h>
-@@ -79,7 +81,7 @@
- 
- #if ! _lib_memcpy && ! defined (memcpy)
- # if ! _lib_bcopy
--   error No_memcpy/bcopy_available.
-+   //error No_memcpy/bcopy_available.
- # else
- #  define memcpy(dst, src, cnt)     (bcopy((src), (dst), (cnt)), dst)
- # endif
-@@ -87,7 +89,7 @@
- 
- #if ! _lib_memset && ! defined (memset)
- # if ! _lib_bzero
--   error No_memset/bzero_available.
-+   //error No_memset/bzero_available.
- # else
- #  define memset(s,c,n)    (bzero ((s), (n)), s)
- # endif