* [gentoo-commits] repo/gentoo:master commit in: dev-util/mingw-runtime/, dev-util/mingw-runtime/files/, dev-util/w32api/, ...
@ 2019-10-20 8:41 Sergei Trofimovich
0 siblings, 0 replies; only message in thread
From: Sergei Trofimovich @ 2019-10-20 8:41 UTC (permalink / raw
To: gentoo-commits
commit: c61bbbef5950cf52bf752043efcb7ce68357cb7e
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 08:35:26 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 08:41:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61bbbef
dev-util/w32api, dev-util/mingw-runtime: drop packages
Drop mingw-runtime-based packages. Use mingw64-runtime-based ones instead.
Here are example mingw64-based tuples to use:
- i686-w64-mingw32 (equivalent of mingw32)
- x86_64-w64-mingw32 (equivalent on migw64?)
crossdev can be used to recreate new cross-environment.
Closes: https://bugs.gentoo.org/584858
Closes: https://bugs.gentoo.org/511492
Closes: https://bugs.gentoo.org/568500
Closes: https://bugs.gentoo.org/574556
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/mingw-runtime/Manifest | 4 -
.../files/mingw-runtime-3.18-gcc-4.6.patch | 27 ----
.../files/mingw-runtime-3.20-LDBL_MIN_EXP.patch | 145 ---------------------
dev-util/mingw-runtime/metadata.xml | 11 --
dev-util/mingw-runtime/mingw-runtime-3.18.ebuild | 76 -----------
dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild | 77 -----------
dev-util/mingw-runtime/mingw-runtime-3.20.ebuild | 75 -----------
.../mingw-runtime/mingw-runtime-4.0.3.1.ebuild | 82 ------------
dev-util/w32api/Manifest | 2 -
dev-util/w32api/metadata.xml | 11 --
dev-util/w32api/w32api-3.17.2.ebuild | 64 ---------
dev-util/w32api/w32api-4.0.3.1.ebuild | 66 ----------
profiles/package.mask | 2 -
13 files changed, 642 deletions(-)
diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
deleted file mode 100644
index 2e7255f1d96..00000000000
--- a/dev-util/mingw-runtime/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST mingwrt-3.18-mingw32-src.tar.gz 391939 BLAKE2B 9d0164f9292d29937bf01d7110d1a80719fb91baf2898670dcaed868c95b224d7b6d947d0a1b0cd70b5a0360f7d26a10d0956ee778e7c8d489d621ae531b788b SHA512 87778f08469a806dda606b0945d00511fccd0f7e0d545a33e2b4685db2490ec6a3e5e4267090b79a88eb963f97035fe8149097892f1f4a6e85f3a4661eb5e977
-DIST mingwrt-3.20-2-mingw32-src.tar.lzma 302072 BLAKE2B 93f5efff918e48829fe75018da53d34de1d0eeb782466e4a022740213433d634a41512f44a90676e4bbf8476e81e74ec1785ce127a2c217c755fcb9d6e9f8e72 SHA512 ffb8e3d46a4646b236b67df0d9d21571a0ee8b78125989d506c176e03922e520201770a03093f27789f0e4373bf64f69d41e377d861ddd008b5e29da65fb1d55
-DIST mingwrt-3.20-mingw32-src.tar.gz 393946 BLAKE2B 1efe539aac86ea9fb7b0e258d086a52421d0d23b18670728703ad9153fadd84b9ef50b6d1367839a3dbdfbecfe66ef431d512ca91ca6d6e6ff4b7ed865afd07e SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c
-DIST mingwrt-4.0.3-1-mingw32-src.tar.lzma 1341612 BLAKE2B 4251c5737af3c209ea0fa22b604c24ffb6b67c6ab83d13e67ffc5750334f668005f321965a3d9cdf10e93e801730758c29cf64c10541a9e192e0a3355e2abd3f SHA512 2aa429f939038c86441ccfd32b4ddd40347582557f9427df92ea7454eb5bf743b8e1aafbb627b527be755976be807f415aad3920f700d93aa86d07bf40f12bde
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
deleted file mode 100644
index eff81002e62..00000000000
--- a/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3446009&group_id=2435&atid=302435
-https://bugs.gentoo.org/419627
-
---- a/tlssup.c
-+++ b/tlssup.c
-@@ -84,6 +84,7 @@ BOOL WINAPI
- __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
- {
- _PVFV *pfunc;
-+ int nfuncs, ifunc;
-
- /* We don't let us trick here. */
- if (_CRT_MT != 2)
-@@ -96,8 +97,12 @@ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
- return TRUE;
- }
-
-- for (pfunc = &__xd_a + 1; pfunc != &__xd_z; ++pfunc)
-+ /* Use the nfuncs variable to iterate the TLS functions instead of pfunc to
-+ avoid nasty compiler optimizations when comparing two global pointers. */
-+ nfuncs = &__xd_z - (&__xd_a + 1);
-+ for (ifunc=0; ifunc < nfuncs; ++ifunc)
- {
-+ pfunc = (&__xd_a + 1) + ifunc;
- if (*pfunc != NULL)
- (*pfunc)();
- }
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch
deleted file mode 100644
index 49377fe2b09..00000000000
--- a/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&atid=102435&aid=3441135&group_id=2435
-https://bugs.gentoo.org/395893
-
-????-??-?? Keith Marshall <keithmarshall@...>
-
- Support pragmatic identification for w32api source directory.
-
- * aclocal.m4 (MINGW_AC_W32API_SRCDIR): New macro; implement it.
- * configure.in (W32API_INCLUDE): Assign using MINGW_AC_W32API_SRCDIR.
- * Makefile.in (W32API_INCLUDE): Prefix -I flag to AC_SUBST value.
- * mingwex/Makefile.in (W32API_INCLUDE): Likewise.
- * profile/Makefile.in (W32API_INCLUDE): Likewise.
-
-diff -r 62c176864807 Makefile.in
---- a/Makefile.in Mon Nov 28 11:32:25 2011 +0000
-+++ b/Makefile.in Mon Nov 28 21:18:55 2011 +0000
-@@ -166,9 +166,9 @@ THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_
- # Various libraries.
- LIBM_A=@LIBM_A@
-
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I$(srcdir)/include \
-- -I$(srcdir)/../include \
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I $(srcdir)/include \
-+ -I $(srcdir)/../include \
- -nostdinc \
- -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
-diff -r 62c176864807 aclocal.m4
---- a/aclocal.m4 Mon Nov 28 11:32:25 2011 +0000
-+++ b/aclocal.m4 Mon Nov 28 21:18:55 2011 +0000
-@@ -15,7 +15,65 @@ AC_DEFUN([MINGW_AC_CONFIG_SRCDIR],
- AC_MSG_CHECKING([package version])
- PACKAGE_VERSION=`awk '$[2] == "'"$1"'" { print $[3] }' ${srcdir}/$2`
- AC_MSG_RESULT([$PACKAGE_VERSION])dnl
--]) #MINGW_AC_CONFIG_SRCDIR
-+])# MINGW_AC_CONFIG_SRCDIR
-+
-+# MINGW_AC_W32API_SRCDIR
-+# ----------------------
-+# Attempt to identify the location of the w32api sources.
-+# Accept an explicit location specified by to user, as argument
-+# to --with-w32api-srcdir; if unspecified, fall back to standard
-+# location relative to ${srcdir}. Identification requires that
-+# include/windows.h is present within the nominated directory.
-+# This is naive, but AC_CHECK_HEADER cannot be used because
-+# the system's w32api headers will interfere.
-+#
-+AC_DEFUN([MINGW_AC_W32API_SRCDIR],
-+[AC_ARG_WITH([w32api-srcdir],
-+ [AS_HELP_STRING([--with-w32api-srcdir=DIR],
-+ [locate w32api sources in DIR [SRCDIR/../w32api]])
-+ ],[],[with_w32api_srcdir=NONE])
-+ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+ [AC_MSG_CHECKING([include path for w32api headers])
-+ for with_w32api_srcdir in ${srcdir}/../w32api*; do
-+ test -f "${with_w32api_srcdir}/include/windows.h" && break
-+ with_w32api_srcdir=NONE
-+ done
-+ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+ [AC_MSG_RESULT([none found])
-+ AC_MSG_RESULT
-+ AC_MSG_WARN([source directory containing include/windows.h not found])
-+ AC_MSG_WARN([ensure w32api sources are installed at \${top_srcdir}/../w32api*])
-+ AC_MSG_WARN([or use --with-w32api-srcdir=DIR to specify an alternative])
-+ ],
-+ [case "${with_w32api_srcdir}" in
-+ "${srcdir}/"*) with_w32api_srcdir="`echo "${with_w32api_srcdir}"dnl
-+ | sed s,"^${srcdir}/",'${top_srcdir}/',`" ;;
-+ esac
-+ AC_MSG_RESULT([${with_w32api_srcdir}/include])
-+ ])
-+ ],
-+ [AC_MSG_CHECKING([for windows.h in ${with_w32api_srcdir}/include])
-+ AS_IF([test -f "${with_w32api_srcdir}/include/windows.h"],
-+ [AC_MSG_RESULT([yes])
-+ case "${with_w32api_srcdir}" in /*) ;;
-+ *) with_w32api_srcdir='${top_builddir}/'"${with_w32api_srcdir}" ;;
-+ esac
-+ ],
-+ [AC_MSG_RESULT([no])
-+ AC_MSG_RESULT
-+ AC_MSG_WARN([the nominated directory, ${with_w32api_srcdir}])
-+ AC_MSG_WARN([does not appear to contain valid w32api source code])
-+ AC_MSG_WARN([(file '${with_w32api_srcdir}/include/windows.h' is not present)])
-+ with_w32api_srcdir=NONE
-+ ])
-+ ])
-+ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+ [AC_MSG_WARN([please correct this omission and run configure again])
-+ AC_MSG_RESULT
-+ AC_MSG_ERROR([unable to continue until this issue is resolved])
-+ ])
-+ W32API_INCLUDE="${with_w32api_srcdir}/include"
-+])# MINGW_AC_W32API_SRCDIR
-
- # The following is copied from `no-executables.m4', in the top
- # `src/config' directory.
-diff -r 62c176864807 configure.in
---- a/configure.in Mon Nov 28 11:32:25 2011 +0000
-+++ b/configure.in Mon Nov 28 21:18:55 2011 +0000
-@@ -44,7 +44,7 @@ AC_CHECK_TOOL([WINDRES], [windres], [win
-
- AC_SUBST([NO_CYGWIN])
- AC_SUBST([HEADER_SUBDIR])
--AC_SUBST([W32API_INCLUDE], ['-I ${top_srcdir}/../w32api/include'])
-+AC_SUBST([W32API_INCLUDE], [MINGW_AC_W32API_SRCDIR])
-
- # The following are used by the GCC profiling hooks...
- #
-diff -r 62c176864807 mingwex/Makefile.in
---- a/mingwex/Makefile.in Mon Nov 28 11:32:25 2011 +0000
-+++ b/mingwex/Makefile.in Mon Nov 28 21:18:55 2011 +0000
-@@ -126,10 +126,9 @@ ifdef NO_CYGWIN
- override CC := ${NO_CYGWIN} $(firstword $(filter-out ${NO_CYGWIN},${CC}))
- endif
-
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I${srcdir} -I${top_srcdir} -I${top_srcdir}/include \
-- -nostdinc \
-- -iwithprefixbefore include
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I ${srcdir} -I ${top_srcdir} -I ${top_srcdir}/include \
-+ -nostdinc -isystem @W32API_INCLUDE@ -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE)
- ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
-
-diff -r 62c176864807 profile/Makefile.in
---- a/profile/Makefile.in Mon Nov 28 11:32:25 2011 +0000
-+++ b/profile/Makefile.in Mon Nov 28 21:18:55 2011 +0000
-@@ -65,10 +65,9 @@ THREAD_DLL = @THREAD_DLL@
- THREAD_DLL_VERSION = 10
- THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
-
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I${srcdir} -I${top_srcdir}/include \
-- -nostdinc \
-- -iwithprefixbefore include
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I ${srcdir} -I ${top_srcdir}/include \
-+ -nostdinc -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
- ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
-
diff --git a/dev-util/mingw-runtime/metadata.xml b/dev-util/mingw-runtime/metadata.xml
deleted file mode 100644
index 6c377f90be9..00000000000
--- a/dev-util/mingw-runtime/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>toolchain@gentoo.org</email>
- <name>Gentoo Toolchain Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">mingw</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
deleted file mode 100644
index 74ba9950cae..00000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit flag-o-matic eutils
-
-MY_P="mingwrt-${PV}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
- use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-gcc-4.6.patch #419627
- sed -i \
- -e "/W32API_INCLUDE/s:=.*:='-I /usr/${CTARGET}/usr/include':" \
- $(find -name configure) || die
- sed -i \
- -e '/^install_dlls_host:/s:$: install-dirs:' \
- Makefile.in || die # fix parallel install
-}
-
-src_compile() {
- just_headers && return 0
-
- CHOST=${CTARGET} strip-unsupported-flags
- econf --host=${CTARGET} || die
- emake || die
-}
-
-src_install() {
- if just_headers ; then
- insinto /usr/${CTARGET}/usr/include
- doins -r include/* || die
- else
- local insdir
- is_crosscompile \
- && insdir="${D}/usr/${CTARGET}" \
- || insdir="${D}"
- emake install DESTDIR="${insdir}" || die
- rm -rf "${insdir}"/usr/doc
- dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
- fi
- is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
deleted file mode 100644
index f1842bc4116..00000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit flag-o-matic autotools versionator eutils
-
-MY_P="mingwrt-$(version_format_string '$1.$2-$3')-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
- use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.20-LDBL_MIN_EXP.patch #395893
- eautoconf
- sed -i \
- -e '/^install_dlls_host:/s:$: install-dirs:' \
- Makefile.in || die # fix parallel install
-}
-
-src_configure() {
- just_headers && return 0
-
- CHOST=${CTARGET} strip-unsupported-flags
- econf \
- --host=${CTARGET} \
- --with-w32api-srcdir="/usr/${CTARGET}/usr"
-}
-
-src_install() {
- if just_headers ; then
- insinto /usr/${CTARGET}/usr/include
- doins -r include/* || die
- else
- local insdir
- is_crosscompile \
- && insdir="${D}/usr/${CTARGET}" \
- || insdir="${D}"
- emake install DESTDIR="${insdir}" || die
- rm -rf "${insdir}"/usr/doc
- docinto ${CTARGET} # Avoid collisions with other cross-compilers.
- dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
- fi
- is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
deleted file mode 100644
index ed32fcb768c..00000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit flag-o-matic autotools eutils
-
-MY_P="mingwrt-${PV}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
- use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.20-LDBL_MIN_EXP.patch #395893
- eautoconf
- sed -i \
- -e '/^install_dlls_host:/s:$: install-dirs:' \
- Makefile.in || die # fix parallel install
-}
-
-src_configure() {
- just_headers && return 0
-
- CHOST=${CTARGET} strip-unsupported-flags
- econf \
- --host=${CTARGET} \
- --with-w32api-srcdir="/usr/${CTARGET}/usr"
-}
-
-src_install() {
- if just_headers ; then
- insinto /usr/${CTARGET}/usr/include
- doins -r include/* || die
- else
- local insdir
- is_crosscompile \
- && insdir="${D}/usr/${CTARGET}" \
- || insdir="${D}"
- emake install DESTDIR="${insdir}" || die
- rm -rf "${insdir}"/usr/doc
- docinto ${CTARGET} # Avoid collisions with other cross-compilers.
- dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
- fi
- is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
deleted file mode 100644
index 82167469e43..00000000000
--- a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_P="mingwrt-$(version_format_string '$1.$2.$3-$4')-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-# Collides with w32api-4.x
-#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}-src
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
- use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration"
- fi
-}
-
-src_prepare() {
- sed -i \
- -e '/^install_dlls_host:/s:$: install-dirs:' \
- Makefile.in || die # fix parallel install
-}
-
-src_configure() {
- just_headers && return 0
-
- CHOST=${CTARGET} strip-unsupported-flags
- filter-flags -frecord-gcc-switches
- tc-export AR
- econf \
- --host=${CTARGET} \
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- if just_headers ; then
- insinto /usr/${CTARGET}/usr/include
- doins -r include/*
- else
- local insdir
- is_crosscompile \
- && insdir="${D}/usr/${CTARGET}" \
- || insdir="${D}"
- emake -j1 install DESTDIR="${insdir}"
- rm -rf "${insdir}"/usr/doc
- docinto ${CTARGET} # Avoid collisions with other cross-compilers.
- fi
- is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/w32api/Manifest b/dev-util/w32api/Manifest
deleted file mode 100644
index baaac147625..00000000000
--- a/dev-util/w32api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST w32api-3.17-2-mingw32-src.tar.lzma 965844 BLAKE2B 9dec25676f57dd7886f83871fee2186e3f9750eba620492aa43e7eeb58e402506c7d30bbd71c26c59c0d2c97b2aff25ffade00df8a3cc7b8835b803da8172045 SHA512 4fc8f319ab895366fb3757713e2724f8f4c90593687f1ccfdbfa6a52881ddc430167326e782117ae937c7e456e029132b971c3a041889bcfb876a84741475a1f
-DIST w32api-4.0.3-1-mingw32-src.tar.lzma 1341804 BLAKE2B cd7811b1291775926b15128b5c5f126ab09b9f7e824d7cf24210473c09563cfc06b3aaea40459502869e4df45d2b5af311b8d14b2bdaf793be483a5c80571fe7 SHA512 9295b7e803b1551dfefbf527e98fa315d60c70f6b63b4565942f7bc3d6032483d5ec4f76265b376fc6776c5ecfd1ad47fd912764c390b0b6917b1ad382250977
diff --git a/dev-util/w32api/metadata.xml b/dev-util/w32api/metadata.xml
deleted file mode 100644
index 6c377f90be9..00000000000
--- a/dev-util/w32api/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>toolchain@gentoo.org</email>
- <name>Gentoo Toolchain Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">mingw</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
deleted file mode 100644
index 61232887fb7..00000000000
--- a/dev-util/w32api/w32api-3.17.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit eutils flag-o-matic
-
-MY_P="${P:0:${#P}-2}-${PV:0-1}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-just_headers() {
- use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration; do not emerge this directly"
- fi
-}
-
-src_compile() {
- just_headers && return 0
-
- CHOST=${CTARGET} strip-unsupported-flags
- econf \
- --host=${CTARGET} \
- --prefix=/usr/${CTARGET}/usr
- emake || die
-}
-
-src_install() {
- if just_headers ; then
- insinto /usr/${CTARGET}/usr/include
- doins -r include/* || die
- else
- emake install DESTDIR="${D}" || die
- dodoc CONTRIBUTIONS ChangeLog README.w32api TODO
-
- # Make sure diff cross-compilers don't collide #414075
- mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
- fi
-}
diff --git a/dev-util/w32api/w32api-4.0.3.1.ebuild b/dev-util/w32api/w32api-4.0.3.1.ebuild
deleted file mode 100644
index b3d1c3c93af..00000000000
--- a/dev-util/w32api/w32api-4.0.3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P="${P:0:${#P}-2}-${PV:0-1}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-# Collides with mingw-runtime-4.x
-#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P/-m/.m}-src
-
-just_headers() {
- use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration; do not emerge this directly"
- fi
-}
-
-src_configure() {
- just_headers && return 0
-
- CHOST=${CTARGET} strip-unsupported-flags
- filter-flags -frecord-gcc-switches
- tc-export AR
- econf \
- --host=${CTARGET} \
- --prefix=/usr/${CTARGET}/usr \
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_install() {
- if just_headers ; then
- insinto /usr/${CTARGET}/usr/include
- doins -r include/*
- else
- emake -j1 install DESTDIR="${D}"
-
- # Make sure diff cross-compilers don't collide #414075
- mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
- fi
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 54ec991cb70..ca793e94270 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -928,9 +928,7 @@ www-plugins/chrome-binary-plugins:unstable
# These packages are not supposed to be merged directly, instead
# please use sys-devel/crossdev to install them.
dev-libs/cygwin
-dev-util/mingw-runtime
dev-util/mingw64-runtime
-dev-util/w32api
sys-libs/newlib
dev-embedded/avr-libc
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-10-20 8:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-20 8:41 [gentoo-commits] repo/gentoo:master commit in: dev-util/mingw-runtime/, dev-util/mingw-runtime/files/, dev-util/w32api/, Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox