diff options
Diffstat (limited to 'dev-util/conf2struct')
9 files changed, 241 insertions, 0 deletions
diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest new file mode 100644 index 000000000000..afc20b95d766 --- /dev/null +++ b/dev-util/conf2struct/Manifest @@ -0,0 +1,9 @@ +AUX conf2struct-0_pre0-cc-and-cflags.patch 894 BLAKE2B 9c710bbb0096952e4f2646b143e2750c96c42c2cfa569419b876e284d2a635d53e7e62ed4d785486b77b08755f3a8700451772af4dac9c5464014545e090ee0b SHA512 734614dab00dae640ab88402299619581e10efcab26b8f86948848e9159acff182118409e371990fdf91a908628dcb6c4e77e46283020283d43ae33a4329d756 +AUX conf2struct-0_pre0-dest-exists.patch 555 BLAKE2B e64a5abc9baabc94e236b9990196103681a4679956286cf37ff0c7250fb9973b3bfe2b099867fc90159083510ec579733aee348a348836a17b9eec7d8d9a3e99 SHA512 0b650abfa1723d736b9df22c5fbe5a0e56a6910a0ec90da96f90f8cb03331d585b35174547830579601e67a9b2d8d2410a928bb7e1e3efd453dba66dcde86251 +AUX conf2struct-0_pre0-destdir.patch 1351 BLAKE2B 5c4665b981a146d52fcc04762efac2b8ffa2367f4543607d7d7071b43fdac8c2ec727b4b0ab3f6d2f05e6bea85c2adf214dfd9040713f2ed170a7e30b8dad713 SHA512 3dfcd71ae92aed31e20f39c8d3fd591b96b938967138b267cba89e7d7ae122dd14e8fef9b5a562c0cb9f0ff141f34a343ca4b677df0410ed00840d4a60503b29 +AUX conf2struct-0_pre0-install-and-uninstall.patch 777 BLAKE2B 3d2ba3033a69c15ded7125c5351b188f00599a2b313405fed5dcf5d637daa9ad309524fa75736e5a6267cfa40169a6fb3c1b5b6ac54ce0d4af51f920a04fe08f SHA512 6b2f80bc05a384146c3382eddfe169484f251afde790cf37aa65f6d745e78aa7255f01e3af302dafb1377a9bc7e79ce094abc30d4d48e84f96f8104215e06689 +AUX conf2struct-0_pre0-install-not-run-all.patch 599 BLAKE2B 47d6ba694800d4fbd1b13ddbb09b544fda9e4f1f3b9b0d55b5fac38ead760effae165b7a35ec436a200fb2a891744818fdc139f792deb066c30c595de95d5755 SHA512 17defb200110299a4bdb7f28ad20520ec152edad306212875fcd179e4aaa644196c9b7a166dbcd8eae69a88aec8b4548b272798f078377b22427f5df68376a39 +DIST conf2struct-0_pre0.tar.gz 50851 BLAKE2B 21db6cca56ba18a48c65395fbf3def5de6190515be46ca2e7113c17c9b874cdcc7fb72b06b586c57a1803e98b56df5decd10ea1dd6dcc4144a78d6a0ff6bf9dd SHA512 e0eb1d43ec1375e65796197c16246a2cc38e0a4d078c4028e8675cc1ff6ef08c7802ec18f57232d91f2d4133573129f7a2b05a9f1d8b74bbddd072550f846b1d +EBUILD conf2struct-0_pre0.ebuild 1024 BLAKE2B 3081dab11f2b4114221ab63e15ad27c25ae3577288a157d63fb17c8a3e24136b2d22aad6361e0c8ebdf8fd915b028c155f8a171571b48323388b85273f407c29 SHA512 2d4ee5252bc8183cc792da3552d7588fbbf234d0a1cd0b7e777a67cce82eced354ffe4eebb191b579cf7411e6d2b07f1d0f02183b14353ce176bf790d7912bb6 +EBUILD conf2struct-9999.ebuild 707 BLAKE2B 0de9f3340ffe5f3cdf6a88946bc6246c771dca717fec8bd1ccd951aa022164d93ce0c86c63b7a515f7ba9239fa248c0907628a311538bf203f427be2505d9d21 SHA512 2382f789d4b7b8ed1497cb529d1923dbd1226995642391253cbda604a42fa70ad27e24836ef9ecd6ba63742fb5c4ecc4d1fec76628e97334211678d72e4224c9 +MISC metadata.xml 334 BLAKE2B 8a441ec6c49f135a517821de0933e09c01861a135a0a16cad200acb2a695cb04bdc5d4d6ab076b95d7f547a8771984ee3cfca0c074ad1c41db3df5cee2876f60 SHA512 db25be9a745a1ebef49e8e477e24d715453cfe0bb698dc8e42ccf3ef8d8aac3cc9693e3f2873f28b3096016741bbf3c32841f025a06bcee61e9138ac2f6ee8b7 diff --git a/dev-util/conf2struct/conf2struct-0_pre0.ebuild b/dev-util/conf2struct/conf2struct-0_pre0.ebuild new file mode 100644 index 000000000000..c027b8564d68 --- /dev/null +++ b/dev-util/conf2struct/conf2struct-0_pre0.ebuild @@ -0,0 +1,38 @@ +# 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" + 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="GPL-2" +SLOT="0" +IUSE="caps pcre systemd tcpd" + +RDEPEND="dev-libs/libconfig + dev-perl/Conf-Libconfig" +DEPEND="${RDEPEND}" + +src_install(){ + emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install +} diff --git a/dev-util/conf2struct/conf2struct-9999.ebuild b/dev-util/conf2struct/conf2struct-9999.ebuild new file mode 100644 index 000000000000..3ab3bce60c3a --- /dev/null +++ b/dev-util/conf2struct/conf2struct-9999.ebuild @@ -0,0 +1,28 @@ +# 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" + SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps pcre systemd tcpd" + +RDEPEND="dev-libs/libconfig + dev-perl/Conf-Libconfig" +DEPEND="${RDEPEND}" + +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 new file mode 100644 index 000000000000..322e8724e6c4 --- /dev/null +++ b/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 000000000000..cb345f3588cc --- /dev/null +++ b/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 000000000000..bae336e10854 --- /dev/null +++ b/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch @@ -0,0 +1,47 @@ +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 new file mode 100644 index 000000000000..79269d628839 --- /dev/null +++ b/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch @@ -0,0 +1,33 @@ +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 new file mode 100644 index 000000000000..5eca0a1de7b3 --- /dev/null +++ b/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch @@ -0,0 +1,22 @@ +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 + diff --git a/dev-util/conf2struct/metadata.xml b/dev-util/conf2struct/metadata.xml new file mode 100644 index 000000000000..e969234c463c --- /dev/null +++ b/dev-util/conf2struct/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>candrews@gentoo.org</email> + <name>Craig Andrews</name> + </maintainer> + <upstream> + <remote-id type="github">yrutschle/conf2struct</remote-id> + </upstream> +</pkgmetadata> |