[gentoo-dev] [PATCH 2/2] toolchain-glibc.eclass: remove git logic
The git logic is handled in the live ebuild directly, and the only use
of this eclass is in non-live ebuilds. In fact, the two newest non-live
ebuilds do not make use of this eclass at all, and as far as I can see
nowhere in the history of this file does it inherit git-2 at all.
---
eclass/toolchain-glibc.eclass | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index d75ca2eefdf..5f0e0cfd5cd 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -667,16 +667,7 @@ toolchain-glibc_do_src_unpack() {
# Check NPTL support _before_ we unpack things to save some time
want_nptl && check_nptl_support
- if [[ -n ${EGIT_REPO_URIS} ]] ; then
- local i d
- for ((i=0; i<${#EGIT_REPO_URIS[@]}; ++i)) ; do
- EGIT_REPO_URI=${EGIT_REPO_URIS[$i]}
- EGIT_SOURCEDIR=${EGIT_SOURCEDIRS[$i]}
- git-2_src_unpack
- done
- else
- unpack_pkg
- fi
+ unpack_pkg
cd "${S}"
touch locale/C-translit.h #185476 #218003
--
2.17.1
[gentoo-dev] [PATCH 1/2] toolchain-binutils.eclass: drop git-2
git-2.eclass is deprecated and the git logic is handled in the live
ebuild itself.
---
eclass/toolchain-binutils.eclass | 16 +---
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 0e532a8f201..a504a0f9a4e 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -15,7 +15,6 @@ if [[ -n ${BINUTILS_TYPE} ]] ; then
BTYPE=${BINUTILS_TYPE}
else
case ${PV} in
- ) BTYPE="git";;
_pre*) BTYPE="snap";;
*.*.90)BTYPE="snap";;
*.*.*.*.*) BTYPE="hjlu";;
@@ -24,11 +23,6 @@ else
fi
case ${BTYPE} in
-git)
- BVER="git"
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- ;;
snap)
BVER=${PV/_pre}
;;
@@ -58,7 +52,6 @@ DESCRIPTION="Tools necessary to build programs"
HOMEPAGE="https://sourceware.org/binutils/;
case ${BTYPE} in
- git) SRC_URI="" ;;
snap)
SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2
ftp://sourceware.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2; ;;
@@ -113,10 +106,6 @@ if is_cross ; then
fi
S=${WORKDIR}/binutils
-case ${BVER} in
-git) ;;
-*) S=${S}-${BVER} ;;
-esac
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
INCPATH=${LIBPATH}/include
@@ -129,10 +118,7 @@ else
fi
tc-binutils_unpack() {
- case ${BTYPE} in
- git) git-2_src_unpack ;;
- *) unpacker ${A} ;;
- esac
+ unpacker ${A}
mkdir -p "${MY_BUILDDIR}"
[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
}
--
2.17.1
[gentoo-dev] [PATCH 0/2] drop git logic from toolchain eclasses
In the live ebuilds using this eclass, the git logic is handled in the ebuild itself and not the eclass. Drop the git logic as it uses git-2 which has been deprecated for quite some time. Marty E. Plummer (2): toolchain-binutils.eclass: drop git-2 toolchain-glibc.eclass: remove git logic eclass/toolchain-binutils.eclass | 16 +--- eclass/toolchain-glibc.eclass| 11 +-- 2 files changed, 2 insertions(+), 25 deletions(-) -- 2.17.1
[gentoo-dev] [PATCH] enlightenment.eclass: git-2->git-r3 migration
Package-Manager: Portage-2.3.40, Repoman-2.3.9
---
Just a small patch to migrate from git-2->git-r3 for this eclass. I've
tested each live ebuild which uses this eclass, though I'd like to have
toralf tinderbox it a bit because there are quite a few more which
should be tested.
media-libs/elementary- simply cannot build due to
/usr/bin/eolian_gen being called improperly; I think this may be due to
the installed dev-libs/efl being too old or something.
See also: https://github.com/gentoo/gentoo/pull/8700
eclass/enlightenment.eclass | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
index a96ca4c266a..1682e0b6bae 100644
--- a/eclass/enlightenment.eclass
+++ b/eclass/enlightenment.eclass
@@ -52,11 +52,9 @@ if [[ ${PV} == ** ]] ; then
if [[ ${EGIT_URI_APPEND} ]] ; then
E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}
EGIT_URI_APPEND=${EGIT_URI_APPEND:-${PN}}
-
EGIT_PROJECT="enlightenment/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}"
EGIT_REPO_URI=${EGIT_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git
- E_S_APPEND=${EGIT_URI_APPEND}
E_LIVE_SOURCE="git"
- inherit git-2
+ inherit git-r3
fi
E_STATE="live"
WANT_AUTOTOOLS="yes"
@@ -107,16 +105,10 @@ DEPEND="doc? ( app-doc/doxygen )
${E_CYTHON:+>=dev-python/cython-0.12.1}"
RDEPEND="nls? ( sys-devel/gettext )"
-case ${EURI_STATE:-${E_STATE}} in
- release) S=${WORKDIR}/${P};;
- snap)S=${WORKDIR}/${P};;
- live)S=${WORKDIR}/${E_S_APPEND};;
-esac
-
enlightenment_src_unpack() {
if [[ ${E_STATE} == "live" ]] ; then
case ${E_LIVE_SOURCE} in
- git) git-2_src_unpack;;
+ git) git-r3_src_unpack;;
*) die "eek!";;
esac
else
--
2.17.1
Re: [gentoo-dev] glibc-2.26 just went stable (on amd64)
> On Jun 2, 2018, at 3:47 PM, Andreas K. Huettel wrote: > > As a heads-up, glibc-2.26 just went stable on amd64. > > If you still have open bugs, they now mutate from "doesn't build with > glibc-2.26" to "doesn't build, treecleaning candidate". Not necessarily. If it builds on Gentoo FreeBSD, we could just mask it in Gentoo Linux. I imagine such cases are rare though. > > Cheers, > Andreas > > -- > Andreas K. Hüttel > dilfri...@gentoo.org > Gentoo Linux developer > (council, toolchain, perl, libreoffice, comrel)
[gentoo-dev] glibc-2.26 just went stable (on amd64)
As a heads-up, glibc-2.26 just went stable on amd64. If you still have open bugs, they now mutate from "doesn't build with glibc-2.26" to "doesn't build, treecleaning candidate". Cheers, Andreas -- Andreas K. Hüttel dilfri...@gentoo.org Gentoo Linux developer (council, toolchain, perl, libreoffice, comrel) signature.asc Description: This is a digitally signed message part.
Re: [gentoo-dev] Monthly x11@ project status for June 2018
> On Jun 1, 2018, at 2:58 PM, Matt Turner wrote: > > x11@ is currently assigned or cc'd on 176 bugs. This number is down from > 222 on April 1st and more than 412 in February 2015 (I reported this on > #gentoo-desktop after closing out a bunch of bugs that day). Awesome! > > > == Fix x11-base/xorg-server suid/systemd situation == > https://bugs.gentoo.org/635102 > > Looks like these bugs are sorted out. There are a few issues in > conjunction with Mesa 18.x, so I'm going to hold off on unmasking > xorg-server-1.20 until those are sorted. I think fixes are at least in > progress for all of those, so I expect we're in good shape and will have > unmasked 1.20 by next month. > > == Convert media-libs/mesa ebuild to build with Meson == > https://bugs.gentoo.org/652762 > > Lots of progress. floppym made the necessary changes to meson.eclass to > let Mesa's build system use a different *-llvm-config per-ABI by always > using a cross file. That lets multilib builds work. > > There are a couple of (hopefully minor) configuration options missing > from Mesa's meson.build, so I'm targeting next month for the transition > of mesa-.ebuild to Meson. I plan to ship Mesa 18.2 build with Meson. > > == Update packages to depend on x11-base/xorg-proto == > https://bugs.gentoo.org/656250 > > Arfrever continued transitioning whole categories at a time! Big thanks > to him! > > Apr 1May 7 Jun 1 > Packages depending on x11-proto/*: 530 -> 432 -> 35 [1] > ebuilds depending on x11-proto/*: 1908 -> 1503 -> 59 [2] > > Just some games-*/* and kde-frameworks/* packages remain to be updated. > > == media-libs/vulkan-* split packages == > Nick (sarnex) had lots of fun this month splitting packages out of > media-libs/vulkan-loader: > >media-libs/vulkan-layers >media-libs/vulkan-toolsmedia-libs/vulkan-headers > > Upstream continues to churn things and doesn't seem to have a good grasp > of how Linux distributions operate. Nick's done a good job keeping on > top of upstream changes. > > == Tree cleaning == > Removed: >x11-proto/printproto >x11-libs/libXp >x11-libs/xpyb > Given Last Rites: >x11-libs/libXfont >app-i18n/fbiterm (reverse dependency of libXfont) > > == Add and require glvnd == > https://bugs.gentoo.org/606924 > https://github.com/NVIDIA/libglvnd > > Package added under package.mask: > ># New package. Needs to interact with media-libs/mesa and ># x11-drivers/nvidia-drivers. Work in progress. >media-libs/libglvnd > > nvidia-drivers-375 and newer support glvnd, so I'll have to figure out > how to make things work. I guess we'll have to keep eselect-opengl for > older nvidia-drivers, which means updating it to support glvnd (instead > of removing it) > > == Drop app-eselect/eselect-mesa == > https://bugs.gentoo.org/576334 > > Removed from mesa-.ebuild and mesa-18.1.0-r1.ebuild. Once older > versions are gone from the tree we can give eselect-mesa last rites. > > Without eselect-mesa, the Gallium i915 and swrast drivers are installed > if USE=gallium; otherwise the classic versions are installed. I suspect > this is good enough. > > == Fix/Remove OpenCL == > https://bugs.gentoo.org/546320 > https://bugs.gentoo.org/647330 > > No progress. > > == Clean out x11 overlay == > https://gitweb.gentoo.org/proj/x11.git/ > > No progress. > > [1] git grep x11-proto | cut -d '/' -f -2 | grep -vE > 'xorg-proto|metadata|profiles' | sort -u | wc -l > [2] git grep x11-proto | grep -vE 'xorg-proto|metadata|profiles' | wc -l
