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

2024-03-08 Thread Andrew Ammerlaan
commit: 0dd79437900279db51502a489ce30d51301d06d8
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Mar  8 16:32:30 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Mar  8 16:34:57 2024 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0dd79437

app-arch/libdeflate: moved to ::gentoo

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 app-arch/libdeflate/libdeflate-1.11.ebuild | 28 
 app-arch/libdeflate/libdeflate-1.6.ebuild  | 21 -
 app-arch/libdeflate/libdeflate-1.7.ebuild  | 28 
 app-arch/libdeflate/libdeflate-1.8.ebuild  | 28 
 app-arch/libdeflate/libdeflate-1.9.ebuild  | 28 
 app-arch/libdeflate/libdeflate-.ebuild | 28 
 app-arch/libdeflate/metadata.xml   | 19 ---
 7 files changed, 180 deletions(-)

diff --git a/app-arch/libdeflate/libdeflate-1.11.ebuild 
b/app-arch/libdeflate/libdeflate-1.11.ebuild
deleted file mode 100644
index 9e7344b22..0
--- a/app-arch/libdeflate/libdeflate-1.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
-HOMEPAGE="https://github.com/ebiggers/libdeflate;
-
-if [[ ${PV} == * ]]; 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.md README.md
-}

diff --git a/app-arch/libdeflate/libdeflate-1.6.ebuild 
b/app-arch/libdeflate/libdeflate-1.6.ebuild
deleted file mode 100644
index 666506943..0
--- a/app-arch/libdeflate/libdeflate-1.6.ebuild
+++ /dev/null
@@ -1,21 +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/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-src_install() {
-   if ! use static-libs; then
-   find "${ED}" -name '*.a' -delete || die
-   fi
-   emake install DESTDIR="${ED}" PREFIX=/usr LIBDIR=/usr/"$(get_libdir)"
-   dodoc NEWS README.md
-}

diff --git a/app-arch/libdeflate/libdeflate-1.7.ebuild 
b/app-arch/libdeflate/libdeflate-1.7.ebuild
deleted file mode 100644
index bfafcfecd..0
--- a/app-arch/libdeflate/libdeflate-1.7.ebuild
+++ /dev/null
@@ -1,28 +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;
-
-if [[ ${PV} == * ]]; 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
-}

diff --git a/app-arch/libdeflate/libdeflate-1.8.ebuild 
b/app-arch/libdeflate/libdeflate-1.8.ebuild
deleted file mode 100644
index bfafcfecd..0
--- a/app-arch/libdeflate/libdeflate-1.8.ebuild
+++ /dev/null
@@ -1,28 +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;
-
-if [[ ${PV} == * ]]; 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
-}

diff --git a/app-arch/libdeflate/libdeflate-1.9.ebuild 

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

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

app-arch/libdeflate: drop 1.2

Signed-off-by: Andrew Ammerlaan  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..0
--- a/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch
+++ /dev/null
@@ -1,54 +0,0 @@
 libdeflate-1.2/Makefile2019-01-15 06:37:48.0 +0100
-+++ libdeflate-1.2/Makefile2019-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..0
--- 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
-}



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

2022-06-12 Thread Andrew Ammerlaan
commit: 1e928e4c4b1a0b44a5e062afda78dbc0defff127
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jun 12 08:45:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jun 12 09:40:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1e928e4c

app-arch/libdeflate: add version 1.11

Closes: https://bugs.gentoo.org/851192
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 app-arch/libdeflate/{libdeflate-1.9.ebuild => libdeflate-1.11.ebuild} | 4 ++--
 app-arch/libdeflate/libdeflate-1.9.ebuild | 2 +-
 app-arch/libdeflate/libdeflate-.ebuild| 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-arch/libdeflate/libdeflate-1.9.ebuild 
b/app-arch/libdeflate/libdeflate-1.11.ebuild
similarity index 95%
copy from app-arch/libdeflate/libdeflate-1.9.ebuild
copy to app-arch/libdeflate/libdeflate-1.11.ebuild
index 9f66534f1..9e7344b22 100644
--- a/app-arch/libdeflate/libdeflate-1.9.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
 HOMEPAGE="https://github.com/ebiggers/libdeflate;
@@ -24,5 +24,5 @@ src_install() {
if ! use static-libs; then
find "${ED}" -name '*.a' -delete || die
fi
-   dodoc NEWS README.md
+   dodoc NEWS.md README.md
 }

diff --git a/app-arch/libdeflate/libdeflate-1.9.ebuild 
b/app-arch/libdeflate/libdeflate-1.9.ebuild
index 9f66534f1..ef7ead774 100644
--- a/app-arch/libdeflate/libdeflate-1.9.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.9.ebuild
@@ -24,5 +24,5 @@ src_install() {
if ! use static-libs; then
find "${ED}" -name '*.a' -delete || die
fi
-   dodoc NEWS README.md
+   dodoc NEWS,d README.md
 }

diff --git a/app-arch/libdeflate/libdeflate-.ebuild 
b/app-arch/libdeflate/libdeflate-.ebuild
index bfafcfecd..35aff28c3 100644
--- a/app-arch/libdeflate/libdeflate-.ebuild
+++ b/app-arch/libdeflate/libdeflate-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
 HOMEPAGE="https://github.com/ebiggers/libdeflate;
@@ -24,5 +24,5 @@ src_install() {
if ! use static-libs; then
find "${ED}" -name '*.a' -delete || die
fi
-   dodoc NEWS README.md
+   dodoc NEWS.md README.md
 }



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

2021-03-01 Thread Aisha Tammy
commit: 7b177dc46a24a7d1e377c4118d881553d1f75f64
Author: Aisha Tammy  aisha  cc>
AuthorDate: Mon Mar  1 13:14:08 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Mon Mar  1 13:14:23 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7b177dc4

app-arch/libdeflate: version bump to 1.7

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 app-arch/libdeflate/libdeflate-1.7.ebuild  | 28 
 app-arch/libdeflate/libdeflate-.ebuild | 28 
 app-arch/libdeflate/metadata.xml   |  4 
 3 files changed, 60 insertions(+)

diff --git a/app-arch/libdeflate/libdeflate-1.7.ebuild 
b/app-arch/libdeflate/libdeflate-1.7.ebuild
new file mode 100644
index 0..bfafcfecd
--- /dev/null
+++ b/app-arch/libdeflate/libdeflate-1.7.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} == * ]]; 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
+}

diff --git a/app-arch/libdeflate/libdeflate-.ebuild 
b/app-arch/libdeflate/libdeflate-.ebuild
new file mode 100644
index 0..bfafcfecd
--- /dev/null
+++ b/app-arch/libdeflate/libdeflate-.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} == * ]]; 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
+}

diff --git a/app-arch/libdeflate/metadata.xml b/app-arch/libdeflate/metadata.xml
index 138cb7705..6e347494a 100644
--- a/app-arch/libdeflate/metadata.xml
+++ b/app-arch/libdeflate/metadata.xml
@@ -5,6 +5,10 @@
mmokr...@fold.natur.cuni.cz
Martin Mokrejs

+   
+   gen...@aisha.cc
+   Aisha Tammy
+  

sci-biol...@gentoo.org
Gentoo Biology Project



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

2020-09-21 Thread Aisha Tammy
commit: 539c4125af8dbd1e363867b8043d7019f49693c0
Author: Aisha Tammy  aisha  cc>
AuthorDate: Tue Sep 22 01:33:04 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Tue Sep 22 01:33:04 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=539c4125

app-arch/libdeflate: version bump

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>

 app-arch/libdeflate/libdeflate-1.6.ebuild | 23 +++
 1 file changed, 23 insertions(+)

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



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

2019-01-22 Thread Martin Mokrejs
commit: 8fc8b0f3f4e3c4aac5ecbf81c5a9d1d1e9769d1b
Author: Martin Mokrejs  fold  natur  cuni  cz>
AuthorDate: Tue Jan 22 13:31:48 2019 +
Commit: Martin Mokrejs  fold  natur  cuni  cz>
CommitDate: Tue Jan 22 13:31:48 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=8fc8b0f3

app-arch/libdeflate: make a patch to fix EPREFIX installations

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Martin Mokrejs  fold.natur.cuni.cz>

 .../files/libdeflate-1.2-respect_EPREFIX.patch | 54 ++
 app-arch/libdeflate/libdeflate-1.2.ebuild  |  9 ++--
 2 files changed, 57 insertions(+), 6 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
new file mode 100644
index 0..a583d7d2e
--- /dev/null
+++ b/app-arch/libdeflate/files/libdeflate-1.2-respect_EPREFIX.patch
@@ -0,0 +1,54 @@
+--- libdeflate-1.2/Makefile2019-01-15 06:37:48.0 +0100
 libdeflate-1.2/Makefile2019-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\
++  -O2 $(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
index a4baea15e..5548ea150 100644
--- a/app-arch/libdeflate/libdeflate-1.2.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.2.ebuild
@@ -18,15 +18,12 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-src_prepare(){
-   sed -e 's/ -O2 / /' -i Makefile || die
-   sed -e "s#${DESTDIR}${PREFIX}/lib#${ED}/usr/$(get_libdir)#" -i Makefile 
|| die
-   default
-}
+PATCHES=( "${FILESDIR}"/libdeflate-1.2-respect_EPREFIX.patch )
 
 src_install() {
-   default
if ! use static-libs; then
find "${ED}" -name '*.a' -delete || die
fi
+   emake install DESTDIR="${ED}" LIBDIR=/usr/"$(get_libdir)"
+   dodoc NEWS README.md
 }



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

2019-01-22 Thread Martin Mokrejs
commit: ed76a2870546469253f9e498eaccfc1e82f4ec91
Author: Martin Mokrejs  fold  natur  cuni  cz>
AuthorDate: Tue Jan 22 12:54:18 2019 +
Commit: Martin Mokrejs  fold  natur  cuni  cz>
CommitDate: Tue Jan 22 12:54:18 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ed76a287

app-arch/libdeflate: respect EPREFIX and use get_libdir

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Martin Mokrejs  fold.natur.cuni.cz>

 app-arch/libdeflate/libdeflate-1.2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-arch/libdeflate/libdeflate-1.2.ebuild 
b/app-arch/libdeflate/libdeflate-1.2.ebuild
index dd65e7aef..a4baea15e 100644
--- a/app-arch/libdeflate/libdeflate-1.2.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit multilib
+
 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"
@@ -18,6 +20,7 @@ BDEPEND=""
 
 src_prepare(){
sed -e 's/ -O2 / /' -i Makefile || die
+   sed -e "s#${DESTDIR}${PREFIX}/lib#${ED}/usr/$(get_libdir)#" -i Makefile 
|| die
default
 }
 



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

2019-01-22 Thread Martin Mokrejs
commit: f7b7df2da789550f34d886c37a6b679b073cd68d
Author: Martin Mokrejs  fold  natur  cuni  cz>
AuthorDate: Tue Jan 22 11:56:27 2019 +
Commit: Martin Mokrejs  fold  natur  cuni  cz>
CommitDate: Tue Jan 22 11:56:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f7b7df2d

app-arch/libdeflate: new package

Add highly CPU optimized implementation of deflate/zlib/gzip

The package is highly preferred due to its speed by:
sci-biology/io_lib-1.14.11
sci-libs/htslib-1.9
and maybe some more

 * Searching for libdeflate ...
 * Contents of app-arch/libdeflate-1.2:
/usr
/usr/bin
/usr/bin/libdeflate-gunzip
/usr/bin/libdeflate-gzip
/usr/include
/usr/include/libdeflate.h
/usr/lib
/usr/lib/libdeflate.so -> libdeflate.so.0
/usr/lib/libdeflate.so.0
/usr/share
/usr/share/doc
/usr/share/doc/libdeflate-1.2
/usr/share/doc/libdeflate-1.2/NEWS.bz2
/usr/share/doc/libdeflate-1.2/README.md.bz2

Seems the libdeflate-gunzip and libdeflate-gzip have statically
linked in /usr/lib/libdeflate.a (which is deleted but later
in src_install() unless USE=static-libs . Probably something to
inspected but more experienced devs.

I am not interested in maintaining this package in Gentoo
(I would be happy if somebody from other herds take this over).

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Martin Mokrejs  fold.natur.cuni.cz>

 app-arch/libdeflate/libdeflate-1.2.ebuild | 29 +
 app-arch/libdeflate/metadata.xml  | 12 
 2 files changed, 41 insertions(+)

diff --git a/app-arch/libdeflate/libdeflate-1.2.ebuild 
b/app-arch/libdeflate/libdeflate-1.2.ebuild
new file mode 100644
index 0..dd65e7aef
--- /dev/null
+++ b/app-arch/libdeflate/libdeflate-1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019 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=""
+
+src_prepare(){
+   sed -e 's/ -O2 / /' -i Makefile || die
+   default
+}
+
+src_install() {
+   default
+   if ! use static-libs; then
+   find "${ED}" -name '*.a' -delete || die
+   fi
+}

diff --git a/app-arch/libdeflate/metadata.xml b/app-arch/libdeflate/metadata.xml
new file mode 100644
index 0..138cb7705
--- /dev/null
+++ b/app-arch/libdeflate/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   mmokr...@fold.natur.cuni.cz
+   Martin Mokrejs
+   
+   
+   sci-biol...@gentoo.org
+   Gentoo Biology Project
+   
+