From 060fb03cf25dca1aa7adf2659092a930e88b5dde Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Mar 2018 21:16:23 +0000 Subject: dev-util/mingw64-runtime: switch to --prefix=/usr (from --prefix=/) A couple of changes: - Allow dev-util/mingw64-runtime[headers-only] for cross-building case. One day crossdew won't need cross-${CTARGET}/mingw64-runtime packages and will be able to use dev-util/mingw64-runtime directly. This change is a step in that direction. - Awitch to --prefix=/usr (from --prefix=/). This allow cross-building dev-util/mingw64-runtime itself and installing libraries into /usr/lib (instead of /lib). Tested as: - generated working toolchain: $ crossdev -t x86_64-w64-mingw32 - cross-built mingw64-runtime successfully: $ x86_64-w64-mingw32-emerge -v1 dev-util/mingw64-runtime Package-Manager: Portage-2.3.24, Repoman-2.3.6 --- .../mingw64-runtime-5.0.3-r2.ebuild | 117 +++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild new file mode 100644 index 000000000000..e52536087f3e --- /dev/null +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +WANT_AUTOMAKE="1.15" + +inherit autotools flag-o-matic eutils + +DESCRIPTION="Free Win64 runtime and import library definitions" +HOMEPAGE="http://mingw-w64.sourceforge.net/" +SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="headers-only idl libraries tools" +RESTRICT="strip" + +S="${WORKDIR}/mingw-w64-v${PV}" + +PATCHES=( + "${FILESDIR}/${P}-build.patch" +) + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} +just_headers() { + use headers-only +} +alt_prefix() { + is_crosscompile && echo /usr/${CTARGET} +} +crt_with() { + just_headers && echo --without-$1 || echo --with-$1 +} +crt_use_enable() { + just_headers && echo --without-$2 || use_enable "$@" +} +crt_use_with() { + just_headers && echo --without-$2 || use_with "$@" +} + +pkg_setup() { + if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then + die "Invalid configuration" + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + CHOST=${CTARGET} strip-unsupported-flags + + if ! just_headers; then + mkdir "${WORKDIR}/headers" + pushd "${WORKDIR}/headers" > /dev/null + CHOST=${CTARGET} "${S}/configure" \ + --prefix="${T}/tmproot" \ + --with-headers \ + --without-crt \ + || die + popd > /dev/null + append-cppflags "-I${T}/tmproot/include" + fi + + # By default configure tries to set --sysroot=${prefix}. We disable + # this behaviour with --with-sysroot=no to use gcc's sysroot default. + # That way we can cross-build mingw64-runtime with cross-emerge. + CHOST=${CTARGET} econf \ + --with-sysroot=no \ + --prefix="${EPREFIX}"$(alt_prefix)/usr \ + --with-headers \ + --enable-sdk \ + $(crt_with crt) \ + $(crt_use_enable idl idl) \ + $(crt_use_with libraries libraries) \ + $(crt_use_with tools tools) \ + $( + $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \ + && echo --disable-lib32 --enable-lib64 \ + || echo --enable-lib32 --disable-lib64 + ) +} + +src_compile() { + if ! just_headers; then + emake -C "${WORKDIR}/headers" install + fi + default +} + +src_install() { + default + + if is_crosscompile ; then + # gcc is configured to look at specific hard-coded paths for mingw #419601 + dosym usr /usr/${CTARGET}/mingw + dosym usr /usr/${CTARGET}/${CTARGET} + dosym usr/include /usr/${CTARGET}/sys-include + fi + + env -uRESTRICT CHOST=${CTARGET} prepallstrip + rm -rf "${ED}/usr/share" +} -- cgit v1.2.3-65-gdbad From 33bdde860e15105bd49183056f675a638ad7a96e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Mar 2018 21:19:08 +0000 Subject: dev-libs/cyrus-sasl: stable 2.1.26-r10 for ia64, bug #647786 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="ia64" --- dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild index 15bbac302ccd..187a24db1055 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" LICENSE="BSD-with-attribution" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" -- cgit v1.2.3-65-gdbad From 57ce1b106f2d2d4e317d14534573becbb7f308cd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Mar 2018 21:19:12 +0000 Subject: net-libs/serf: stable 1.3.8-r1 for ia64, bug #647786 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="ia64" --- net-libs/serf/serf-1.3.8-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild index c93bcfde2fca..7f3512ce0942 100644 --- a/net-libs/serf/serf-1.3.8-r1.ebuild +++ b/net-libs/serf/serf-1.3.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" IUSE="kerberos static-libs libressl" RDEPEND="dev-libs/apr:1= -- cgit v1.2.3-65-gdbad From 2cb15f761d84cb5872fbcfede3c0dceb953911f0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Mar 2018 21:19:16 +0000 Subject: sys-libs/ncurses: stable 6.1-r1 for ia64, bug #639706 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="ia64" --- sys-libs/ncurses/ncurses-6.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/ncurses/ncurses-6.1-r1.ebuild b/sys-libs/ncurses/ncurses-6.1-r1.ebuild index cbdc9b1d84a5..5daa060c7c9c 100644 --- a/sys-libs/ncurses/ncurses-6.1-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.1-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" LICENSE="MIT" # The subslot reflects the SONAME. SLOT="0/6" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -- cgit v1.2.3-65-gdbad From 4cd964d7a298a5e86a18e9e60cbbfe03ffba700c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Mar 2018 21:37:25 +0000 Subject: media-libs/gd: stable 2.2.5 for ia64, bug #629886 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="ia64" --- media-libs/gd/gd-2.2.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild index e2e8a7de5a71..3f6b91a2f623 100644 --- a/media-libs/gd/gd-2.2.5.ebuild +++ b/media-libs/gd/gd-2.2.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" LICENSE="gd IJG HPND BSD" SLOT="2/3" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib" # fontconfig has prefixed font paths, details see bug #518970 -- cgit v1.2.3-65-gdbad From 711327860c93283aa4d7708b11ff625644c3dd08 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 22 Mar 2018 21:14:51 +0000 Subject: java-ant-2.eclass: Drop unused and banned java-ant_remove-taskdefs It's been on the scrapheap long enough now. --- eclass/java-ant-2.eclass | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index db8404a3c24b..8da5971844a0 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2017 Gentoo Foundation +# Copyright 2004-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-ant-2.eclass @@ -359,40 +359,6 @@ java-ant_rewrite-classpath() { fi } -# @FUNCTION: java-ant_remove-taskdefs -# @USAGE: [--name NAME] [path/to/build.xml] -# @DESCRIPTION: -# Removes (named) taskdef elements from the build.xml file. -# When --name NAME is specified, only remove taskdef with name NAME. Otherwise, -# all taskdefs are removed. -# The file to rewrite defaults to build.xml when not specified. -java-ant_remove-taskdefs() { - debug-print-function ${FUNCNAME} $* - - die "${FUNCNAME} has been banned, see bug #479838." - - local task_name - if [[ "${1}" == --name ]]; then - task_name="${2}" - shift 2 - fi - local file="${1:-build.xml}" - echo "Removing taskdefs from ${file}" - python <