Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6
On Fri, 29 Jul 2016 22:36:01 +0300
Andrew Savchenko wrote:
> diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
> index c45c725..489e448 100644
> --- a/eclass/subversion.eclass
> +++ b/eclass/subversion.eclass
> @@ -21,10 +21,17 @@ case "${EAPI:-0}" in
> EXPORT_FUNCTIONS src_unpack pkg_preinst
> DEPEND="dev-vcs/subversion"
> ;;
> - *)
> + 2|3|4|5)
> EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
> DEPEND="|| ( dev-vcs/subversion[http]
> dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )"
> ;;
> + 6)
> + EXPORT_FUNCTIONS src_unpack pkg_preinst
> + DEPEND="|| ( dev-vcs/subversion[http]
> dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )"
> + ;;
> + *)
> + die "EAPI ${EAPI} is not supported in subversion.eclass"
> + ;;
> esac
>
> DEPEND+=" net-misc/rsync"
> @@ -116,7 +123,8 @@ ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
>
> # @ECLASS-VARIABLE: ESVN_BOOTSTRAP
> # @DESCRIPTION:
> -# bootstrap script or command like autogen.sh or etc..
> +# Bootstrap script or command like autogen.sh or etc..
> +# Removed in EAPI 6 and later.
> ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
>
> # @ECLASS-VARIABLE: ESVN_PATCHES
> @@ -127,6 +135,8 @@ ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
> #
> # Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
> # location, the installation dies.
> +#
> +# Removed in EAPI 6 and later, use PATCHES instead.
> ESVN_PATCHES="${ESVN_PATCHES:-}"
It would be a good idea to check if the variables are set and die if
they are, so people don't accidentally use them.
>
> # @ECLASS-VARIABLE: ESVN_RESTRICT
> @@ -355,7 +365,10 @@ subversion_fetch() {
> # @FUNCTION: subversion_bootstrap
> # @DESCRIPTION:
> # Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
> +# Removed in EAPI 6 and later.
> subversion_bootstrap() {
> + has "${EAPI:-0}" 6 && die "${FUNCNAME[1]} is removed from
> subversion.eclass in EAPI 6 and later"
> +
Reverse the logic. This will require updating in every EAPI while it is
rather unlikely the next EAPIs will return to previous behavior.
> if has "export" ${ESVN_RESTRICT}; then
> return
> fi
> @@ -432,7 +445,9 @@ subversion_src_unpack() {
> # @FUNCTION: subversion_src_prepare
> # @DESCRIPTION:
> # Default src_prepare. Bootstrap.
> +# Removed in EAPI 6 and later.
> subversion_src_prepare() {
> + has "${EAPI:-0}" 6 && die "${FUNCNAME[1]} is removed from
> subversion.eclass in EAPI 6 and later"
> subversion_bootstrap || die "${ESVN}: unknown problem occurred in
> subversion_bootstrap."
> }
>
--
Best regards,
Michał Górny
[gentoo-dev] Re: Package up for grab
Johannes Huber posted on Fri, 29 Jul 2016 08:51:46 +0200 as excerpted: > x11-misc/kdocker - Does not use technology stack by kde, pure Qt/x11 > app. Moved from launchpad to github > (https://github.com/user-none/KDocke). Needs EAPI + version bump. > > Cheers Corrected link: https://github.com/user-none/KDocker -- Duncan - List replies preferred. No HTML msgs. "Every nonfree program has a lord, a master -- and if you use the program, he is your master." Richard Stallman
Re: [gentoo-dev] [PATCH] vim-plugin.eclass: fix eclass documentation tags
В Sat, 30 Jul 2016 01:32:16 +0300 Andrew Savchenko пишет: > Hello, > > vim-plugin.eclass is the only eclass in the tree now which fails > eclass manpage generation: emerge app-portage/eclass-manpages: > > vim-plugin.eclass: >error:13: vim-plugin.eclass: no @BLURB found > FAIL: /usr/portage/eclass/vim-plugin.eclass > > While proposed patch does not create full documentation for > vim-plugin.eclass, it fixes the problem above by adding @BLURB > description and adds proper tags for functions, where descriptive > comments already exist. > +# @FUNCTION: display_vim_afterscripts > +# @DESCRIPTION: > +# update_vim_afterscripts: create scripts in Copy-paste error: function name is "display_vim_plugin_help", 3rd string is not needed. -- Alexander Tsoy pgpopx4YytTDO.pgp Description: Цифровая подпись OpenPGP
[gentoo-dev] [PATCH] vim-plugin.eclass: fix eclass documentation tags
Hello,
vim-plugin.eclass is the only eclass in the tree now which fails
eclass manpage generation: emerge app-portage/eclass-manpages:
vim-plugin.eclass:
error:13: vim-plugin.eclass: no @BLURB found
FAIL: /usr/portage/eclass/vim-plugin.eclass
While proposed patch does not create full documentation for
vim-plugin.eclass, it fixes the problem above by adding @BLURB
description and adds proper tags for functions, where descriptive
comments already exist.
Best regards,
Andrew Savchenko
diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index e6aa02a..52c094d 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -5,6 +5,7 @@
# @ECLASS: vim-plugin.eclass
# @MAINTAINER:
# v...@gentoo.org
+# @BLURB: Helpers for app-vim plugins installation
# @DESCRIPTION:
# This eclass simplifies installation of app-vim plugins into
# /usr/share/vim/vimfiles. This is a version-independent directory
@@ -82,6 +83,8 @@ vim-plugin_pkg_postrm() {
find "${EPREFIX}/usr/share/vim/vimfiles" -depth -type d -exec rmdir {} \; 2>/dev/null
}
+# @FUNCTION: update_vim_afterscripts
+# @DESCRIPTION:
# update_vim_afterscripts: create scripts in
# /usr/share/vim/vimfiles/after/* comprised of the snippets in
# /usr/share/vim/vimfiles/after/*/*.d
@@ -115,6 +118,9 @@ update_vim_afterscripts() {
done
}
+# @FUNCTION: display_vim_afterscripts
+# @DESCRIPTION:
+# update_vim_afterscripts: create scripts in
# Display a message with the plugin's help file if one is available. Uses the
# VIM_PLUGIN_HELPFILES env var. If multiple help files are available, they
# should be separated by spaces. If no help files are available, but the env
pgpFTvBHeJdon.pgp
Description: PGP signature
[gentoo-dev] Last rites: kde-apps/kde-wallpapers
# Johannes Huber (29 Jul 2016) # Masked for removal in 30 days. Dead by upstream, superseded by # kde-plasma/plasma-workspace-wallpapers. Last release with # 15.08.3. Exported to kde-sunset overlay. kde-apps/kde-wallpapers signature.asc Description: This is a digitally signed message part.
Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6
On Fri, 29 Jul 2016 17:42:40 +0200 Michał Górny wrote:
> On Fri, 29 Jul 2016 18:31:58 +0300
> Andrew Savchenko wrote:
>
> > diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
> > index c45c725..49040a4 100644
> > --- a/eclass/subversion.eclass
> > +++ b/eclass/subversion.eclass
> > @@ -434,6 +434,7 @@ subversion_src_unpack() {
> > # Default src_prepare. Bootstrap.
> > subversion_src_prepare() {
> > subversion_bootstrap || die "${ESVN}: unknown problem occurred in
> > subversion_bootstrap."
> > + [[ ${EAPI:-0} -ge 6 ]] && eapply_user
>
> EAPI is not always a number, so this is wrong.
Then as QA you should go and fix xorg-2.eclass :)
Due to changes below this code is not needed in the
subversion.eclass.
> Furthermore, since it didn't work in EAPI 6 anyway, please take a look
> into improving this eclass for EAPI 6. In particular:
>
> - add a proper EAPI check preventing it from implicitly being enabled
> in new EAPIs,
Done.
> - disable subversion_bootstrap() along with all the relevant facilities
> in EAPI 6 and later, therefore also stopping exporting src_prepare().
Done, no need for eappy_user in this case.
Please in future explain such requirements to save fellow
developer's time, since subversion_bootstrap doesn't contradict
directly with EAPI 6 (ESVN_PATCHES is not needed with PATCHES
available in EAPI 6, but this is another matter). The real reason
for removal is that nobody uses it in the main tree anymore.
Best regards,
Andrew Savchenko
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index c45c725..489e448 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -21,10 +21,17 @@ case "${EAPI:-0}" in
EXPORT_FUNCTIONS src_unpack pkg_preinst
DEPEND="dev-vcs/subversion"
;;
- *)
+ 2|3|4|5)
EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
DEPEND="|| ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )"
;;
+ 6)
+ EXPORT_FUNCTIONS src_unpack pkg_preinst
+ DEPEND="|| ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )"
+ ;;
+ *)
+ die "EAPI ${EAPI} is not supported in subversion.eclass"
+ ;;
esac
DEPEND+=" net-misc/rsync"
@@ -116,7 +123,8 @@ ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
# @ECLASS-VARIABLE: ESVN_BOOTSTRAP
# @DESCRIPTION:
-# bootstrap script or command like autogen.sh or etc..
+# Bootstrap script or command like autogen.sh or etc..
+# Removed in EAPI 6 and later.
ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
# @ECLASS-VARIABLE: ESVN_PATCHES
@@ -127,6 +135,8 @@ ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
#
# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
# location, the installation dies.
+#
+# Removed in EAPI 6 and later, use PATCHES instead.
ESVN_PATCHES="${ESVN_PATCHES:-}"
# @ECLASS-VARIABLE: ESVN_RESTRICT
@@ -355,7 +365,10 @@ subversion_fetch() {
# @FUNCTION: subversion_bootstrap
# @DESCRIPTION:
# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
+# Removed in EAPI 6 and later.
subversion_bootstrap() {
+ has "${EAPI:-0}" 6 && die "${FUNCNAME[1]} is removed from subversion.eclass in EAPI 6 and later"
+
if has "export" ${ESVN_RESTRICT}; then
return
fi
@@ -432,7 +445,9 @@ subversion_src_unpack() {
# @FUNCTION: subversion_src_prepare
# @DESCRIPTION:
# Default src_prepare. Bootstrap.
+# Removed in EAPI 6 and later.
subversion_src_prepare() {
+ has "${EAPI:-0}" 6 && die "${FUNCNAME[1]} is removed from subversion.eclass in EAPI 6 and later"
subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
}
pgpv3sn60hdZe.pgp
Description: PGP signature
Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6
On Fri, 29 Jul 2016 18:31:58 +0300
Andrew Savchenko wrote:
> diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
> index c45c725..49040a4 100644
> --- a/eclass/subversion.eclass
> +++ b/eclass/subversion.eclass
> @@ -434,6 +434,7 @@ subversion_src_unpack() {
> # Default src_prepare. Bootstrap.
> subversion_src_prepare() {
> subversion_bootstrap || die "${ESVN}: unknown problem occurred in
> subversion_bootstrap."
> + [[ ${EAPI:-0} -ge 6 ]] && eapply_user
EAPI is not always a number, so this is wrong.
Furthermore, since it didn't work in EAPI 6 anyway, please take a look
into improving this eclass for EAPI 6. In particular:
- add a proper EAPI check preventing it from implicitly being enabled
in new EAPIs,
- disable subversion_bootstrap() along with all the relevant facilities
in EAPI 6 and later, therefore also stopping exporting src_prepare().
--
Best regards,
Michał Górny
[gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6
Hello,
subversion eclass can't be used in EAPI 6 ebuilds, since it lacks
eapply_user call in src_prepare(), otherwise it looks fine for
EAPI 6 and works here fine.
This patch adds eapply_user for EAPI 6 and later.
Best regards,
Andrew Savchenko
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index c45c725..49040a4 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -434,6 +434,7 @@ subversion_src_unpack() {
# Default src_prepare. Bootstrap.
subversion_src_prepare() {
subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
+ [[ ${EAPI:-0} -ge 6 ]] && eapply_user
}
# @FUNCTION: subversion_pkg_preinst
pgpWe07cUiSAQ.pgp
Description: PGP signature
