* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/datamash/, sci-calculators/datamash/files/
@ 2017-08-23 22:09 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2017-08-23 22:09 UTC (permalink / raw
To: gentoo-commits
commit: e6962df623a3a3a69a66dc17d8ebcea55127c10e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 22:09:06 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 22:09:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6962df6
sci-calculators/datamash: Fix patch/drop autotools.eclass.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sci-calculators/datamash/datamash-1.2.ebuild | 7 -------
.../datamash/files/datamash-1.2-libcrypto.patch | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/sci-calculators/datamash/datamash-1.2.ebuild b/sci-calculators/datamash/datamash-1.2.ebuild
index 87c7f2fe928..2046d05d80f 100644
--- a/sci-calculators/datamash/datamash-1.2.ebuild
+++ b/sci-calculators/datamash/datamash-1.2.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools
DESCRIPTION="command-line program for basic numeric, textual and statistical operations"
HOMEPAGE="https://www.gnu.org/software/datamash/"
@@ -28,12 +27,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.2-libcrypto.patch
)
-src_prepare() {
- default
-
- eautoreconf
-}
-
src_configure() {
econf \
$(use_enable nls) \
diff --git a/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch b/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch
index ef1f32e9855..887d807ec04 100644
--- a/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch
+++ b/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch
@@ -8,3 +8,23 @@
$(ROUND_LIBM) \
$(ROUNDL_LIBM) \
$(SQRT_LIBM) \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -339,7 +339,8 @@
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
+ datamash_LINK = $(CCLD) $(datamash_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+ AM_V_P = $(am__v_P_@AM_V@)
+@@ -1908,6 +1909,7 @@
+ $(LDEXPL_LIBM) \
+ $(LIBICONV) \
+ $(LIBINTL) \
++ $(LIB_CRYPTO) \
+ $(ROUND_LIBM) \
+ $(ROUNDL_LIBM) \
+ $(SQRT_LIBM) \
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/datamash/, sci-calculators/datamash/files/
@ 2018-08-08 20:58 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2018-08-08 20:58 UTC (permalink / raw
To: gentoo-commits
commit: 88617724a748f29937ab732e0497ebc081642240
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 8 20:57:49 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 8 20:57:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88617724
sci-calculators/datamash: Old.
Package-Manager: Portage-2.3.45, Repoman-2.3.10
sci-calculators/datamash/Manifest | 1 -
sci-calculators/datamash/datamash-1.2.ebuild | 34 ----------------------
.../datamash/files/datamash-1.2-libcrypto.patch | 30 -------------------
3 files changed, 65 deletions(-)
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index ec3a5d2199b..9f49288ca73 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -1,2 +1 @@
-DIST datamash-1.2.tar.gz 1922522 BLAKE2B 877a596aa486756199431d6eaae8f2005bf34b20cae9c94e94441069b0153b15bbab067198a7be9bf76c3e305067f5f1c8980274fcaf37f232748a3c99d61ed8 SHA512 afb0960ffa881e1112394f5e0355c7a6efea13d6bdcbccb9830a6cde617e13701ca361d62c8283b7a64a27135b2f54a75970b17a7d73a5f0ba914ab70f05c086
DIST datamash-1.3.tar.gz 1939375 BLAKE2B 4fe08d14ffaca21ce78d5b2781fadc665dfbc87c628338ad63eba09779179e4bfa3f578c1a8018acfbf8b3c7aad0389ee068d1b21718b1f576b6e5e8ed8d03c2 SHA512 3c36dd01035dc114f2fbfcb8746354e496e6c1536f7b5908cf25632d9cbaddfcd06fc26f8883ef845a6ecd85ceb5708bb7edb3d1b1c6efa273ef5ec0b758366a
diff --git a/sci-calculators/datamash/datamash-1.2.ebuild b/sci-calculators/datamash/datamash-1.2.ebuild
deleted file mode 100644
index 2046d05d80f..00000000000
--- a/sci-calculators/datamash/datamash-1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="command-line program for basic numeric, textual and statistical operations"
-HOMEPAGE="https://www.gnu.org/software/datamash/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls openssl"
-
-CDEPEND="
- nls? ( sys-devel/gettext )
- openssl? ( dev-libs/openssl )
-"
-RDEPEND="
- nls? ( virtual/libintl )
-"
-DEPEND="
- ${CDEPEND}
- ${RDEPEND}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2-libcrypto.patch
-)
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(usex openssl --with-openssl={yes,no})
-}
diff --git a/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch b/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch
deleted file mode 100644
index 887d807ec04..00000000000
--- a/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -56,6 +56,7 @@
- $(LDEXPL_LIBM) \
- $(LIBICONV) \
- $(LIBINTL) \
-+ $(LIB_CRYPTO) \
- $(ROUND_LIBM) \
- $(ROUNDL_LIBM) \
- $(SQRT_LIBM) \
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -339,7 +339,8 @@
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1)
- datamash_LINK = $(CCLD) $(datamash_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
- AM_V_P = $(am__v_P_@AM_V@)
-@@ -1908,6 +1909,7 @@
- $(LDEXPL_LIBM) \
- $(LIBICONV) \
- $(LIBINTL) \
-+ $(LIB_CRYPTO) \
- $(ROUND_LIBM) \
- $(ROUNDL_LIBM) \
- $(SQRT_LIBM) \
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/datamash/, sci-calculators/datamash/files/
@ 2017-08-23 17:52 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2017-08-23 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 73da165819866468376611e834fef445214f207c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 17:52:23 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 17:52:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73da1658
sci-calculators/datamash: Version bump.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sci-calculators/datamash/Manifest | 1 +
sci-calculators/datamash/datamash-1.2.ebuild | 41 ++++++++++++++++++++++
.../datamash/files/datamash-1.2-libcrypto.patch | 10 ++++++
sci-calculators/datamash/metadata.xml | 3 ++
4 files changed, 55 insertions(+)
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index f3ac90df14c..a4fb6980bde 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -1 +1,2 @@
DIST datamash-1.1.1.tar.gz 1912118 SHA256 420819b3d7372ee3ce704add847cff7d08c4f8176c1d48735d4a632410bb801b SHA512 8932ed5ec357348108cd559acada3bfdc12ee4e360d709d74a6a661bc55f80223baa493d9185be8816b550ef86ff1f760249deb77cbeee9aa1f4178043a1938f WHIRLPOOL 7a2b3f54031c6fb7306eae986dd14213c0417e1fe815429ca071c35b86ec2123777d3d2e330ba2693de29dd317a531f0b1ad9c9c81a6b8cef69368cfa29d705a
+DIST datamash-1.2.tar.gz 1922522 SHA256 e8d46fb22ccc77e5380f26cde622a733f363d388b04a2c22e7fb6de0e9d85996 SHA512 afb0960ffa881e1112394f5e0355c7a6efea13d6bdcbccb9830a6cde617e13701ca361d62c8283b7a64a27135b2f54a75970b17a7d73a5f0ba914ab70f05c086 WHIRLPOOL 0a2299a7007cb67fad14d0b73f851b5c20d13434fcc9e1a54ec11adb2d834b475abd7c596d04bcd9c801d717eaf06f80c10f8559578806ba842af7435491498a
diff --git a/sci-calculators/datamash/datamash-1.2.ebuild b/sci-calculators/datamash/datamash-1.2.ebuild
new file mode 100644
index 00000000000..87c7f2fe928
--- /dev/null
+++ b/sci-calculators/datamash/datamash-1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="command-line program for basic numeric, textual and statistical operations"
+HOMEPAGE="https://www.gnu.org/software/datamash/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls openssl"
+
+CDEPEND="
+ nls? ( sys-devel/gettext )
+ openssl? ( dev-libs/openssl )
+"
+RDEPEND="
+ nls? ( virtual/libintl )
+"
+DEPEND="
+ ${CDEPEND}
+ ${RDEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2-libcrypto.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(usex openssl --with-openssl={yes,no})
+}
diff --git a/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch b/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch
new file mode 100644
index 00000000000..ef1f32e9855
--- /dev/null
+++ b/sci-calculators/datamash/files/datamash-1.2-libcrypto.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -56,6 +56,7 @@
+ $(LDEXPL_LIBM) \
+ $(LIBICONV) \
+ $(LIBINTL) \
++ $(LIB_CRYPTO) \
+ $(ROUND_LIBM) \
+ $(ROUNDL_LIBM) \
+ $(SQRT_LIBM) \
diff --git a/sci-calculators/datamash/metadata.xml b/sci-calculators/datamash/metadata.xml
index 5ba62861f1c..71dccc38c27 100644
--- a/sci-calculators/datamash/metadata.xml
+++ b/sci-calculators/datamash/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="person">
<email>jer@gentoo.org</email>
</maintainer>
+<use>
+<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> for cryptographic features</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-09 6:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-23 22:09 [gentoo-commits] repo/gentoo:master commit in: sci-calculators/datamash/, sci-calculators/datamash/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2018-08-08 20:58 Jeroen Roovers
2017-08-23 17:52 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox