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

2024-03-29 Thread Michał Górny
commit: f90e0fc7b69f583cecd3082e81e4e2f6e0d55297
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar 29 14:48:34 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 29 14:48:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90e0fc7

dev-libs/zlog: Remove last-rited pkg

Closes: https://bugs.gentoo.org/925342
Signed-off-by: Michał Górny  gentoo.org>

 dev-libs/zlog/Manifest   |  1 -
 dev-libs/zlog/files/zlog_no_static_lib.patch | 59 
 dev-libs/zlog/metadata.xml   |  8 
 dev-libs/zlog/zlog-1.2.15.ebuild | 29 --
 profiles/package.mask|  7 
 5 files changed, 104 deletions(-)

diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
deleted file mode 100644
index b0e5119e6d23..
--- a/dev-libs/zlog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zlog-v1.2.15.tar.gz 124794 BLAKE2B 
a60ef362269d48672c7f0f4321b6c4f50241c7c1abcc2c3a3a888d7838018edaba103cbb985fda02db719dcb8553bad3f84bfd715f3fdb34ad64557107d24e44
 SHA512 
88c741b58e7857c573e4da0b3999a23c00d339e45eb4f7d3e07c03dbe8ebf4cae62720208c9759871969bb4959d2f081b6a8955e229d3872f99cde3e650702e4

diff --git a/dev-libs/zlog/files/zlog_no_static_lib.patch 
b/dev-libs/zlog/files/zlog_no_static_lib.patch
deleted file mode 100644
index f2ad8c65a126..
--- a/dev-libs/zlog/files/zlog_no_static_lib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
 a/src/makefile 2020-06-05 15:29:43.926423440 +0200
-+++ b/src/makefile 2020-06-05 15:30:26.266501492 +0200
-@@ -43,8 +43,6 @@
- DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(ZLOG_MAJOR)
- DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
- DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) 
$(LDFLAGS)
--STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
--STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
- 
- # Installation related variables
- PREFIX?=/usr/local
-@@ -78,7 +76,6 @@
-   # not to mention dynamic linker .a preference...
-   DYLIB_MAKE_CMD=$(CC) -shared -Wl,-G,-b64 -maix64 -pthread -o $(DYLIBNAME) 
$(LDFLAGS)
-   REAL_CFLAGS+= -maix64
--  STLIB_MAKE_CMD=OBJECT_MODE=64 ar rcs $(STLIBNAME) $(DYLIB_MAJOR_NAME)
- endif
- 
- all: $(DYLIBNAME) $(BINS)
-@@ -139,21 +136,17 @@
-   cp -f $(DYLIBNAME) $(DYLIB_MAJOR_NAME)
-   cp -f $(DYLIBNAME) $(DYLIB_MINOR_NAME)
- 
--$(STLIBNAME): $(OBJ)
--  $(STLIB_MAKE_CMD) $(OBJ)
--
- dynamic: $(DYLIBNAME)
--static: $(STLIBNAME)
- 
- # Binaries:
--zlog-chk-conf: zlog-chk-conf.o $(STLIBNAME) $(DYLIBNAME)
-+zlog-chk-conf: zlog-chk-conf.o $(DYLIBNAME)
-   $(CC) -o $@ zlog-chk-conf.o -L. -lzlog $(REAL_LDFLAGS)
- 
- .c.o:
-   $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
- 
- clean:
--  rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov 
$(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
-+  rm -rf $(DYLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov 
$(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
- 
- dep:
-   $(CC) -MM *.c
-@@ -171,14 +164,13 @@
- 
- INSTALL?= cp -a
- 
--install: $(DYLIBNAME) $(STLIBNAME)
-+install: $(DYLIBNAME)
-   mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) 
$(INSTALL_BINARY_PATH)
-   $(INSTALL) zlog.h $(INSTALL_INCLUDE_PATH)
-   $(INSTALL) zlog-chk-conf $(INSTALL_BINARY_PATH)
-   $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-   cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) 
$(DYLIB_MAJOR_NAME)
-   cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
--  $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
- 
- 32bit:
-   @echo ""

diff --git a/dev-libs/zlog/metadata.xml b/dev-libs/zlog/metadata.xml
deleted file mode 100644
index 986cdb9c5854..
--- a/dev-libs/zlog/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-  
-HardySimpson/zlog
-  
-

diff --git a/dev-libs/zlog/zlog-1.2.15.ebuild b/dev-libs/zlog/zlog-1.2.15.ebuild
deleted file mode 100644
index 221a11e0e522..
--- a/dev-libs/zlog/zlog-1.2.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library"
-HOMEPAGE="http://hardysimpson.github.io/zlog/;
-SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> 
${PN}-v${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-PATCHES="${FILESDIR}/zlog_no_static_lib.patch"
-
-src_compile() {
-   emake CC="$(tc-getCC)"
-}
-
-src_test() {
-   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test
-}
-
-src_install() {
-   emake LIBRARY_PATH="$(get_libdir)" PREFIX="${D}/usr" install
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 0b4bcd3f4d84..c637316540db 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -728,13 

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

2020-06-05 Thread Tobias Klausmann
commit: e5a6bfb643858febc9ff8509363099b67465e220
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Fri Jun  5 13:35:31 2020 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Fri Jun  5 13:35:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a6bfb6

dev-libs/zlog: Remove .a files from build and install

Closes: https://bugs.gentoo.org/534172
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Tobias Klausmann  gentoo.org>

 dev-libs/zlog/files/zlog_no_static_lib.patch   | 59 ++
 .../{zlog-1.2.14.ebuild => zlog-1.2.14-r1.ebuild}  |  3 +-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/dev-libs/zlog/files/zlog_no_static_lib.patch 
b/dev-libs/zlog/files/zlog_no_static_lib.patch
new file mode 100644
index 000..3f45f5648dd
--- /dev/null
+++ b/dev-libs/zlog/files/zlog_no_static_lib.patch
@@ -0,0 +1,59 @@
+--- src/makefile.orig  2020-06-05 15:29:43.926423440 +0200
 src/makefile   2020-06-05 15:30:26.266501492 +0200
+@@ -43,8 +43,6 @@
+ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(ZLOG_MAJOR)
+ DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
+ DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) 
$(LDFLAGS)
+-STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
+-STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
+ 
+ # Installation related variables
+ PREFIX?=/usr/local
+@@ -78,7 +76,6 @@
+   # not to mention dynamic linker .a preference...
+   DYLIB_MAKE_CMD=$(CC) -shared -Wl,-G,-b64 -maix64 -pthread -o $(DYLIBNAME) 
$(LDFLAGS)
+   REAL_CFLAGS+= -maix64
+-  STLIB_MAKE_CMD=OBJECT_MODE=64 ar rcs $(STLIBNAME) $(DYLIB_MAJOR_NAME)
+ endif
+ 
+ all: $(DYLIBNAME) $(BINS)
+@@ -139,21 +136,17 @@
+   cp -f $(DYLIBNAME) $(DYLIB_MAJOR_NAME)
+   cp -f $(DYLIBNAME) $(DYLIB_MINOR_NAME)
+ 
+-$(STLIBNAME): $(OBJ)
+-  $(STLIB_MAKE_CMD) $(OBJ)
+-
+ dynamic: $(DYLIBNAME)
+-static: $(STLIBNAME)
+ 
+ # Binaries:
+-zlog-chk-conf: zlog-chk-conf.o $(STLIBNAME) $(DYLIBNAME)
++zlog-chk-conf: zlog-chk-conf.o $(DYLIBNAME)
+   $(CC) -o $@ zlog-chk-conf.o -L. -lzlog $(REAL_LDFLAGS)
+ 
+ .c.o:
+   $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
+ 
+ clean:
+-  rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov 
$(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
++  rm -rf $(DYLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov 
$(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
+ 
+ dep:
+   $(CC) -MM *.c
+@@ -171,14 +164,13 @@
+ 
+ INSTALL?= cp -a
+ 
+-install: $(DYLIBNAME) $(STLIBNAME)
++install: $(DYLIBNAME)
+   mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) 
$(INSTALL_BINARY_PATH)
+   $(INSTALL) zlog.h $(INSTALL_INCLUDE_PATH)
+   $(INSTALL) zlog-chk-conf $(INSTALL_BINARY_PATH)
+   $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
+   cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) 
$(DYLIB_MAJOR_NAME)
+   cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
+-  $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
+ 
+ 32bit:
+   @echo ""

diff --git a/dev-libs/zlog/zlog-1.2.14.ebuild 
b/dev-libs/zlog/zlog-1.2.14-r1.ebuild
similarity index 87%
rename from dev-libs/zlog/zlog-1.2.14.ebuild
rename to dev-libs/zlog/zlog-1.2.14-r1.ebuild
index 66b2ba8509c..741717bc2d8 100644
--- a/dev-libs/zlog/zlog-1.2.14.ebuild
+++ b/dev-libs/zlog/zlog-1.2.14-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library."
 HOMEPAGE="http://hardysimpson.github.io/zlog/;
@@ -16,6 +16,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 src_compile() {
+   epatch "${FILESDIR}/zlog_no_static_lib.patch" || die
emake CC="$(tc-getCC)"
 }