From 093d3612ed3265a0080826006351939f390fbf3c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 1 Aug 2016 14:07:49 +0300 Subject: [PATCH] Sync with portage [Mon Aug 1 14:07:49 MSK 2016]. --- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/net-mail/offlineimap-7.0.3 | 14 -- .../md5-cache/net-mail/offlineimap-7.0.3-r1 | 14 ++ metadata/md5-cache/sys-apps/openrc-0.21.3 | 4 +- metadata/md5-cache/sys-fs/squashfs-tools-9999 | 11 ++ .../md5-cache/sys-libs/timezone-data-2016d | 13 -- .../md5-cache/sys-libs/timezone-data-2016e | 4 +- metadata/news/timestamp.chk | 2 +- metadata/projects.xml | 30 ++++ metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- metadata/xml-schema/timestamp.chk | 2 +- ...0.3.ebuild => offlineimap-7.0.3-r1.ebuild} | 11 +- sys-apps/openrc/openrc-0.21.3.ebuild | 2 +- .../squashfs-tools/squashfs-tools-9999.ebuild | 64 +++++++ sys-libs/timezone-data/Manifest | 2 - .../timezone-data/timezone-data-2016d.ebuild | 157 ------------------ .../timezone-data/timezone-data-2016e.ebuild | 2 +- 20 files changed, 134 insertions(+), 208 deletions(-) delete mode 100644 metadata/md5-cache/net-mail/offlineimap-7.0.3 create mode 100644 metadata/md5-cache/net-mail/offlineimap-7.0.3-r1 create mode 100644 metadata/md5-cache/sys-fs/squashfs-tools-9999 delete mode 100644 metadata/md5-cache/sys-libs/timezone-data-2016d rename net-mail/offlineimap/{offlineimap-7.0.3.ebuild => offlineimap-7.0.3-r1.ebuild} (86%) create mode 100644 sys-fs/squashfs-tools/squashfs-tools-9999.ebuild delete mode 100644 sys-libs/timezone-data/timezone-data-2016d.ebuild diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 4d49ab30865c..47526030939e 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Mon, 01 Aug 2016 06:40:36 +0000 +Mon, 01 Aug 2016 10:40:37 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 4d49ab30865c..47526030939e 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Mon, 01 Aug 2016 06:40:36 +0000 +Mon, 01 Aug 2016 10:40:37 +0000 diff --git a/metadata/md5-cache/net-mail/offlineimap-7.0.3 b/metadata/md5-cache/net-mail/offlineimap-7.0.3 deleted file mode 100644 index d6b407db2a87..000000000000 --- a/metadata/md5-cache/net-mail/offlineimap-7.0.3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare setup test -DEPEND=doc? ( app-text/asciidoc ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite?,ssl?] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,sqlite?,ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] -DESCRIPTION=Powerful IMAP/Maildir synchronization and reader support -EAPI=6 -HOMEPAGE=http://offlineimap.org -IUSE=doc ssl sqlite python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4 -KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos -LICENSE=GPL-2 -RDEPEND=dev-python/six python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite?,ssl?] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,sqlite?,ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] -REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) -SLOT=0 -SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v7.0.3.tar.gz -> offlineimap-7.0.3.tar.gz -_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multilib d062ae4ba2fc40a19c11de2ad89b6616 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 82165206dedb2075f9a0fb8f9b1f9441 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=c35fc5b3f6d197f6b522b7c295e23413 diff --git a/metadata/md5-cache/net-mail/offlineimap-7.0.3-r1 b/metadata/md5-cache/net-mail/offlineimap-7.0.3-r1 new file mode 100644 index 000000000000..af391db46ab7 --- /dev/null +++ b/metadata/md5-cache/net-mail/offlineimap-7.0.3-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare setup test +DEPEND=doc? ( app-text/asciidoc ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,sqlite,ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] +DESCRIPTION=Powerful IMAP/Maildir synchronization and reader support +EAPI=6 +HOMEPAGE=http://offlineimap.org +IUSE=doc ssl python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4 +KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +LICENSE=GPL-2 +RDEPEND=dev-python/six python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,sqlite,ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] +REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) +SLOT=0 +SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v7.0.3.tar.gz -> offlineimap-7.0.3.tar.gz +_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multilib d062ae4ba2fc40a19c11de2ad89b6616 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 82165206dedb2075f9a0fb8f9b1f9441 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 +_md5_=c9d1648df6d160322b115518944a6933 diff --git a/metadata/md5-cache/sys-apps/openrc-0.21.3 b/metadata/md5-cache/sys-apps/openrc-0.21.3 index 676842e5624a..c6c66dfc5764 100644 --- a/metadata/md5-cache/sys-apps/openrc-0.21.3 +++ b/metadata/md5-cache/sys-apps/openrc-0.21.3 @@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host EAPI=6 HOMEPAGE=https://github.com/openrc/openrc/ IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs tools unicode kernel_linux kernel_FreeBSD -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd +KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd LICENSE=BSD-2 PDEPEND=netifrc? ( net-misc/netifrc ) RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) tools? ( dev-lang/perl ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( sec-policy/selinux-base-policy sec-policy/selinux-openrc ) SLOT=0 SRC_URI=https://dev.gentoo.org/~williamh/dist/openrc-0.21.3.tar.bz2 _eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib d062ae4ba2fc40a19c11de2ad89b6616 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 toolchain-funcs 82165206dedb2075f9a0fb8f9b1f9441 -_md5_=3d74878edf4366ae9219207c75ca2197 +_md5_=625c1fb0445a3ff34a03fef469f05c8b diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-9999 b/metadata/md5-cache/sys-fs/squashfs-tools-9999 new file mode 100644 index 000000000000..77f7dc65bbae --- /dev/null +++ b/metadata/md5-cache/sys-fs/squashfs-tools-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install unpack +DEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) >=dev-vcs/git-1.8.2.1 +DESCRIPTION=Tool for creating compressed filesystem type squashfs +EAPI=6 +HOMEPAGE=http://squashfs.sourceforge.net +IUSE=lz4 lzma lzo xattr +xz +LICENSE=GPL-2 +RDEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) +SLOT=0 +_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde git-r3 00f60a84fc7b499c99edfe99caea9f95 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs 82165206dedb2075f9a0fb8f9b1f9441 +_md5_=e603118b45254a47df2660325ab258d0 diff --git a/metadata/md5-cache/sys-libs/timezone-data-2016d b/metadata/md5-cache/sys-libs/timezone-data-2016d deleted file mode 100644 index 6b26ff10ad2f..000000000000 --- a/metadata/md5-cache/sys-libs/timezone-data-2016d +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile config configure install postinst preinst prepare -DEPEND=nls? ( virtual/libintl ) -DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump) -EAPI=5 -HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm -IUSE=nls leaps_timezone elibc_FreeBSD -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos -LICENSE=BSD public-domain -RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] -SLOT=0 -SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2016d.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2016d.tar.gz -_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs 82165206dedb2075f9a0fb8f9b1f9441 -_md5_=f94da4aedd896ee3a98620aee015efb6 diff --git a/metadata/md5-cache/sys-libs/timezone-data-2016e b/metadata/md5-cache/sys-libs/timezone-data-2016e index b6e1d135d5ac..eb50e7ea8531 100644 --- a/metadata/md5-cache/sys-libs/timezone-data-2016e +++ b/metadata/md5-cache/sys-libs/timezone-data-2016e @@ -4,10 +4,10 @@ DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdum EAPI=5 HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm IUSE=nls leaps_timezone elibc_FreeBSD -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos LICENSE=BSD public-domain RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] SLOT=0 SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2016e.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2016e.tar.gz _eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs 82165206dedb2075f9a0fb8f9b1f9441 -_md5_=93b1780cde7cc6521825525c5c22593d +_md5_=f94da4aedd896ee3a98620aee015efb6 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 4d49ab30865c..47526030939e 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Mon, 01 Aug 2016 06:40:36 +0000 +Mon, 01 Aug 2016 10:40:37 +0000 diff --git a/metadata/projects.xml b/metadata/projects.xml index 304ae918f1c3..5bad32e8f82c 100644 --- a/metadata/projects.xml +++ b/metadata/projects.xml @@ -396,6 +396,11 @@ Amy Winston Member + + marecki@gentoo.org + Marek Szuba + Member + wraeth@gentoo.org Sam Jorna @@ -969,6 +974,11 @@ Yixun Lan member + + marecki@gentoo.org + Marek Szuba + member + perfinion@gentoo.org Jason Zaman @@ -2164,6 +2174,11 @@ Jauhien Piatlicki Mathematics + + marecki@gentoo.org + Marek Szuba + Numerics, Statistics + soap@gentoo.org David Seifert @@ -2627,6 +2642,11 @@ Jauhien Piatlicki Physics + + marecki@gentoo.org + Marek Szuba + High Energy Physics + nicolasbock@gentoo.org Nicolas Bock @@ -2957,6 +2977,11 @@ Maxim Koltsov Member + + marecki@gentoo.org + Marek Szuba + Member + mgorny@gentoo.org Michał Górny @@ -3720,6 +3745,11 @@ Justin Lecher Chemistry, Biology, * + + marecki@gentoo.org + Marek Szuba + Physics, Mathematics, Electronics, * + nicolasbock@gentoo.org Nicolas Bock diff --git a/metadata/timestamp b/metadata/timestamp index 95c3ac2beb5e..2c27d5857eb1 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Mon Aug 1 06:39:42 UTC 2016 +Mon Aug 1 10:39:43 UTC 2016 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index a3557fb1f69c..cbcda7e5b978 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Mon, 01 Aug 2016 07:00:01 +0000 +Mon, 01 Aug 2016 11:00:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 43f2f70703c5..838504bf7c9c 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1470033601 Mon 01 Aug 2016 06:40:01 AM UTC +1470048001 Mon 01 Aug 2016 10:40:01 AM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index 4d49ab30865c..47526030939e 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Mon, 01 Aug 2016 06:40:36 +0000 +Mon, 01 Aug 2016 10:40:37 +0000 diff --git a/net-mail/offlineimap/offlineimap-7.0.3.ebuild b/net-mail/offlineimap/offlineimap-7.0.3-r1.ebuild similarity index 86% rename from net-mail/offlineimap/offlineimap-7.0.3.ebuild rename to net-mail/offlineimap/offlineimap-7.0.3-r1.ebuild index f69cfeea2975..6de39f8cf15a 100644 --- a/net-mail/offlineimap/offlineimap-7.0.3.ebuild +++ b/net-mail/offlineimap/offlineimap-7.0.3-r1.ebuild @@ -7,7 +7,7 @@ EAPI=6 # Normally you need only one version of this. DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python2_7 python3_4 ) -PYTHON_REQ_USE="threads,sqlite?,ssl?" +PYTHON_REQ_USE="threads,sqlite,ssl?" inherit distutils-r1 @@ -18,7 +18,7 @@ SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc ssl sqlite" +IUSE="doc ssl" RDEPEND="dev-python/six" DEPEND="doc? ( app-text/asciidoc )" @@ -41,7 +41,6 @@ src_install() { } pkg_postinst() { - echo elog "You will need to configure offlineimap by creating ~/.offlineimaprc" elog "Sample configurations are in /usr/share/doc/${PF}/" elog "" @@ -50,10 +49,4 @@ pkg_postinst() { elog "configuration file to be sure it connects to the same server every" elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't" elog "check SSL server certificate) in cases where you have no CA cert." - echo - - if use sqlite ; then - elog "The sqlite USE flag only enables a dependency on sqlite. To use" - elog "the sqlite backend you need to enable it in your .offlineimaprc" - fi } diff --git a/sys-apps/openrc/openrc-0.21.3.ebuild b/sys-apps/openrc/openrc-0.21.3.ebuild index 60d554a07f69..18b07e5486d5 100644 --- a/sys-apps/openrc/openrc-0.21.3.ebuild +++ b/sys-apps/openrc/openrc-0.21.3.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" + KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" fi LICENSE="BSD-2" diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild new file mode 100644 index 000000000000..85558e8938fd --- /dev/null +++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils git-r3 toolchain-funcs + +DEB_VER="3" + +DESCRIPTION="Tool for creating compressed filesystem type squashfs" +HOMEPAGE="http://squashfs.sourceforge.net" +EGIT_REPO_URI=" + https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="lz4 lzma lzo xattr +xz" + +RDEPEND=" + sys-libs/zlib + !xz? ( !lzo? ( sys-libs/zlib ) ) + lz4? ( app-arch/lz4 ) + lzma? ( app-arch/xz-utils ) + lzo? ( dev-libs/lzo ) + xattr? ( sys-apps/attr ) + xz? ( app-arch/xz-utils ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3-sysmacros.patch + "${FILESDIR}"/${PN}-4.3-aligned-data.patch + "${FILESDIR}"/${PN}-4.3-xattrs.patch +) + +use10() { usex $1 1 0 ; } + +src_configure() { + cd "${WORKDIR}"/${P}/${PN} || die + + # set up make command line variables in EMAKE_SQUASHFS_CONF + EMAKE_SQUASHFS_CONF=( + LZMA_XZ_SUPPORT=$(use10 lzma) + LZO_SUPPORT=$(use10 lzo) + LZ4_SUPPORT=$(use10 lz4) + XATTR_SUPPORT=$(use10 xattr) + XZ_SUPPORT=$(use10 xz) + ) + + tc-export CC +} + +src_compile() { + cd "${WORKDIR}"/${P}/${PN} || die + emake "${EMAKE_SQUASHFS_CONF[@]}" +} + +src_install() { + cd "${WORKDIR}"/${P}/${PN} || die + dobin mksquashfs unsquashfs + cd .. || die + dodoc CHANGES README RELEASE-README RELEASE-READMEs/* +} diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index c8c9a8beb094..e70ea2a63471 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -1,6 +1,4 @@ -DIST tzcode2016d.tar.gz 192870 SHA256 a8f33d6f87aef7e109e4769fc7f6e63637d52d07ddf6440a1a50df3d9a34e0ca SHA512 c6f6259a78fadaab293be0a4123c226d1a327588639cfa8dadb5a74bd58552892a0c87cfd3a33888f886f51aff34465c89505f0892e6bcbe24247a9160e7328c WHIRLPOOL 968e1e4d635853d81e3bb522543ca7c216f9110a0d20de612c0b1220fac926325e7b6f2a6381830ecb43e633ba29d66c08ec2c890cd8685793c4d66378022b82 DIST tzcode2016e.tar.gz 194647 SHA256 57d8c4fcd5e8a90657d0e298eac5effb1a642119c92308db68d13a4612fa459e SHA512 dcaf615ada96920e60ffb336253f53541861153decc156d41661f43e0bfb128c6c231b0b776bbe3f2176549346275fc5a879074f4977d5141228e58cb33a41c6 WHIRLPOOL e9397b1d4236062a95a46ed463378a295a1959593611536416aeeb8c72c98131cf059d065439f59ae2b40722129b1c2ede7d14dc131ed431042620e54133148d DIST tzcode2016f.tar.gz 194905 SHA256 72325f384490a310eeb2ea0fab7e6f011a5be19adab2ff9d83bf9d1993b066ed SHA512 97d084f4b0a688fef097dca256083ca9948393848d77c8ee637bdd26f859150cce7d2b26fc1165a3b44b28cc1c9075e10192332261ed68990b4b21a85438b023 WHIRLPOOL fa5b1dcc3c666fda497e715be1c3eb21cd69b080c0b703f6a45883caf05ddd7e06b7aee9a632c62a33b6f1b563b634b5491a24b72d5bd1f5116214f19822823c -DIST tzdata2016d.tar.gz 312481 SHA256 d9554dfba0efd76053582bd89e8c7036ef12eee14fdd506675b08a5b59f0a1b4 SHA512 f1beb1793c4c7d18f2dadaf4a928b1476f66b400bda0c87b06155c0dd1c4b4a26bb2f37dc17a3676a2bbe9c1e71a5d8b27a171c797a86464b0bc0d13abfb2f99 WHIRLPOOL c6933da933c10bb518fffb5b135bc0d5a717cc955cc75fe36e97e2df08bf07663e493786640def956055cab28e3ea3edfc0b71fa2303788fcafb82312380b060 DIST tzdata2016e.tar.gz 313684 SHA256 ba00f899f18dc4048d7fa21f5e1fdef434496084eedc06f6caa15e5ecdb6bd81 SHA512 dace0f6fc87a73879ca3a1b143d7dcf9c50803e23e6b8c91f83711704e28129af776676c547c42f14dee7f1e8e285ce25296e53a52d11f4c8f155b5f80f4beb3 WHIRLPOOL 69f5e70ae836c71c84c3bb1653887b15e2d408fe0927397a8f16f81b13ce1a23e1ad881084eb36b7785b3f129299830d03a5d2722029fdb8eed305c851661b7d DIST tzdata2016f.tar.gz 313286 SHA256 ed8c951008d12f1db55a11e96fc055718c6571233327d9de16a7f8475e2502b0 SHA512 0472f9516b6c3d83c0a5d0953a5535f4c48d9b9171e125f528188dac512f3556bc1805b7029c4f467a122cbce1beb4e804dd4ae63b259952de3bb217f8e8941d WHIRLPOOL 229b1c1b1bfb1fc8c0bcf33dccf546cd0a0b230161919249372dbe5a4d4d82a1b2bd42e5d3722b62ce8fe31479632bf0ae712aac876901d6acb95959b163f951 diff --git a/sys-libs/timezone-data/timezone-data-2016d.ebuild b/sys-libs/timezone-data/timezone-data-2016d.ebuild deleted file mode 100644 index 73e4b89dbceb..000000000000 --- a/sys-libs/timezone-data/timezone-data-2016d.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic - -code_ver=${PV} -data_ver=${PV} -DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" -HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" -SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz - http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" - -LICENSE="BSD public-domain" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="nls leaps_timezone elibc_FreeBSD" - -DEPEND="nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !sys-libs/glibc[vanilla(+)]" - -S=${WORKDIR} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2016c-makefile.patch - tc-is-cross-compiler && cp -pR "${S}" "${S}"-native -} - -src_configure() { - tc-export CC - - append-lfs-flags #471102 - - if use elibc_FreeBSD || use elibc_Darwin ; then - append-cppflags -DSTD_INSPIRED #138251 - fi - - append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"' - LDLIBS="" - if use nls ; then - # See if an external libintl is available. #154181 #578424 - local c="${T}/test" - echo 'main(){}' > "${c}.c" - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then - LDLIBS+=" -lintl" - fi - fi -} - -_emake() { - emake \ - TOPDIR="${EPREFIX}/usr" \ - REDO=$(usex leaps_timezone posix_right posix_only) \ - "$@" -} - -src_compile() { - # TOPDIR is used in some utils when compiling. - _emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - CFLAGS="${CFLAGS} -std=gnu99" \ - LDFLAGS="${LDFLAGS}" \ - LDLIBS="${LDLIBS}" - if tc-is-cross-compiler ; then - _emake -C "${S}"-native \ - CC="$(tc-getBUILD_CC)" \ - CFLAGS="${BUILD_CFLAGS}" \ - CPPFLAGS="${BUILD_CPPFLAGS}" \ - LDFLAGS="${BUILD_LDFLAGS}" \ - LDLIBS="${LDLIBS}" \ - zic - fi -} - -src_install() { - local zic="" - tc-is-cross-compiler && zic="zic=${S}-native/zic" - _emake install ${zic} DESTDIR="${D}" - dodoc CONTRIBUTING README NEWS Theory - dohtml *.htm -} - -get_TIMEZONE() { - local tz src="${EROOT}etc/timezone" - if [[ -e ${src} ]] ; then - tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") - else - tz="FOOKABLOIE" - fi - [[ -z ${tz} ]] && return 1 || echo "${tz}" -} - -pkg_preinst() { - local tz=$(get_TIMEZONE) - if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then - eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" - eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" - eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" - eerror "be using right/xxx for the system timezone as it breaks programs." - die "Please fix your timezone setting" - fi - - # Trim the symlink by hand to avoid portage's automatic protection checks. - rm -f "${EROOT}"/usr/share/zoneinfo/posix - - if has_version "<=${CATEGORY}/${PN}-2015c" ; then - elog "Support for accessing posix/ and right/ directly has been dropped to match" - elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." - elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" - elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" - fi -} - -pkg_config() { - # make sure the /etc/localtime file does not get stale #127899 - local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" - - # If it's a symlink, assume the user knows what they're doing and - # they're managing it themselves. #511474 - if [[ -L ${etc_lt} ]] ; then - einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." - return 0 - fi - - if ! tz=$(get_TIMEZONE) ; then - einfo "Assuming your empty ${etc_lt} file is what you want; skipping update." - return 0 - fi - if [[ ${tz} == "FOOKABLOIE" ]] ; then - elog "You do not have TIMEZONE set in ${src}." - - if [[ ! -e ${etc_lt} ]] ; then - cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" - elog "Setting ${etc_lt} to Factory." - else - elog "Skipping auto-update of ${etc_lt}." - fi - return 0 - fi - - if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then - elog "You have an invalid TIMEZONE setting in ${src}" - elog "Your ${etc_lt} has been reset to Factory; enjoy!" - tz="Factory" - fi - einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" - cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" -} - -pkg_postinst() { - pkg_config -} diff --git a/sys-libs/timezone-data/timezone-data-2016e.ebuild b/sys-libs/timezone-data/timezone-data-2016e.ebuild index 570028da0c63..73e4b89dbceb 100644 --- a/sys-libs/timezone-data/timezone-data-2016e.ebuild +++ b/sys-libs/timezone-data/timezone-data-2016e.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.ta LICENSE="BSD public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="nls leaps_timezone elibc_FreeBSD" DEPEND="nls? ( virtual/libintl )"