commit: 0ea4b4f1eb9f40f926eceaa025cedf07021d0e8b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 21:17:52 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 22:25:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea4b4f1
sys-apps/dtc: drop old versions
sys-apps/dtc/Manifest | 2 -
sys-apps/dtc/dtc-1.3.0-r1.ebuild | 52 -------------
sys-apps/dtc/dtc-1.3.0.ebuild | 46 -----------
sys-apps/dtc/dtc-1.4.0.ebuild | 52 -------------
sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch | 118 -----------------------------
5 files changed, 270 deletions(-)
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 7fc19d2..0803f93 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,3 +1 @@
DIST dtc-1.4.1.tar.xz 107920 SHA256
77992ad8eac7b68f553d0ba58e5b51604ac803d126196c99e3ae38aaae28bb94 SHA512
63df730e65f62b8c9648cfee5461809188f4198cbf98de25fbe5cb7f2f43c405266abb740501740f59847dc6faf0588bcbc734d08ae5430b05c2601e070d6d05
WHIRLPOOL
93e9ed26024e4650bb2de6323ea639a3e52622aa3891a9f9404959b600d2c1cbc633d18e30d3629ac54ae662e8c58a7d0ca7910a9b323cd8dd4ff6e43a3fdf67
-DIST dtc-v1.3.0.tgz 108540 SHA256
4da48956d812e221f68d1d538cd58ca8ed7412af4ab9ef42a702db9173c372fe SHA512
4506eb4c3eaccabbf6773a3b0cbf3b174560e5004cf8af9f88448ad1371d1c57d793f078b2bd99b63714df538e74d6dfe16f112bc8283d412b1026f5f5c8220e
WHIRLPOOL
4e87da05024d94998999a5e0090f91e4af4a66937dc6d5deec9bf7dd320fd9e732d30ccb6195dd0ce924c0f3c817d6af4731761e08dbc0e365e85ad8719e7935
-DIST dtc-v1.4.0.tar.xz 105160 SHA256
6df33a5da65fd43e0bc265a6c99104ca2962a97cf2d78171ed10d68e546ce198 SHA512
d0021c27e3614776db72c3d84cf05b98b1c49e14991ce12db6a90e9ac7d8aa248064f071c7a3b5bc9a20e9b22f070187778faa49bb3a5d0916afdfd9a929b743
WHIRLPOOL
366dd030aeaf042a7b60c7f900befaac124799d2db02c272d513615e08b208de26ab678c2dc48187f52f19bc2d5bcdf9b5694521298122706726e11ddaaa2afe
diff --git a/sys-apps/dtc/dtc-1.3.0-r1.ebuild b/sys-apps/dtc/dtc-1.3.0-r1.ebuild
deleted file mode 100644
index 02bacac..0000000
--- a/sys-apps/dtc/dtc-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-MY_P="${PN}-v${PV}"
-
-inherit multilib toolchain-funcs eutils
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.jdl.com/software/dtc.git"
- inherit git-2
-else
- SRC_URI="http://www.jdl.com/software/${MY_P}.tgz";
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Open Firmware device-trees compiler"
-HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- sys-devel/bison"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fdtdump.patch #372895
- sed -i \
- -e '/^CFLAGS =/s:=:+=:' \
- -e '/^CPPFLAGS =/s:=:+=:' \
- -e 's:-Werror::' \
- -e 's:-g -Os::' \
- -e '/^PREFIX =/s:=.*:= /usr:' \
- -e "/^LIBDIR =/s:=.*:= /usr/$(get_libdir):" \
- Makefile || die
- tc-export AR CC
- export V=1
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- use static-libs || find "${ED}" -name '*.a' -delete
- dodoc Documentation/manual.txt
-}
diff --git a/sys-apps/dtc/dtc-1.3.0.ebuild b/sys-apps/dtc/dtc-1.3.0.ebuild
deleted file mode 100644
index 3ea96bc..0000000
--- a/sys-apps/dtc/dtc-1.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit toolchain-funcs
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Open Firmware device-trees compiler"
-HOMEPAGE="http://www.t2-project.org/packages/dtc.html";
-SRC_URI="http://www.jdl.com/software/${MY_P}.tgz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- sys-devel/bison"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i -e "s:CFLAGS =:CFLAGS +=:" \
- -e "s:CPPFLAGS =:CPPFLAGS +=:" \
- -e "s:-Werror::" \
- -e "s:-g -Os::" \
- Makefile || die
-}
-
-src_compile() {
- tc-export AR CC
- emake PREFIX="/usr" LIBDIR="/usr/$(get_libdir)"
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \
- install
- dodoc Documentation/manual.txt
-}
diff --git a/sys-apps/dtc/dtc-1.4.0.ebuild b/sys-apps/dtc/dtc-1.4.0.ebuild
deleted file mode 100644
index af5971f..0000000
--- a/sys-apps/dtc/dtc-1.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-MY_P="${PN}-v${PV}"
-
-inherit multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.jdl.com/software/dtc.git"
- inherit git-2
-else
- SRC_URI="http://www.jdl.com/software/${MY_P}.tar.xz";
- KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="Open Firmware device-trees compiler"
-HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="app-arch/xz-utils
- sys-devel/flex
- sys-devel/bison"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i \
- -e '/^CFLAGS =/s:=:+=:' \
- -e '/^CPPFLAGS =/s:=:+=:' \
- -e 's:-Werror::' \
- -e 's:-g -Os::' \
- -e '/^PREFIX =/s:=.*:= /usr:' \
- -e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
- Makefile || die
- tc-export AR CC
- export V=1
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- use static-libs || find "${ED}" -name '*.a' -delete
- dodoc Documentation/manual.txt
-}
diff --git a/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch
b/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch
deleted file mode 100644
index 0bb1c8c..0000000
--- a/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-https://bugs.gentoo.org/372895
-
-From 8f459c5d72673e1a3a119ac58a7eee56236fca73 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vap...@gentoo.org>
-Date: Tue, 25 Oct 2011 17:29:24 -0400
-Subject: [PATCH] fdtdump: rename from ftdump
-
-The freetype package already installs a binary named "ftdump", so the dtc
-package conflicts with that. So rename the newer dtc tool to "fdtdump".
-This even makes a bit more sense:
- ftdump: [F]lat device [T]ree [dump]
- fdtdump: [F]lat [D]evice [T]ree [dump]
-
-Signed-off-by: Mike Frysinger <vap...@gentoo.org>
-Acked-by: David Gibson <da...@gibson.dropbear.id.au>
----
- .gitignore | 2 +-
- Documentation/manual.txt | 10 +++++-----
- Makefile | 6 +++---
- Makefile.utils | 6 +++---
- ftdump.c => fdtdump.c | 2 +-
- 5 files changed, 13 insertions(+), 13 deletions(-)
- rename ftdump.c => fdtdump.c (97%)
-
-diff --git a/Documentation/manual.txt b/Documentation/manual.txt
-index f8a8a7b..14508f3 100644
---- a/Documentation/manual.txt
-+++ b/Documentation/manual.txt
-@@ -21,7 +21,7 @@ III - libfdt
-
- IV - Utility Tools
- 1) convert-dtsv0 -- Conversion to Version 1
-- 1) ftdump
-+ 1) fdtdump
-
-
- I - "dtc", the device tree compiler
-@@ -643,10 +643,10 @@ a new file with a "v1" appended the filename.
- Comments, empty lines, etc. are preserved.
-
-
--2) ftdump -- Flat Tree dumping utility
-+2) fdtdump -- Flat Device Tree dumping utility
-
--The ftdump program prints a readable version of a flat device tree file.
-+The fdtdump program prints a readable version of a flat device tree file.
-
--The syntax of the ftdump command line is:
-+The syntax of the fdtdump command line is:
-
-- ftdump <DTB-file-name>
-+ fdtdump <DTB-file-name>
-diff --git a/Makefile b/Makefile
-index b32409b..4582f5d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -109,7 +109,7 @@ include Makefile.utils
-
- BIN += convert-dtsv0
- BIN += dtc
--BIN += ftdump
-+BIN += fdtdump
-
- SCRIPTS = dtdiff
-
-@@ -119,7 +119,7 @@ all: $(BIN) libfdt
- ifneq ($(DEPTARGETS),)
- -include $(DTC_OBJS:%.o=%.d)
- -include $(CONVERT_OBJS:%.o=%.d)
---include $(FTDUMP_OBJS:%.o=%.d)
-+-include $(FDTDUMP_OBJS:%.o=%.d)
- endif
-
-
-@@ -178,7 +178,7 @@ convert-dtsv0: $(CONVERT_OBJS)
- @$(VECHO) LD $@
- $(LINK.c) -o $@ $^
-
--ftdump: $(FTDUMP_OBJS)
-+fdtdump: $(FDTDUMP_OBJS)
-
-
- #
-diff --git a/Makefile.utils b/Makefile.utils
-index 0ed9297..fae5b00 100644
---- a/Makefile.ftdump
-+++ b/Makefile.ftdump
-@@ -4,8 +4,8 @@
- # into other systems of Makefiles.
- #
-
--FTDUMP_SRCS = \
-- ftdump.c
-+FDTDUMP_SRCS = \
-+ fdtdump.c
-
--FTDUMP_GEN_SRCS =
-+FDTDUMP_GEN_SRCS =
-
--FTDUMP_OBJS = $(FTDUMP_SRCS:%.c=%.o) $(FTDUMP_GEN_SRCS:%.c=%.o)
-+FDTDUMP_OBJS = $(FDTDUMP_SRCS:%.c=%.o) $(FDTDUMP_GEN_SRCS:%.c=%.o)
-diff --git a/ftdump.c b/fdtdump.c
-similarity index 97%
-rename from ftdump.c
-rename to fdtdump.c
-index cc55fe2..207a46d 100644
---- a/ftdump.c
-+++ b/fdtdump.c
-@@ -1,5 +1,5 @@
- /*
-- * ftdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT
gmail.com>
-+ * fdtdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT
gmail.com>
- */
-
- #include <stdint.h>
---
-1.7.12.4
-
