[gentoo-commits] proj/sci:master commit in: app-arch/libdeflate/, app-arch/libdeflate/files/

[gentoo-commits] proj/sci:master commit in: app-arch/libdeflate/, app-arch/libdeflate/files/

[Aisha Tammy]

commit:     1eee809c3bb4833241bab9dfcc03be164ec0d4fe
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Nov  9 19:57:21 2021 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Thu Dec 23 16:28:55 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=1eee809c

app-arch/libdeflate: version bump to 1.8

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 .../files/libdeflate-1.2-respect_EPREFIX.patch     |  2 +-
 app-arch/libdeflate/libdeflate-1.8.ebuild          | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch b/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch
index a583d7d2e..790aa6de9 100644
--- a/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch
+++ b/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch
@@ -5,7 +5,7 @@
  
  override CFLAGS :=							\
 -	$(CFLAGS) -O2 -fomit-frame-pointer -std=c99 -I. -Icommon	\
-+	-O2 $(CFLAGS) -fomit-frame-pointer -std=c99 -I. -Icommon	\
++	$(CFLAGS) -fomit-frame-pointer -std=c99 -I. -Icommon	\
  	-Wall -Wundef							\
  	$(call cc-option,-Wpedantic)					\
  	$(call cc-option,-Wdeclaration-after-statement)			\

diff --git a/app-arch/libdeflate/libdeflate-1.8.ebuild b/app-arch/libdeflate/libdeflate-1.8.ebuild
new file mode 100644
index 000000000..bfafcfecd
--- /dev/null
+++ b/app-arch/libdeflate/libdeflate-1.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
+HOMEPAGE="https://github.com/ebiggers/libdeflate"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate"
+else
+	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX=/usr LIBDIR="/usr/$(get_libdir)" install
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+	dodoc NEWS README.md
+}

[gentoo-commits] proj/sci:master commit in: app-arch/libdeflate/, app-arch/libdeflate/files/

[Andrew Ammerlaan]

commit:     e39b9e171c81cc8cedc326b126ea2a2aff158415
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 11:57:34 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 11:57:34 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e39b9e17

app-arch/libdeflate: drop 1.2

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../files/libdeflate-1.2-respect_EPREFIX.patch     | 54 ----------------------
 app-arch/libdeflate/libdeflate-1.2.ebuild          | 27 -----------
 2 files changed, 81 deletions(-)

diff --git a/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch b/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch
deleted file mode 100644
index 790aa6de9..000000000
--- a/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- libdeflate-1.2/Makefile	2019-01-15 06:37:48.000000000 +0100
-+++ libdeflate-1.2/Makefile	2019-01-22 14:06:13.427054892 +0100
-@@ -21,7 +21,7 @@
- 	      1>&2 2>/dev/null; then echo $(1); fi)
- 
- override CFLAGS :=							\
--	$(CFLAGS) -O2 -fomit-frame-pointer -std=c99 -I. -Icommon	\
-+	$(CFLAGS) -fomit-frame-pointer -std=c99 -I. -Icommon	\
- 	-Wall -Wundef							\
- 	$(call cc-option,-Wpedantic)					\
- 	$(call cc-option,-Wdeclaration-after-statement)			\
-@@ -34,6 +34,9 @@
- ##############################################################################
- 
- PREFIX ?= /usr
-+BINDIR ?= $(PREFIX)/bin
-+INCDIR ?= $(PREFIX)/include
-+LIBDIR ?= $(PREFIX)/lib
- 
- SOVERSION          := 0
- STATIC_LIB_SUFFIX  := .a
-@@ -240,20 +243,20 @@
- all:$(DEFAULT_TARGETS)
- 
- install:all
--	install -Dm644 -t $(DESTDIR)$(PREFIX)/lib $(STATIC_LIB)
--	install -Dm755 -t $(DESTDIR)$(PREFIX)/lib $(SHARED_LIB)
--	ln -sf $(SHARED_LIB) $(DESTDIR)$(PREFIX)/lib/libdeflate.so
--	install -Dm644 -t $(DESTDIR)$(PREFIX)/include libdeflate.h
--	install -Dm755 gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip
--	ln -f $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gunzip
-+	install -Dm644 -t $(DESTDIR)$(LIBDIR) $(STATIC_LIB)
-+	install -Dm755 -t $(DESTDIR)$(LIBDIR) $(SHARED_LIB)
-+	ln -sf $(SHARED_LIB) $(DESTDIR)$(LIBDIR)/libdeflate.so
-+	install -Dm644 -t $(DESTDIR)$(INCDIR) libdeflate.h
-+	install -Dm755 gzip $(DESTDIR)$(BINDIR)/libdeflate-gzip
-+	ln -f $(DESTDIR)$(BINDIR)/libdeflate-gzip $(DESTDIR)$(BINDIR)/libdeflate-gunzip
- 
- uninstall:
--	rm -f $(DESTDIR)$(PREFIX)/lib/$(STATIC_LIB) \
--		$(DESTDIR)$(PREFIX)/lib/$(SHARED_LIB) \
--		$(DESTDIR)$(PREFIX)/lib/libdeflate.so \
--		$(DESTDIR)$(PREFIX)/include/libdeflate.h \
--		$(DESTDIR)$(PREFIX)/bin/libdeflate-gzip \
--		$(DESTDIR)$(PREFIX)/bin/libdeflate-gunzip
-+	rm -f $(DESTDIR)$(LIBDIR)/$(STATIC_LIB) \
-+		$(DESTDIR)$(LIBDIR)/$(SHARED_LIB) \
-+		$(DESTDIR)$(LIBDIR)/libdeflate.so \
-+		$(DESTDIR)$(INCDIR)/libdeflate.h \
-+		$(DESTDIR)$(BINDIR)/libdeflate-gzip \
-+		$(DESTDIR)$(BINDIR)/libdeflate-gunzip
- 
- test_programs:$(TEST_PROGRAMS)
- 

diff --git a/app-arch/libdeflate/libdeflate-1.2.ebuild b/app-arch/libdeflate/libdeflate-1.2.ebuild
deleted file mode 100644
index c5924c064..000000000
--- a/app-arch/libdeflate/libdeflate-1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
-HOMEPAGE="https://github.com/ebiggers/libdeflate"
-SRC_URI="https://github.com/ebiggers/libdeflate/archive/v1.2.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/libdeflate-1.2-respect_EPREFIX.patch )
-
-src_install() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-	emake install DESTDIR="${ED}" LIBDIR=/usr/"$(get_libdir)"
-	dodoc NEWS README.md
-}