Version bump. Removed old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

7 files changed, 10 insertions, 155 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/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