[gentoo-commits] repo/gentoo:master commit in: dev-libs/mxml/files/, dev-libs/mxml/

2024-04-23 Thread Conrad Kostecki
commit: 2573a6f31d703fdb7c403833fa29dbf13f5fd1c1
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Apr 23 22:00:07 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Apr 23 22:00:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2573a6f3

dev-libs/mxml: add 4.0.3, drop 4.0.2

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/mxml/Manifest   |  2 +-
 dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch | 20 
 .../mxml/{mxml-4.0.2.ebuild => mxml-4.0.3.ebuild}|  2 --
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index bd86a98baf5f..f48bdf977e33 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,2 +1,2 @@
 DIST mxml-3.3.1.tar.gz 1554784 BLAKE2B 
e0d599fd947dfef72edae40c1e70ea76c92105128dd46e772a7c71f9293cab3339c980396dffe105246cad64d0474935cc1939005ad9a2bffc8e8107f025a466
 SHA512 
43e6a92806d9c3f5db39fbf960c15ebfa6d92ef98274b7ce39b57724d6c26ad4362d6d8f3c1023efda92e6a815df068e5038a0cd479562b6be9dbdda8e827a41
-DIST mxml-4.0.2.tar.gz 1576722 BLAKE2B 
b5016adaf88801ec31852231ef31389d7d1d43b214d6b99e4e2b6bbfa47ba3c68fa9ac6b2ea332a61bf71688684c81e6863f1da38e30d4509cfa20f4ae943d19
 SHA512 
41fbd71bd390e63f0d44d006a3bcbdf95b7d3a09ea69a90d3dc86717d6f7edcd93875e6343b6d9f56ce8b2c3d34fdd4bcbb9992fb81c3392fb3deb5e3beb9482
+DIST mxml-4.0.3.tar.gz 1576958 BLAKE2B 
fe65513190bc8c03b8a66fb6711f9dcc846c19cdf67c17908fd5795408fead3e6ae2c11c8d4ca1c10be7b68d54ab87c602ab6ca3e5386d26ff75753d4dbe6476
 SHA512 
5855ea90c32a250ca0943389c768f1b9d9a231762d9b678d56bcb55c12d90a51b28c66940355e945b3d315bd764001e05ede576de976132768eb1eecb2667bba

diff --git a/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch 
b/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch
deleted file mode 100644
index a37a8fd56a90..
--- a/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/Makefile.in
-+++ b/Makefile.in
-@@ -219,7 +219,7 @@
-   $(INSTALL_DATA) mxml4.pc $(BUILDROOT)$(libdir)/pkgconfig/$(MXML_PC)
-   echo Installing man pages in $(BUILDROOT)$(mandir)...
-   $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
--  $(INSTALL_MAN) doc/mxml.3 $(BUILDROOT)$(mandir)/man3/mxml.3
-+  $(INSTALL_MAN) doc/mxml.3 $(BUILDROOT)$(mandir)/man3/mxml4.3
- 
- install-libmxml.a:libmxml.a
-   echo Installing libmxml.a to $(BUILDROOT)$(libdir)...
-@@ -276,7 +276,7 @@
-   echo Uninstalling pkgconfig files from 
$(BUILDROOT)$(libdir)/pkgconfig...
-   $(RM) $(BUILDROOT)$(libdir)/pkgconfig/mxml.pc
-   echo Uninstalling man pages from $(BUILDROOT)$(mandir)...
--  $(RM) $(BUILDROOT)$(mandir)/man3/mxml.3
-+  $(RM) $(BUILDROOT)$(mandir)/man3/mxml4.3
- 
- uninstall-libmxml.a:
-   echo Uninstalling libmxml.a from $(BUILDROOT)$(libdir)...

diff --git a/dev-libs/mxml/mxml-4.0.2.ebuild b/dev-libs/mxml/mxml-4.0.3.ebuild
similarity index 95%
rename from dev-libs/mxml/mxml-4.0.2.ebuild
rename to dev-libs/mxml/mxml-4.0.3.ebuild
index 4725865ea65f..5056680d49d8 100644
--- a/dev-libs/mxml/mxml-4.0.2.ebuild
+++ b/dev-libs/mxml/mxml-4.0.3.ebuild
@@ -20,8 +20,6 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-4.0.2-rename-man-page.patch" )
-
 src_prepare() {
default
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/mxml/files/, dev-libs/mxml/

2024-04-18 Thread Conrad Kostecki
commit: be8b2e9b87c96d9b926ee146c7c3e70c2de34968
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Apr 18 19:28:26 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Apr 18 19:28:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8b2e9b

dev-libs/mxml: add 4.0.2

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/mxml/Manifest |  1 +
 .../mxml/files/mxml-4.0.2-rename-man-page.patch| 20 +++
 dev-libs/mxml/mxml-4.0.2.ebuild| 63 ++
 3 files changed, 84 insertions(+)

diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 905f517aa128..bd86a98baf5f 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1 +1,2 @@
 DIST mxml-3.3.1.tar.gz 1554784 BLAKE2B 
e0d599fd947dfef72edae40c1e70ea76c92105128dd46e772a7c71f9293cab3339c980396dffe105246cad64d0474935cc1939005ad9a2bffc8e8107f025a466
 SHA512 
43e6a92806d9c3f5db39fbf960c15ebfa6d92ef98274b7ce39b57724d6c26ad4362d6d8f3c1023efda92e6a815df068e5038a0cd479562b6be9dbdda8e827a41
+DIST mxml-4.0.2.tar.gz 1576722 BLAKE2B 
b5016adaf88801ec31852231ef31389d7d1d43b214d6b99e4e2b6bbfa47ba3c68fa9ac6b2ea332a61bf71688684c81e6863f1da38e30d4509cfa20f4ae943d19
 SHA512 
41fbd71bd390e63f0d44d006a3bcbdf95b7d3a09ea69a90d3dc86717d6f7edcd93875e6343b6d9f56ce8b2c3d34fdd4bcbb9992fb81c3392fb3deb5e3beb9482

diff --git a/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch 
b/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch
new file mode 100644
index ..a37a8fd56a90
--- /dev/null
+++ b/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.in
 b/Makefile.in
+@@ -219,7 +219,7 @@
+   $(INSTALL_DATA) mxml4.pc $(BUILDROOT)$(libdir)/pkgconfig/$(MXML_PC)
+   echo Installing man pages in $(BUILDROOT)$(mandir)...
+   $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
+-  $(INSTALL_MAN) doc/mxml.3 $(BUILDROOT)$(mandir)/man3/mxml.3
++  $(INSTALL_MAN) doc/mxml.3 $(BUILDROOT)$(mandir)/man3/mxml4.3
+ 
+ install-libmxml.a:libmxml.a
+   echo Installing libmxml.a to $(BUILDROOT)$(libdir)...
+@@ -276,7 +276,7 @@
+   echo Uninstalling pkgconfig files from 
$(BUILDROOT)$(libdir)/pkgconfig...
+   $(RM) $(BUILDROOT)$(libdir)/pkgconfig/mxml.pc
+   echo Uninstalling man pages from $(BUILDROOT)$(mandir)...
+-  $(RM) $(BUILDROOT)$(mandir)/man3/mxml.3
++  $(RM) $(BUILDROOT)$(mandir)/man3/mxml4.3
+ 
+ uninstall-libmxml.a:
+   echo Uninstalling libmxml.a from $(BUILDROOT)$(libdir)...

diff --git a/dev-libs/mxml/mxml-4.0.2.ebuild b/dev-libs/mxml/mxml-4.0.2.ebuild
new file mode 100644
index ..4725865ea65f
--- /dev/null
+++ b/dev-libs/mxml/mxml-4.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A small XML parsing library that you can use to read XML data 
files or strings"
+HOMEPAGE="
+   https://github.com/michaelrsweet/mxml
+   https://www.msweet.org/mxml/
+"
+SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Mini-XML"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs test threads"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0.2-rename-man-page.patch" )
+
+src_prepare() {
+   default
+
+   # Don't hardcode FORTIFY_SOURCE
+   sed -e 's/-D_FORTIFY_SOURCE=3//g' -i configure || die
+   sed -e 's/-D_FORTIFY_SOURCE=3//g' -i configure.ac || die
+
+   # Don't run always tests
+   # Enable verbose compiling
+   sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || 
die
+   eautoconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   AR="$(tc-getAR)"
+   $(use_enable static-libs static)
+   $(use_enable threads)
+   --with-docdir=/usr/share/doc/"${PF}"
+   --with-dsoflags="${LDFLAGS}"
+   --with-ldflags="${LDFLAGS}"
+
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   default
+   use test && emake testmxml
+}
+
+src_test() {
+   emake test
+}
+
+src_install() {
+   emake DSTROOT="${ED}" install
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/mxml/files/, dev-libs/mxml/

2021-12-08 Thread Conrad Kostecki
commit: 4bc4e869357126929423fdb0d7b6fe07ead14e70
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Dec  8 16:21:02 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Dec  8 16:22:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc4e869

dev-libs/mxml: drop 3.2

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/mxml/Manifest  |  1 -
 dev-libs/mxml/files/mxml-3.2-slibtool.patch | 26 
 dev-libs/mxml/mxml-3.2.ebuild   | 64 -
 3 files changed, 91 deletions(-)

diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 5e6f1890a14e..1f5e1737dbcb 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,2 +1 @@
-DIST mxml-3.2.tar.gz 9267930 BLAKE2B 
f244dab599233b8a26aba5a11526979bf2f4d20b5fce67858f7759abc5bd2f3e2aac19d512c887248839d130cf1314065687cd1ccf91edbf5533ae2d342f286b
 SHA512 
ed3f2b361394ef225a708b0032976a3d191d5eaea3022e190b29e0ee140e8f998f1d65c64e4898872b169516cee44f4f5f18401c6410c3b5aa1e9680b23e8675
 DIST mxml-3.3.tar.gz 1550358 BLAKE2B 
2b815cd8c2031099e2767caad93cc389962ec547fadade92b0a7fb48a2352fd0940c9e434c2081b7419e0cfb489266d7116dacefd6fb9d7ce40d6de0f49cb2a6
 SHA512 
5a8453bec17e46afc9b100df03dba2219353a076152f34a5dc41b7f042fa570723effc3472680a4380674c412c3ab31e017f6704b1e8308227a4d9b3f13cb197

diff --git a/dev-libs/mxml/files/mxml-3.2-slibtool.patch 
b/dev-libs/mxml/files/mxml-3.2-slibtool.patch
deleted file mode 100644
index b5d0df44df7f..
--- a/dev-libs/mxml/files/mxml-3.2-slibtool.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4e2e31236f731c0b7e880078269d9f98f595bfd3 Mon Sep 17 00:00:00 2001
-From: orbea 
-Date: Wed, 7 Apr 2021 09:17:52 -0700
-Subject: [PATCH] build: Don't use libtool.
-

- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 8c05daf..cdc3450 100644
 a/Makefile.in
-+++ b/Makefile.in
-@@ -52,10 +52,10 @@ BUILDROOT  =   $(DSTROOT)
- # Install commands...
- #
- 
--INSTALL_BIN   =   $(LIBTOOL) $(INSTALL) -m 755
-+INSTALL_BIN   =   $(INSTALL) -m 755
- INSTALL_DATA  =   $(INSTALL) -m 644
- INSTALL_DIR   =   $(INSTALL) -d
--INSTALL_LIB   =   $(LIBTOOL) $(INSTALL) -m 755
-+INSTALL_LIB   =   $(INSTALL) -m 755
- INSTALL_MAN   =   $(INSTALL) -m 644
- INSTALL_SCRIPT=   $(INSTALL) -m 755
- 

diff --git a/dev-libs/mxml/mxml-3.2.ebuild b/dev-libs/mxml/mxml-3.2.ebuild
deleted file mode 100644
index b21734763a11..
--- a/dev-libs/mxml/mxml-3.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A small XML parsing library that you can use to read XML data 
files or strings"
-HOMEPAGE="
-   https://github.com/michaelrsweet/mxml
-   https://www.msweet.org/mxml/
-"
-SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Mini-XML"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="static-libs threads"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-slibtool.patch" )
-
-src_prepare() {
-   default
-
-   # Respect users CFLAGS
-   sed -e 's/-Os -g//' -i configure.ac || die
-
-   # Don't run always tests
-   # Enable verbose compiling
-   sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || 
die
-
-   # Build only static-libs, when requested by user, also build docs 
without static-libs in that case
-   if ! use static-libs; then
-   local mysedopts=(
-   -e '/^install:/s/install-libmxml.a//g'
-   -e '/^mxml.xml:/s/-static//g'
-   -e '/^mxml.epub:/s/-static//g'
-   -e '/^valgrind/s/-static//g'
-   -e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." 
.\/mxmldoc/g'
-   )
-   sed "${mysedopts[@]}" -i Makefile.in || die
-   fi
-
-   eautoconf
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_enable threads)
-   --with-docdir=/usr/share/doc/"${PF}"
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_test() {
-   emake testmxml
-}
-
-src_install() {
-   emake DSTROOT="${ED}" install
-}