[gentoo-commits] repo/gentoo:master commit in: dev-util/conf2struct/files/, dev-util/conf2struct/

[gentoo-commits] repo/gentoo:master commit in: dev-util/conf2struct/files/, dev-util/conf2struct/

[Craig Andrews]

commit:     acfbdd45e61563b218e6dd4aebcb7a68d7434e63
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  4 13:19:10 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 13:20:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acfbdd45

dev-util/conf2struct: Cleanup old version

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 dev-util/conf2struct/Manifest                      |  1 -
 dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild  | 43 --------------------
 .../files/conf2struct-0_pre0-cc-and-cflags.patch   | 32 ---------------
 .../files/conf2struct-0_pre0-dest-exists.patch     | 21 ----------
 .../files/conf2struct-0_pre0-destdir.patch         | 47 ----------------------
 .../conf2struct-0_pre0-install-and-uninstall.patch | 33 ---------------
 .../conf2struct-0_pre0-install-not-run-all.patch   | 22 ----------
 7 files changed, 199 deletions(-)

diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
index 7a4049e5bb2..cd4a46a636d 100644
--- a/dev-util/conf2struct/Manifest
+++ b/dev-util/conf2struct/Manifest
@@ -1,2 +1 @@
-DIST conf2struct-0_pre0.tar.gz 50851 BLAKE2B 21db6cca56ba18a48c65395fbf3def5de6190515be46ca2e7113c17c9b874cdcc7fb72b06b586c57a1803e98b56df5decd10ea1dd6dcc4144a78d6a0ff6bf9dd SHA512 e0eb1d43ec1375e65796197c16246a2cc38e0a4d078c4028e8675cc1ff6ef08c7802ec18f57232d91f2d4133573129f7a2b05a9f1d8b74bbddd072550f846b1d
 DIST conf2struct-1.0.tar.gz 57393 BLAKE2B 7de4be755ec764d96a321c68ca68b3156889e24f6894ba78b1c88cbeff84525331f1105040d61b1121ca01ece8d50a5aee2268eb73cde3ebbc8b62f679e2451b SHA512 31e8f350af740e79d97f4698dfec9b5e8a31a8a1cee30da0af753db26eda5b61379e9156e1cb492aef5068a4987d5e8202215323b83328e99705ae3ad3c09b81

diff --git a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
deleted file mode 100644
index 631e635694c..00000000000
--- a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Create C parsers for libconfig and command-line"
-HOMEPAGE="https://github.com/yrutschle/conf2struct/"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm"
-	GIT_COMMIT="10ea3356b65e712fb000f4d37f00e1dc09c1e722"
-	SRC_URI="https://github.com/yrutschle/conf2struct/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${P}-install-and-uninstall.patch"
-	"${FILESDIR}/${P}-cc-and-cflags.patch"
-	"${FILESDIR}/${P}-destdir.patch"
-	"${FILESDIR}/${P}-install-not-run-all.patch"
-	"${FILESDIR}/${P}-dest-exists.patch"
-)
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/libconfig
-	dev-perl/Conf-Libconfig"
-DEPEND="${RDEPEND}"
-
-src_compile(){
-	# -j1 due to parallel make issue reported upstream at: https://github.com/yrutschle/conf2struct/issues/10
-	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install(){
-	emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
-}

diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch
deleted file mode 100644
index 322e8724e6c..00000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8c68116a9c2e086e83075f46a1b21de218c2dd2e Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:31:59 -0400
-Subject: [PATCH] Add CC and use CFLAGS in Makefile
-
-CC is necessary to specify the compiler to use (default to gcc) and use CFLAGS to specify compiler arguments
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..5b7212f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,7 +6,7 @@ all: example checker
- CFLAGS=-g
- 
- checker: confcheck.o
--	gcc -o confcheck confcheck.o -lconfig
-+	$(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig
- 
- 
- install: all
-@@ -18,7 +18,7 @@ uninstall:
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)
--	gcc -o example $(EG_OBJ) -lconfig
-+	$(CC) $(CFLAGS) -o example $(EG_OBJ) -lconfig
- 
- example.c: eg_conf.cfg
- 	./conf2struct eg_conf.cfg

diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch
deleted file mode 100644
index cb345f3588c..00000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f4bc59c6cad87f6a237f92ea4c54e38705beeaac Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 16:24:14 -0400
-Subject: [PATCH] In install, ensure destination exists
-
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..8bebca4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,6 +10,7 @@ checker: confcheck.o
- 
- 
- install:
-+	mkdir -p $(DESTDIR)/$(bindir)
- 	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 

diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch
deleted file mode 100644
index bae336e1085..00000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f3724170ae5b5e750ec5482241add97217047eb4 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:33:49 -0400
-Subject: [PATCH 1/2] Use DESTDIR in install target
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..fd2f21b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@ checker: confcheck.o
- 
- 
- install: all
--	install -c conf2struct $(bindir)/conf2struct
--	install -c confcheck $(bindir)/confcheck
-+	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
-+	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
- uninstall:
- 	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
-
-From fa13135f93435de520480be9c1a578b20d538f55 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:36:24 -0400
-Subject: [PATCH 2/2] Use DESTDIR in uninstall target
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index fd2f21b..ca1e673 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,7 +14,7 @@ install: all
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
- uninstall:
--	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
-+	rm -rf $(DESTDIR)$(bindir)/conf2struct $(DESTDIR)$(bindir)/confcheck
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)

diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch
deleted file mode 100644
index 79269d62883..00000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9c0e889e29944428106c12ee28ce0074a29eae50 Mon Sep 17 00:00:00 2001
-From: Yves Rutschle <git1@rutschle.net>
-Date: Sat, 29 Jun 2019 18:41:20 +0200
-Subject: [PATCH] added install and uninstall targets to Makefile
-
----
- Makefile | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index b03aab3..bf9bae3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,5 @@
-+prefix=/usr/local
-+bindir=$(prefix)/bin
- 
- all: example checker
- 
-@@ -6,6 +8,13 @@ CFLAGS=-g
- checker: confcheck.o
- 	gcc -o confcheck confcheck.o -lconfig
- 
-+
-+install: all
-+	install -c conf2struct $(bindir)/conf2struct
-+	install -c confcheck $(bindir)/confcheck
-+
-+uninstall:
-+	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)

diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch
deleted file mode 100644
index 5eca0a1de7b..00000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b43351d0fdd687ed39b38531f673ba634aca5fee Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 16:22:49 -0400
-Subject: [PATCH] Install target should not run all
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..8943248 100644
---- a/Makefile
-+++ b/Makefile
-@@ -9,7 +9,7 @@ checker: confcheck.o
- 	$(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig
- 
- 
--install: all
-+install:
- 	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
-