From cf99cae6c381b4b8338cf3b7bc00df070bf958f0 Mon Sep 17 00:00:00 2001 From: Ryan Fox Date: Tue, 24 Aug 2021 20:02:56 +0000 Subject: [PATCH] dev-libs/mustach: Bump to 1.2.0 Added a soname as well. Will send a patch upstream. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ryan Fox --- dev-libs/mustach/Manifest | 5 +- .../mustach/files/mustach-1.2.0-soname.patch | 29 +++++++++++ dev-libs/mustach/mustach-1.2.0.ebuild | 52 +++++++++++++++++++ dev-libs/mustach/mustach-9999.ebuild | 6 ++- 4 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 dev-libs/mustach/files/mustach-1.2.0-soname.patch create mode 100644 dev-libs/mustach/mustach-1.2.0.ebuild diff --git a/dev-libs/mustach/Manifest b/dev-libs/mustach/Manifest index b49a5fb..de46f10 100644 --- a/dev-libs/mustach/Manifest +++ b/dev-libs/mustach/Manifest @@ -1,8 +1,11 @@ +AUX mustach-1.2.0-soname.patch 1374 BLAKE2B 6dbcfaff10f1c4c1f9b27e2a67fedb87df3fd964a622d65c5683d2c4a8500e94d76a44a63973dfe7a3574b46671d8713a7423c9c9071778af133f4f8a5d508a4 SHA512 fdd6801e3ecba5c55cf8125115e4533d9d3aa44d764d591691ff2eb41aeae6831bf0c1d7cee716005e332754a44aa4df163076e8a9a0de2348e711d23359fe7b DIST mustach-0.99.tar.gz 22100 BLAKE2B 621f469e373ce5e0247570c4bfe707e6f164b2e2ebce1f4b09c21d8b417528aa32e56ea2be61b66b340215a3bd772176e9aa5725ff38ae00eaaa1ce6476c0cce SHA512 432cb6c72487bfba4103c0925271bdc7c3e7f38ed19bfec09d7ef9f9af16ecac3885ff037e94ca5d3023ffd3d5c526fcb102218d4c3ad13563406cab10e7a4b2 DIST mustach-1.1.0.tar.gz 27343 BLAKE2B 6bd38b6815a21aa5bc74b8b398a385651f295dd541845489c0073a39825a267a2737400a7db3c1bc3f617653106e88466ad6563fb7247c00fe5abf33d82ba0d5 SHA512 4ca164bf40fd64c2127878f5f4a43066c299c7522e2099677206e60001db71c3eaac7c3bc33fff7ceb33bd1abf74f21c3367665b7791e05c77da16233d0cb00d DIST mustach-1.1.1.tar.gz 28676 BLAKE2B 0c606c2f01718b9ec1f1a620bc994d197dfeb2b8689c1695ac0d9305f53d25cbf2d1cef7c8e2f81d0bfeee555d4a6149817113aff04abcf96d1213fd89d53d30 SHA512 7210e418533a168a3e6f3948c78e84077b38e3d96aa25b21ed6013f3c42f068d1eb2a5790ebf8bc0fa5a206fc0e79e0c14228ec5e662d41697222fc902084aaa +DIST mustach-1.2.0.tar.gz 36005 BLAKE2B 42383409cc315a798399e98c0e1adf5767261d118b29ad8fa7231d25f9a5d2d45ea63af96b36c301f8e7ad406655f42fb64cd769b331948494e0317a3cb0a44e SHA512 9200f750246d6251422593b229ae2949c8cbc9f698278ac971a9e474c8050f0f42c6e5a20ad50b2f4626a7d982f55dd699b7594ee297d3933666e7723302b357 EBUILD mustach-0.99.ebuild 811 BLAKE2B b7d83a3f937d4776da633016a796d390a74df42f5f0ddcf445b529289bd3bf0641cc6b1ebfb20f1f8fe561a4f0f4488440038783a687f4ccdc9513e245af4029 SHA512 5cd1e393838b6e4a513caa71199ab745ed17f4d9838aefa40480f4cfddfe6b17e7045e3f2c33dbcb6caaf98fbd4a489530b9a0c8e5ea9de6c3b1b61c9a7a51ed EBUILD mustach-1.1.0.ebuild 1138 BLAKE2B 9ac93b16d428239dd644a6ffc030f1ffde1b427cbecf5991ab0c5543fff1b4cfb525af57d47ec45654ea5a09489d3ca537d774b42d9d3f1898564a2219c7f5be SHA512 8084a36a09d0769a84a73a7e4c55359771af52b9a33387cebf21cf43895c0e4a6f93356bce62cadc7f6ae978945a29ad376a10526f07880cbb739e4e26c7892e EBUILD mustach-1.1.1.ebuild 1138 BLAKE2B 9ac93b16d428239dd644a6ffc030f1ffde1b427cbecf5991ab0c5543fff1b4cfb525af57d47ec45654ea5a09489d3ca537d774b42d9d3f1898564a2219c7f5be SHA512 8084a36a09d0769a84a73a7e4c55359771af52b9a33387cebf21cf43895c0e4a6f93356bce62cadc7f6ae978945a29ad376a10526f07880cbb739e4e26c7892e -EBUILD mustach-9999.ebuild 1138 BLAKE2B 9ac93b16d428239dd644a6ffc030f1ffde1b427cbecf5991ab0c5543fff1b4cfb525af57d47ec45654ea5a09489d3ca537d774b42d9d3f1898564a2219c7f5be SHA512 8084a36a09d0769a84a73a7e4c55359771af52b9a33387cebf21cf43895c0e4a6f93356bce62cadc7f6ae978945a29ad376a10526f07880cbb739e4e26c7892e +EBUILD mustach-1.2.0.ebuild 1191 BLAKE2B 91a86f0786861205c102852d59592b4bcfa75ff75ac4d2dd0784f5a7491e19a427c799abf8e663f1b44eca1692f6afc73996ddcb7bb6cc3890920bf553904ee1 SHA512 7d397afb28ffeb8e0384110a5ac6dcc8f934168c1a2dfe80758c72b6e94775b61357d9d6694924f2826068226db32e553e63b3f4e6ec4f836aeade99e7aa023f +EBUILD mustach-9999.ebuild 1191 BLAKE2B 91a86f0786861205c102852d59592b4bcfa75ff75ac4d2dd0784f5a7491e19a427c799abf8e663f1b44eca1692f6afc73996ddcb7bb6cc3890920bf553904ee1 SHA512 7d397afb28ffeb8e0384110a5ac6dcc8f934168c1a2dfe80758c72b6e94775b61357d9d6694924f2826068226db32e553e63b3f4e6ec4f836aeade99e7aa023f MISC metadata.xml 622 BLAKE2B 20f61b5b1c51860d3a5b6ebb431c8e331fdc2c955d365da7d900b4923b80594f439955a45e1f60dac782fbde2623e8443502cded3a4b88a35f8f8ebd440ea623 SHA512 fdefd65764457724f113eb3c82e0aa2654d73225b651278b1395f5d516532c0fe997e4fde68c85c3b36680884321cbbab8d2fda4399b7823f850d9e790860a82 diff --git a/dev-libs/mustach/files/mustach-1.2.0-soname.patch b/dev-libs/mustach/files/mustach-1.2.0-soname.patch new file mode 100644 index 0000000..c75925c --- /dev/null +++ b/dev-libs/mustach/files/mustach-1.2.0-soname.patch @@ -0,0 +1,29 @@ +diff --git a/Makefile b/Makefile +index 2440722..1f135d0 100644 +--- a/Makefile ++++ b/Makefile +@@ -164,19 +164,19 @@ mustach: $(TOOLOBJS) + $(CC) $(LDFLAGS) $(TOOLFLAGS) -o mustach $(TOOLOBJS) $(TOOLLIBS) + + libmustach.so$(SOVEREV): $(SINGLEOBJS) +- $(CC) -shared $(LDFLAGS) $(darwin_single) -o $@ $^ $(SINGLELIBS) ++ $(CC) -shared -Wl,-soname,libmustach.so$(SOVER) $(LDFLAGS) $(darwin_single) -o $@ $^ $(SINGLELIBS) + + libmustach-core.so$(SOVEREV): $(COREOBJS) +- $(CC) -shared $(LDFLAGS) $(darwin_core) -o $@ $(COREOBJS) $(lib_OBJ) ++ $(CC) -shared -Wl,-soname,libmustach-core.so$(SOVER) $(LDFLAGS) $(darwin_core) -o $@ $(COREOBJS) $(lib_OBJ) + + libmustach-cjson.so$(SOVEREV): $(COREOBJS) mustach-cjson.o +- $(CC) -shared $(LDFLAGS) $(darwin_cjson) -o $@ $^ $(cjson_libs) ++ $(CC) -shared -Wl,-soname,libmustach-cjson.so$(SOVER) $(LDFLAGS) $(darwin_cjson) -o $@ $^ $(cjson_libs) + + libmustach-json-c.so$(SOVEREV): $(COREOBJS) mustach-json-c.o +- $(CC) -shared $(LDFLAGS) $(darwin_jsonc) -o $@ $^ $(jsonc_libs) ++ $(CC) -shared -Wl,-soname,libmustach-json.so$(SOVER) $(LDFLAGS) $(darwin_jsonc) -o $@ $^ $(jsonc_libs) + + libmustach-jansson.so$(SOVEREV): $(COREOBJS) mustach-jansson.o +- $(CC) -shared $(LDFLAGS) $(darwin_jansson) -o $@ $^ $(jansson_libs) ++ $(CC) -shared -Wl,-soname,libmustach-jansson.so$(SOVER) $(LDFLAGS) $(darwin_jansson) -o $@ $^ $(jansson_libs) + + # pkgconfigs + diff --git a/dev-libs/mustach/mustach-1.2.0.ebuild b/dev-libs/mustach/mustach-1.2.0.ebuild new file mode 100644 index 0000000..25c00a8 --- /dev/null +++ b/dev-libs/mustach/mustach-1.2.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://gitlab.com/jobol/mustach/-/archive/${PV}/${P}.tar.gz" + KEYWORDS="~amd64" +else + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/jobol/mustach.git" +fi + +DESCRIPTION="C implementation of mustache templating" +HOMEPAGE="https://gitlab.com/jobol/mustach" +LICENSE="ISC" +SLOT="0" +IUSE="tool json-c jansson" +REQUIRED_USE="tool? ( || ( json-c jansson ) )" + +DEPEND=" + json-c? ( dev-libs/json-c ) + jansson? ( dev-libs/jansson ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-1.2.0-soname.patch" +) + +SOVER=".1" +SOVEREV=".1.2" + +src_compile() { + emake jsonc=$(usex json-c) cjson=no jansson=$(usex jansson) libs=all +} + +src_install() { + LIBDIR="/usr/$(get_libdir)" + dodir "${LIBDIR}/pkgconfig" + for dso in "${S}/"*".so${SOVEREV}"; do + dolib.so "${dso}" + dso=${dso##*/} + dosym "${dso}" "${LIBDIR}/${dso::-2}" + dosym "${dso}" "${LIBDIR}/${dso::-4}" + done + use tool && dobin "${S}/mustach" + cp "${S}/libmustach"*".pc" "${D}${LIBDIR}/pkgconfig" + gzip -d "${S}/mustach${SOVER}.gz" + doman "${S}/mustach${SOVER}" +} diff --git a/dev-libs/mustach/mustach-9999.ebuild b/dev-libs/mustach/mustach-9999.ebuild index be0684f..25c00a8 100644 --- a/dev-libs/mustach/mustach-9999.ebuild +++ b/dev-libs/mustach/mustach-9999.ebuild @@ -25,8 +25,12 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PN}-1.2.0-soname.patch" +) + SOVER=".1" -SOVEREV=".1.1" +SOVEREV=".1.2" src_compile() { emake jsonc=$(usex json-c) cjson=no jansson=$(usex jansson) libs=all