From 1173ad5704ce725916e0c332416aff326d850d06 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Mar 2018 16:53:27 +0100 Subject: gentoo resync : 29.03.2018 --- dev-libs/iniparser/Manifest | 6 +- .../iniparser/files/iniparser-4.0-cflags.patch | 28 -------- .../iniparser/files/iniparser-4.0-soname.patch | 35 ---------- dev-libs/iniparser/iniparser-4.0.ebuild | 78 ---------------------- dev-libs/iniparser/iniparser-4.1.ebuild | 76 +++++++++++++++++++++ 5 files changed, 78 insertions(+), 145 deletions(-) delete mode 100644 dev-libs/iniparser/files/iniparser-4.0-cflags.patch delete mode 100644 dev-libs/iniparser/files/iniparser-4.0-soname.patch delete mode 100644 dev-libs/iniparser/iniparser-4.0.ebuild create mode 100644 dev-libs/iniparser/iniparser-4.1.ebuild (limited to 'dev-libs/iniparser') diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest index 710eef553cc5..684acf449ed2 100644 --- a/dev-libs/iniparser/Manifest +++ b/dev-libs/iniparser/Manifest @@ -1,10 +1,8 @@ AUX iniparser-3.0-autotools.patch 829 BLAKE2B 808f8f7870151286ef4e4baea4ce80df3cc1230d2d341fcbcffcdfb7aba16051edbf1cabdb64189c49f80845fc33593e2eeea1eb1bd50e131215e2be96b89777 SHA512 7cfdd1d5e2c604125ec33a4e0332b32b77452445b59244d4c13e4c1b635ebeafd5cb6dd345c22101951acd71aab7621c4a2f36b9596d449a74b469d9f812610a AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae3ccae81976cdb42abef62001a6d2a7b2abd7792df4b31fac00a7f4de69d750610253579ae3a2e618b704fee18b SHA512 8eb2058e332783ae11ef5cbebec153ee1938352f111e3efe332035aa013cf6d01a917aef9a7b8f46f7bd070986e5e686e584d46dedf30276baeb8da0954631a9 -AUX iniparser-4.0-cflags.patch 551 BLAKE2B 7ee008e95e1e2fe1675b4c51fdc47a31e9ebdc0813162773cd2c08b88cccce6cee5f82c67a2134f885e18b61cb319a0ed42dfd5a1e57c6a64ec5bf536dfd967b SHA512 a0c756e8a17245c4e7f5a5f5b9537d14d9873c574bf02827b09d3af8431b76561b139dce208ed22b6bc77ec171050e8ab10e4b58abbd35476870eabd97235ca2 -AUX iniparser-4.0-soname.patch 994 BLAKE2B 3ac6a58aa00940d3a1a236de97cc228c4f585b88423ded0d8b0180ba0d2d964818a37885590d8f2d468d78d16c287075a16a4547d44cc2840c9fce2744bc8d05 SHA512 87f6b543ee308c8dce5c3a2e464b0c69e61708780d65f51b9243ab2d458eab515bc975356d071187aa08e2a14b86c1f6556ebbbdb09be276a5df718f863df051 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 -DIST iniparser-4.0.tar.gz 41188 BLAKE2B a5ed070b9a4a99f92c54d319a7068a8d49462d512be37c2ab4ff50a6fc83d936ed577884984d4c6a6eaae5ce2f67570f8a2569be88c99cfdd56d03aebe48330f SHA512 86080d4e4cb85e252f9c75116d9a548a2f08f2131e269834a0d16597da4e4c5790dff8304be082f2a8dcc75d17585e9a8fad3f0f4766bff8914f6ef2b0d6fa05 +DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968 EBUILD iniparser-3.1-r1.ebuild 1153 BLAKE2B 9f0fbed16d45ca5273e7af7f80857aa71a967aa0f8d19b544a011d2ac93a815ab6dabbc66ab4717af6bef60f4c763f3ca3843f898d05659976841dbd77c118a9 SHA512 4799ed1b8503f5d05d277bd57b192b86ebf500febc5e0af933bbb5851b582c2de0de58494a381fb029c06fbff74d6468d53f1f0b9c9c968bb56dc1e06adbcc7b EBUILD iniparser-3.1.ebuild 1009 BLAKE2B fbbf62ea14c9d2a00589ccdc25ef919531ad3dc452a82a31193cabd134bec760f7287f180e1bfa3a13d9c8816e0fcc3887d97f1d704bd7dbc75f09f184d91ab0 SHA512 a92ef3174bda9702bf8e30fbddda1046fc31af55286080bb1583c5ea4d3734930241300da3912e0df6f1dee9b8acfd63b1e865568a61f1886e2bf1916fb0e3f1 -EBUILD iniparser-4.0.ebuild 1800 BLAKE2B 025a56b86003eac94f929fb5c8dedb6d4ba3384feaa104cff658db448bb3bdf49a408dcc5eacb8aafe170c2c5de5b5e7c0d19ac3c9becb28d375c604c019cfe0 SHA512 0429b180d60a8cac74776bb58bd4261cf24d8fcb80b128784243f46b3374df75a1d7dd921f00dd95e28879ffa1e61c992af5518cc88fd69bb4bd3748159e1ae3 +EBUILD iniparser-4.1.ebuild 1767 BLAKE2B 12c8fb96e509f0e75a5f020474d20a0efa995074cd788e8652b9594b273f28012836154428c086361e97286be68794f7c8831f24d8453f92654da2f740bb973f SHA512 197309228a7eb4e75f866eaf0148680bc69ab9fa1f481547c176b227fa336149ff335a32257c5d57d55d37cecdd87b08da990fb193c79e48253424c90aa344de MISC metadata.xml 326 BLAKE2B 922d683a7f0a18fdde9cda90de1fa291ff1884a0fea2425c082dec777f2e4ea76b036c70d26fd40cf1ab980c35def4abfc574640f0fb0048e9fd66565c1eac96 SHA512 7b19035fb203e35182b45f83c863916a8555b54d87605d310c2499c234bad06a39a33403aeb4f8624f31a9ef3660e1a98710e2f234cf9cd0e983f1ca173521e5 diff --git a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch b/dev-libs/iniparser/files/iniparser-4.0-cflags.patch deleted file mode 100644 index 817b087e6d20..000000000000 --- a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 14370f5ce94cce077c798db6611ef65cd1822df2 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 8 Aug 2015 19:04:08 +0200 -Subject: [PATCH 1/2] Respect user CFLAGS - ---- - Makefile | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 78708a5..744405a 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,11 +6,6 @@ - CC ?= gcc - - CFLAGS += -fPIC -Wall -Wextra -ansi -pedantic --ifndef DEBUG --CFLAGS += -O2 --else --CFLAGS += -g --endif - - # Ar settings to build the library - AR ?= ar --- -2.5.0 - diff --git a/dev-libs/iniparser/files/iniparser-4.0-soname.patch b/dev-libs/iniparser/files/iniparser-4.0-soname.patch deleted file mode 100644 index 0536b671a5c3..000000000000 --- a/dev-libs/iniparser/files/iniparser-4.0-soname.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c3a112a89d3cbbfe0edc4fbac366a47986d6c118 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 8 Aug 2015 19:10:27 +0200 -Subject: [PATCH 2/2] Adjust soname and make target non-phony - ---- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 744405a..323e579 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,6 +14,7 @@ ARFLAGS = rcv - SHLD = ${CC} ${CFLAGS} - LDSHFLAGS = -shared -Wl,-Bsymbolic - LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib -+SONAME_CURRENT = 1 - - # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX) - # RANLIB = ranlib -@@ -52,8 +53,8 @@ libiniparser.a: $(OBJS) - $(QUIET_RANLIB)$(RANLIB) $@ - - libiniparser.so: $(OBJS) -- $(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@.0 $(OBJS) \ -- -Wl,-soname=`basename $@`.0 -+ $(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@ $(OBJS) \ -+ -Wl,-soname=libiniparser4.so.$(SONAME_CURRENT) - - clean: - $(RM) $(OBJS) --- -2.5.0 - diff --git a/dev-libs/iniparser/iniparser-4.0.ebuild b/dev-libs/iniparser/iniparser-4.0.ebuild deleted file mode 100644 index b051667437ca..000000000000 --- a/dev-libs/iniparser/iniparser-4.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs flag-o-matic - -DESCRIPTION="A free stand-alone ini file parsing library" -HOMEPAGE="https://github.com/ndevilla/iniparser" -SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples static-libs" - -DEPEND="doc? ( app-doc/doxygen )" -RDEPEND="" - -DOCS=( AUTHORS README.md ) - -PATCHES=( - "${FILESDIR}"/${P}-cflags.patch - "${FILESDIR}"/${P}-soname.patch -) - -_newlib_so_with_symlinks() { - local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" - local libdir="$(get_libdir)" - - newlib.so ${source} ${base}.so.${current}.${revision}.${age} - for i in ".${current}" '' ; do - dosym ${base}.so.${current}.${revision}.${age} /usr/${libdir}/${base}.so${i} - done -} - -src_prepare() { - epatch "${PATCHES[@]}" - rm -R html || die -} - -src_configure() { - append-lfs-flags -} - -_emake() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake -C test -} - -src_install() { - use static-libs && newlib.a lib${PN}.a lib${PN}${SLOT}.a - _newlib_so_with_symlinks lib${PN}.so lib${PN}${SLOT} 1 0 0 - - insinto /usr/include/${PN}${SLOT} - doins src/*.h - - if use doc; then - emake -C doc - dohtml -r html/* - fi - - if use examples ; then - local examplesdir="/usr/share/doc/${PF}/examples" - insinto "${examplesdir}" - doins example/* - docompress -x "${examplesdir}" - fi - - dodoc "${DOCS[@]}" -} diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild new file mode 100644 index 000000000000..d108cf9d01bc --- /dev/null +++ b/dev-libs/iniparser/iniparser-4.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib toolchain-funcs flag-o-matic + +DESCRIPTION="A free stand-alone ini file parsing library" +HOMEPAGE="https://github.com/ndevilla/iniparser" +SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="4" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples static-libs" + +DEPEND="doc? ( app-doc/doxygen )" +RDEPEND="" + +DOCS=( AUTHORS README.md ) + +_newlib_so_with_symlinks() { + local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" + local libdir="$(get_libdir)" + + newlib.so ${source} ${base}.so.${current}.${revision}.${age} + for i in ".${current}" '' ; do + dosym ${base}.so.${current}.${revision}.${age} /usr/${libdir}/${base}.so${i} + done +} + +src_prepare() { + rm -R html || die + eapply_user +} + +src_configure() { + append-lfs-flags +} + +_emake() { + emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \ + SO_TARGET=lib${PN}${SLOT}.so.1 \ + ADDITIONAL_CFLAGS= \ + "$@" +} + +src_compile() { + _emake +} + +src_test() { + _emake -C test +} + +src_install() { + use static-libs && newlib.a lib${PN}.a lib${PN}${SLOT}.a + _newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0 + + insinto /usr/include/${PN}${SLOT} + doins src/*.h + + if use doc; then + emake -C doc + HTML_DOCS=html/ + fi + + if use examples ; then + local examplesdir="/usr/share/doc/${PF}/examples" + insinto "${examplesdir}" + doins example/* + docompress -x "${examplesdir}" + fi + + einstalldocs +} -- cgit v1.2.3