* [gentoo-commits] repo/gentoo:master commit in: sci-libs/udunits/files/, sci-libs/udunits/
@ 2016-01-17 19:43 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2016-01-17 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 0545cfffc68a4224f0c0e8699d4b3787c61f850d
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 17:23:03 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 19:43:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0545cfff
sci-libs/udunits: Drop old using EAPI < 4
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=478624
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/udunits/Manifest | 2 -
.../udunits/files/udunits-2.1.15-autotools.patch | 61 ----------------------
sci-libs/udunits/udunits-2.1.15.ebuild | 37 -------------
sci-libs/udunits/udunits-2.1.24-r1.ebuild | 41 ---------------
sci-libs/udunits/udunits-2.1.24.ebuild | 43 ---------------
5 files changed, 184 deletions(-)
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index 409fda8..736d8c1 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,3 +1 @@
-DIST udunits-2.1.15.tar.gz 1056530 SHA256 9f89196c3ffa5a4edebb944e17b38c7b20dc16b546311ea54272494b3c4b036d SHA512 bffd2cd788906b592a1c03ef3162c432c6b88aeb82dd67cccfe31f22eafe9ee55784328ad35eac9c13e0992f67921745930a2e16b12d4dc41c403f6877977815 WHIRLPOOL ac75641dea0182941cadf621daa12441617dd6d227dbfcb1cd819e8e69be1bf1a835996ae22f4902a52f853a5f9ab680b5a27540b061a95b61d7484fe029de7c
-DIST udunits-2.1.24.tar.gz 1059344 SHA256 2e5fa4583031b26404a68167b38a11773872486f3c342fdde1e48c52a86e0ed0 SHA512 71af2aa62300dd6a2c58318d75cb9182433a208e28446725334a3a80195ebdae77aebe66e6c4e12b53b675501cf3295de2960d1e8beb1496a547d4eed0cde98e WHIRLPOOL 3c0bf81216553c00d1d37c6f5542496385d9b3cde2b14683e0fe6aaf85f62b50f49923e2239f2616635a53a7c4df9070db1001c7261b00cd51751a99c8870104
DIST udunits-2.2.20.tar.gz 1002380 SHA256 f10a02014bc6a200d50d8719997bb3a6b3d364de688469d2f7d599688dd9d195 SHA512 5d5803d9c2cbfdba7c760739f522680e3e69921256119af83e139a36fbcb4d7c84e044661f2987e3422f1eea548abaf4f585946643e8db36cd1d7065b86f8737 WHIRLPOOL 9816092de3ef12ed5b721f41ac55ce1bb8ac61d687f458520c0d9322ad6b3b3e7e07b298c8364e22d70bdec996fbfc10b959b5008141169964bd05060f39ace0
diff --git a/sci-libs/udunits/files/udunits-2.1.15-autotools.patch b/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
deleted file mode 100644
index 31c6765..0000000
--- a/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 728e587..3c84c1b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,11 +6,11 @@
- #
- ## Process this file with automake to produce Makefile.in
- if COND_EXPAT
-- SUBDIRS = expat lib prog
-+ SUBDIRS = lib prog
- else
- SUBDIRS = lib prog
- endif
--DIST_SUBDIRS = expat lib prog test
-+DIST_SUBDIRS = lib prog test
- info_TEXINFOS = udunits2.texi
- udunits2_TEXINFOS = success.texi failure.texi make.texi
- EXTRA_DIST = \
-diff --git a/configure.ac b/configure.ac
-index 097f6eb..091e673 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,7 +13,7 @@ AC_INIT(UDUNITS, 2.1.15, support-udunits@unidata.ucar.edu)
- AC_CONFIG_SRCDIR([lib/converter.c])
- AC_CONFIG_AUX_DIR([.])
- AM_INIT_AUTOMAKE([foreign subdir-objects])
--AC_CONFIG_HEADERS([config.h expat/expat_config.h])
-+AC_CONFIG_HEADERS([config.h])
-
- CFLAGS_COVERAGE=''
- LIBS_COVERAGE=''
-@@ -37,7 +37,7 @@ AC_ARG_ENABLE([debug],
- CFLAGS="-g${CFLAGS:+ $CFLAGS}"
- debug=true ;;
- no)
-- CFLAGS="-O${CFLAGS:+ $CFLAGS}"
-+ CFLAGS="${CFLAGS:+ $CFLAGS}"
- debug=false ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
- esac],
-@@ -110,20 +110,12 @@ AM_CONDITIONAL([HAVE_CUNIT], [test "$LD_CUNIT"])
- AC_C_CONST
- AC_TYPE_SIZE_T
-
--# Needed for the Expat subpackage:
--AC_C_BIGENDIAN([byteorder=4321], [byteorder=1234])
--AC_DEFINE_UNQUOTED([BYTEORDER], [$byteorder],
-- [Define to 4321 for big-endian and 1234 for little-endian])
--AC_DEFINE([XML_CONTEXT_BYTES], 1024,
-- [How much context to retain around the current parse point.])
--
- # Checks for library functions.
- AC_CHECK_FUNCS([floor memmove memset modf pow strcasecmp strdup strpbrk])
-
- AC_PROG_LIBTOOL
-
- AC_CONFIG_FILES([Makefile
-- expat/Makefile
- lib/Makefile
- lib/xmlFailures/Makefile
- lib/xmlSuccesses/Makefile
diff --git a/sci-libs/udunits/udunits-2.1.15.ebuild b/sci-libs/udunits/udunits-2.1.15.ebuild
deleted file mode 100644
index 826a9fe..0000000
--- a/sci-libs/udunits/udunits-2.1.15.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="Library for manipulating units of physical quantities"
-HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="UCAR-Unidata"
-IUSE="doc"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # respect user's flags, compile with system libexpat
- epatch "${FILESDIR}"/${P}-autotools.patch
- rm -rf expat
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc CHANGE_LOG ANNOUNCEMENT
- doinfo udunits2.info prog/udunits2prog.info
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins udunits2.html udunits2.pdf
- doins prog/udunits2prog.html prog/udunits2prog.pdf
- fi
-}
diff --git a/sci-libs/udunits/udunits-2.1.24-r1.ebuild b/sci-libs/udunits/udunits-2.1.24-r1.ebuild
deleted file mode 100644
index 77acb54..0000000
--- a/sci-libs/udunits/udunits-2.1.24-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils fortran-2
-
-DESCRIPTION="Library for manipulating units of physical quantities"
-HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="UCAR-Unidata"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # respect user's flags, compile with system libexpat
- epatch "${FILESDIR}"/${PN}-2.1.15-autotools.patch
- rm -rf expat || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- doinfo udunits2.info prog/udunits2prog.info
- dodoc CHANGE_LOG ANNOUNCEMENT
- dodoc udunits2.pdf prog/udunits2prog.pdf
- docinto html
- dodoc udunits2.html prog/udunits2prog.html
-}
diff --git a/sci-libs/udunits/udunits-2.1.24.ebuild b/sci-libs/udunits/udunits-2.1.24.ebuild
deleted file mode 100644
index 8579118..0000000
--- a/sci-libs/udunits/udunits-2.1.24.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="Library for manipulating units of physical quantities"
-HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="UCAR-Unidata"
-IUSE="doc static-libs"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # respect user's flags, compile with system libexpat
- epatch "${FILESDIR}"/${PN}-2.1.15-autotools.patch
- rm -rf expat
- eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- dodoc CHANGE_LOG ANNOUNCEMENT
- doinfo udunits2.info prog/udunits2prog.info
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins udunits2.html udunits2.pdf
- doins prog/udunits2prog.html prog/udunits2prog.pdf
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/udunits/files/, sci-libs/udunits/
@ 2016-01-17 20:24 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2016-01-17 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 3a886679ba8e93a1731d66bee2c377ec367a5605
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 20:24:15 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 20:24:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a886679
sci-libs/udunits: Add back last stable version
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/udunits/Manifest | 1 +
.../udunits/files/udunits-2.1.15-autotools.patch | 61 ++++++++++++++++++++++
sci-libs/udunits/udunits-2.1.24-r1.ebuild | 41 +++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index 736d8c1..9a17122 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1 +1,2 @@
+DIST udunits-2.1.24.tar.gz 1059344 SHA256 2e5fa4583031b26404a68167b38a11773872486f3c342fdde1e48c52a86e0ed0 SHA512 71af2aa62300dd6a2c58318d75cb9182433a208e28446725334a3a80195ebdae77aebe66e6c4e12b53b675501cf3295de2960d1e8beb1496a547d4eed0cde98e WHIRLPOOL 3c0bf81216553c00d1d37c6f5542496385d9b3cde2b14683e0fe6aaf85f62b50f49923e2239f2616635a53a7c4df9070db1001c7261b00cd51751a99c8870104
DIST udunits-2.2.20.tar.gz 1002380 SHA256 f10a02014bc6a200d50d8719997bb3a6b3d364de688469d2f7d599688dd9d195 SHA512 5d5803d9c2cbfdba7c760739f522680e3e69921256119af83e139a36fbcb4d7c84e044661f2987e3422f1eea548abaf4f585946643e8db36cd1d7065b86f8737 WHIRLPOOL 9816092de3ef12ed5b721f41ac55ce1bb8ac61d687f458520c0d9322ad6b3b3e7e07b298c8364e22d70bdec996fbfc10b959b5008141169964bd05060f39ace0
diff --git a/sci-libs/udunits/files/udunits-2.1.15-autotools.patch b/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
new file mode 100644
index 0000000..31c6765
--- /dev/null
+++ b/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
@@ -0,0 +1,61 @@
+diff --git a/Makefile.am b/Makefile.am
+index 728e587..3c84c1b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,11 +6,11 @@
+ #
+ ## Process this file with automake to produce Makefile.in
+ if COND_EXPAT
+- SUBDIRS = expat lib prog
++ SUBDIRS = lib prog
+ else
+ SUBDIRS = lib prog
+ endif
+-DIST_SUBDIRS = expat lib prog test
++DIST_SUBDIRS = lib prog test
+ info_TEXINFOS = udunits2.texi
+ udunits2_TEXINFOS = success.texi failure.texi make.texi
+ EXTRA_DIST = \
+diff --git a/configure.ac b/configure.ac
+index 097f6eb..091e673 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@ AC_INIT(UDUNITS, 2.1.15, support-udunits@unidata.ucar.edu)
+ AC_CONFIG_SRCDIR([lib/converter.c])
+ AC_CONFIG_AUX_DIR([.])
+ AM_INIT_AUTOMAKE([foreign subdir-objects])
+-AC_CONFIG_HEADERS([config.h expat/expat_config.h])
++AC_CONFIG_HEADERS([config.h])
+
+ CFLAGS_COVERAGE=''
+ LIBS_COVERAGE=''
+@@ -37,7 +37,7 @@ AC_ARG_ENABLE([debug],
+ CFLAGS="-g${CFLAGS:+ $CFLAGS}"
+ debug=true ;;
+ no)
+- CFLAGS="-O${CFLAGS:+ $CFLAGS}"
++ CFLAGS="${CFLAGS:+ $CFLAGS}"
+ debug=false ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
+ esac],
+@@ -110,20 +110,12 @@ AM_CONDITIONAL([HAVE_CUNIT], [test "$LD_CUNIT"])
+ AC_C_CONST
+ AC_TYPE_SIZE_T
+
+-# Needed for the Expat subpackage:
+-AC_C_BIGENDIAN([byteorder=4321], [byteorder=1234])
+-AC_DEFINE_UNQUOTED([BYTEORDER], [$byteorder],
+- [Define to 4321 for big-endian and 1234 for little-endian])
+-AC_DEFINE([XML_CONTEXT_BYTES], 1024,
+- [How much context to retain around the current parse point.])
+-
+ # Checks for library functions.
+ AC_CHECK_FUNCS([floor memmove memset modf pow strcasecmp strdup strpbrk])
+
+ AC_PROG_LIBTOOL
+
+ AC_CONFIG_FILES([Makefile
+- expat/Makefile
+ lib/Makefile
+ lib/xmlFailures/Makefile
+ lib/xmlSuccesses/Makefile
diff --git a/sci-libs/udunits/udunits-2.1.24-r1.ebuild b/sci-libs/udunits/udunits-2.1.24-r1.ebuild
new file mode 100644
index 0000000..bc88815
--- /dev/null
+++ b/sci-libs/udunits/udunits-2.1.24-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils fortran-2
+
+DESCRIPTION="Library for manipulating units of physical quantities"
+HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
+SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="UCAR-Unidata"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # respect user's flags, compile with system libexpat
+ epatch "${FILESDIR}"/${PN}-2.1.15-autotools.patch
+ rm -rf expat || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ doinfo udunits2.info prog/udunits2prog.info
+ dodoc CHANGE_LOG ANNOUNCEMENT
+ dodoc udunits2.pdf prog/udunits2prog.pdf
+ docinto html
+ dodoc udunits2.html prog/udunits2prog.html
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-17 20:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-17 20:24 [gentoo-commits] repo/gentoo:master commit in: sci-libs/udunits/files/, sci-libs/udunits/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2016-01-17 19:43 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox