Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--eclass/bash-completion-r1.eclass2
-rw-r--r--eclass/desktop.eclass5
-rw-r--r--eclass/eutils.eclass1
-rw-r--r--eclass/git-r3.eclass34
-rw-r--r--eclass/gnome2-utils.eclass12
-rw-r--r--eclass/python-r1.eclass1
-rw-r--r--eclass/python-utils-r1.eclass3
-rw-r--r--eclass/systemd.eclass8
-rw-r--r--eclass/tmpfiles.eclass2
-rw-r--r--eclass/udev.eclass2
-rw-r--r--sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild27
-rw-r--r--sys-libs/uclibc/uclibc-0.9.33.9999.ebuild26
-rw-r--r--sys-libs/uclibc/uclibc-9999.ebuild26
13 files changed, 73 insertions, 76 deletions
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index eff5e68c437e..0a457676ee56 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -98,6 +98,7 @@ dobashcomp() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_bash-completion-r1_get_bashcompdir)"
doins "${@}"
)
@@ -112,6 +113,7 @@ newbashcomp() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_bash-completion-r1_get_bashcompdir)"
newins "${@}"
)
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index d65b0d0bf074..91521b85a821 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -195,6 +195,7 @@ make_desktop_entry() {
(
# wrap the env here so that the 'insinto' call
# doesn't corrupt the env of the caller
+ insopts -m 0644
insinto /usr/share/applications
doins "${desktop}"
) || die "installing desktop file failed"
@@ -228,6 +229,7 @@ make_session_desktop() {
(
# wrap the env here so that the 'insinto' call
# doesn't corrupt the env of the caller
+ insopts -m 0644
insinto /usr/share/xsessions
doins "${desktop}"
)
@@ -243,6 +245,7 @@ domenu() {
# wrap the env here so that the 'insinto' call
# doesn't corrupt the env of the caller
local i j ret=0
+ insopts -m 0644
insinto /usr/share/applications
for i in "$@" ; do
if [[ -f ${i} ]] ; then
@@ -269,6 +272,7 @@ newmenu() {
(
# wrap the env here so that the 'insinto' call
# doesn't corrupt the env of the caller
+ insopts -m 0644
insinto /usr/share/applications
newins "$@"
)
@@ -282,6 +286,7 @@ _iconins() {
(
# wrap the env here so that the 'insinto' call
# doesn't corrupt the env of the caller
+ insopts -m 0644
local funcname=$1; shift
local size dir
local context=apps
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 7840afbb77b9..81621df78e63 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -172,6 +172,7 @@ make_wrapper() {
if [[ -n ${path} ]] ; then
(
+ exeopts -m 0755
exeinto "${path}"
newexe "${tmpwrapper}" "${wrapper}"
) || die
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 279f03269314..7fe9bcb40fa4 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -10,7 +10,10 @@
# git as remote repository.
case "${EAPI:-0}" in
- 0|1|2|3|4|5|6|7)
+ 0|1|2|3)
+ die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
+ ;;
+ 4|5|6|7)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -23,9 +26,9 @@ if [[ ! ${_GIT_R3} ]]; then
if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
if [[ ${EAPI:-0} != [0123456] ]]; then
- BDEPEND=">=dev-vcs/git-1.8.2.1"
+ BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
else
- DEPEND=">=dev-vcs/git-1.8.2.1"
+ DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
fi
fi
@@ -651,31 +654,6 @@ git-r3_fetch() {
local fetch_command=( git fetch "${r}" )
local clone_type=${EGIT_CLONE_TYPE}
- if [[ ${r} == http://* || ${r} == https://* ]] &&
- [[ ! ${EGIT_CURL_WARNED} ]]
- then
- case ${EAPI:-0} in
- 0|1|2|3|4)
- ROOT=/ has_version 'dev-vcs/git[curl]';;
- 5|6)
- has_version --host-root 'dev-vcs/git[curl]';;
- *)
- has_version -b 'dev-vcs/git[curl]';;
- esac
-
- if [[ ${?} -ne 0 ]]; then
- ewarn "git-r3: fetching from HTTP(S) requested. In order to support HTTP(S),"
- ewarn "dev-vcs/git needs to be built with USE=curl. Example solution:"
- ewarn
- ewarn " echo dev-vcs/git curl >> /etc/portage/package.use"
- ewarn " emerge -1v dev-vcs/git"
- ewarn
- ewarn "HTTP(S) URIs will be skipped."
- fi
-
- EGIT_CURL_WARNED=1
- fi
-
if [[ ${clone_type} == mirror ]]; then
fetch_command+=(
--prune
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 9b4296c11fad..65076ae2d61e 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -207,7 +207,9 @@ gnome2_gconf_uninstall() {
# @FUNCTION: gnome2_icon_savelist
# @DESCRIPTION:
# Find the icons that are about to be installed and save their location
-# in the GNOME2_ECLASS_ICONS environment variable.
+# in the GNOME2_ECLASS_ICONS environment variable. This is only
+# necessary for eclass implementations that call
+# gnome2_icon_cache_update conditionally.
# This function should be called from pkg_preinst.
gnome2_icon_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
@@ -218,8 +220,7 @@ gnome2_icon_savelist() {
# @FUNCTION: gnome2_icon_cache_update
# @DESCRIPTION:
-# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
-# have installed anything under that location.
+# Updates Gtk+ icon cache files under /usr/share/icons.
# This function should be called from pkg_postinst and pkg_postrm.
gnome2_icon_cache_update() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
@@ -358,7 +359,8 @@ gnome2_scrollkeeper_update() {
# @FUNCTION: gnome2_schemas_savelist
# @DESCRIPTION:
# Find if there is any GSettings schema to install and save the list in
-# GNOME2_ECLASS_GLIB_SCHEMAS variable.
+# GNOME2_ECLASS_GLIB_SCHEMAS variable. This is only necessary for eclass
+# implementations that call gnome2_schemas_update conditionally.
# This function should be called from pkg_preinst.
gnome2_schemas_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
@@ -370,7 +372,7 @@ gnome2_schemas_savelist() {
# @FUNCTION: gnome2_schemas_update
# @USAGE: gnome2_schemas_update
# @DESCRIPTION:
-# Updates GSettings schemas if GNOME2_ECLASS_GLIB_SCHEMAS has some.
+# Updates GSettings schemas.
# This function should be called from pkg_postinst and pkg_postrm.
gnome2_schemas_update() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 8a8adb449cc3..097a965272d8 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -810,6 +810,7 @@ python_replicate_script() {
python_export PYTHON_SCRIPTDIR
(
+ exeopts -m 0755
exeinto "${PYTHON_SCRIPTDIR#${EPREFIX}}"
doexe "${files[@]}"
)
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 3a462e34614a..ab4db71422d2 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -789,6 +789,7 @@ python_newexe() {
(
dodir "${wrapd}"
+ exeopts -m 0755
exeinto "${d}"
newexe "${f}" "${newfn}" || return ${?}
)
@@ -920,6 +921,7 @@ python_domodule() {
fi
(
+ insopts -m 0644
insinto "${d}"
doins -r "${@}" || return ${?}
)
@@ -954,6 +956,7 @@ python_doheader() {
d=${PYTHON_INCLUDEDIR#${EPREFIX}}
(
+ insopts -m 0644
insinto "${d}"
doins -r "${@}" || return ${?}
)
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 6dda4353064a..72f4845efc45 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -151,6 +151,7 @@ systemd_dounit() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_systemd_get_systemunitdir)"
doins "${@}"
)
@@ -165,6 +166,7 @@ systemd_newunit() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_systemd_get_systemunitdir)"
newins "${@}"
)
@@ -179,6 +181,7 @@ systemd_douserunit() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_systemd_get_userunitdir)"
doins "${@}"
)
@@ -193,6 +196,7 @@ systemd_newuserunit() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_systemd_get_userunitdir)"
newins "${@}"
)
@@ -222,6 +226,7 @@ systemd_install_serviced() {
[[ ${service} == *.d ]] && die "Service must not have .d suffix"
(
+ insopts -m 0644
insinto /etc/systemd/system/"${service}".d
newins "${src}" 00gentoo.conf
)
@@ -241,6 +246,7 @@ systemd_dotmpfilesd() {
done
(
+ insopts -m 0644
insinto /usr/lib/tmpfiles.d/
doins "${@}"
)
@@ -258,6 +264,7 @@ systemd_newtmpfilesd() {
|| die 'tmpfiles.d files need to have .conf suffix.'
(
+ insopts -m 0644
insinto /usr/lib/tmpfiles.d/
newins "${@}"
)
@@ -320,6 +327,7 @@ systemd_enable_ntpunit() {
done
(
+ insopts -m 0644
insinto "$(_systemd_get_utildir)"/ntp-units.d
doins "${T}"/${ntpunit_name}.list
)
diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index 746225784128..2a6e7ce8866a 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -76,6 +76,7 @@ dotmpfiles() {
done
(
+ insopts -m 0644
insinto /usr/lib/tmpfiles.d
doins "$@"
)
@@ -93,6 +94,7 @@ newtmpfiles() {
fi
(
+ insopts -m 0644
insinto /usr/lib/tmpfiles.d
newins "$@"
)
diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index 5e5df0738805..b7c6461dd8ff 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -82,6 +82,7 @@ udev_dorules() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_udev_get_udevdir)"/rules.d
doins "${@}"
)
@@ -96,6 +97,7 @@ udev_newrules() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_udev_get_udevdir)"/rules.d
newins "${@}"
)
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 4c712c8a69a8..32bb54180854 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,20 +1,10 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
-
inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://git.busybox.net/uClibc"
- EGIT_BRANCH="0.9.33"
- inherit git-r3
-else
- PATCH_VER="17"
- SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
- ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
- KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.busybox.net/uClibc"
+ inherit git-2
fi
export CBUILD=${CBUILD:-${CHOST}}
@@ -25,8 +15,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
fi
+MY_P=uClibc-${PV}
DESCRIPTION="C library for developing embedded Linux systems"
HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+ PATCH_VER="17"
+ SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+ ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+ KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
+fi
LICENSE="LGPL-2"
SLOT="0"
@@ -235,8 +232,8 @@ src_config() {
}
src_unpack() {
- if [[ ${PV} == *9999* ]] ; then
- git-r3_src_unpack
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
else
unpack ${A}
fi
diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index d55f0afff6da..fbc8a60a1fc9 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,20 +1,11 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
-
inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://git.busybox.net/uClibc"
+if [[ ${PV} == *9999 ]] ; then
EGIT_BRANCH="0.9.33"
- inherit git-r3
-else
- PATCH_VER=""
- SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
- ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
- KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+ EGIT_REPO_URI="git://git.busybox.net/uClibc"
+ inherit git-2
fi
export CBUILD=${CBUILD:-${CHOST}}
@@ -25,8 +16,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
fi
+MY_P=uClibc-${PV}
DESCRIPTION="C library for developing embedded Linux systems"
HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != *9999 ]] ; then
+ PATCH_VER=""
+ SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+ ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+ KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+fi
LICENSE="LGPL-2"
SLOT="0"
@@ -233,8 +231,8 @@ src_config() {
}
src_unpack() {
- if [[ ${PV} == *9999* ]] ; then
- git-r3_src_unpack
+ if [[ ${PV} == *9999 ]] ; then
+ git-2_src_unpack
else
unpack ${A}
fi
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index 3e096317babc..f5cec3749e75 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,19 +1,10 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
-
inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://git.busybox.net/uClibc"
- inherit git-r3
-else
- PATCH_VER=""
- SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
- ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
- KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.busybox.net/uClibc"
+ inherit git-2
fi
export CBUILD=${CBUILD:-${CHOST}}
@@ -24,8 +15,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
fi
+MY_P=uClibc-${PV}
DESCRIPTION="C library for developing embedded Linux systems"
HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+ PATCH_VER=""
+ SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+ ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+ KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+fi
LICENSE="LGPL-2"
SLOT="0"
@@ -232,8 +230,8 @@ src_config() {
}
src_unpack() {
- if [[ ${PV} == *9999* ]] ; then
- git-r3_src_unpack
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
else
unpack ${A}
fi