From 848b3c5a02a3e3146dfc8036d1a26e2d0aa4d83e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sun, 13 Sep 2015 23:49:20 +0200 Subject: [PATCH 01/16] =?utf8?q?Usuni=C4=99cie=20x11-misc/colord?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- x11-misc/colord/Manifest | 1 - x11-misc/colord/colord-1.2.11.ebuild | 173 ------------------ .../files/colord-1.2.11-multiple-users.patch | 148 --------------- 3 files changed, 322 deletions(-) delete mode 100644 x11-misc/colord/Manifest delete mode 100644 x11-misc/colord/colord-1.2.11.ebuild delete mode 100644 x11-misc/colord/files/colord-1.2.11-multiple-users.patch diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest deleted file mode 100644 index 2ab5db3..0000000 --- a/x11-misc/colord/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST colord-1.2.11.tar.xz 1205468 SHA256 dac29c83659703a8548db561bc670832f26b30f7a88ed90a6530eb052a10df8f SHA512 fec46d295b1b4caba7c0a666eccbf3ce325fab4bd56e6a841cfdd9b7a381384dff3c71a744dda0e88ed2e99519c278c1ee495e6b8870c74cb4939dbc08d4bb96 WHIRLPOOL 7372d1a52c897e133fa75c8e06c47b3f7035cb01a3ec858f74ddc741613b11554a2d6dac6c886347f4e82baa16091cc41232a5deb3db4ae5a4930be0d1de6f41 diff --git a/x11-misc/colord/colord-1.2.11.ebuild b/x11-misc/colord/colord-1.2.11.ebuild deleted file mode 100644 index 6e6c4f1..0000000 --- a/x11-misc/colord/colord-1.2.11.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.11.ebuild,v 1.1 2015/07/05 08:43:40 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal - -DESCRIPTION="System service to accurately color manage input and output devices" -HOMEPAGE="http://www.freedesktop.org/software/colord/" -SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/2" # subslot = libcolord soname version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -# We prefer policykit enabled by default, bug #448058 -IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala" -REQUIRED_USE=" - gusb? ( udev ) - scanner? ( udev ) - vala? ( introspection ) -" - -COMMON_DEPEND=" - dev-db/sqlite:3= - >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}] - >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] - argyllcms? ( media-gfx/argyllcms ) - gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) - policykit? ( >=sys-auth/polkit-0.103 ) - scanner? ( - media-gfx/sane-backends - sys-apps/dbus ) - systemd? ( >=sys-apps/systemd-44:0= ) - udev? ( - virtual/udev - virtual/libgudev:= - virtual/libudev:=[${MULTILIB_USEDEP}] - ) -" -RDEPEND="${COMMON_DEPEND} - !media-gfx/shared-color-profiles - !<=media-gfx/colorhug-client-0.1.13 -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - >=sys-devel/gettext-0.17 - virtual/pkgconfig[${MULTILIB_USEDEP}] - extra-print-profiles? ( media-gfx/argyllcms ) - vala? ( $(vala_depend) ) -" - -# FIXME: needs pre-installed dbus service files -RESTRICT="test" - -# According to upstream comment in colord.spec.in, building the extra print -# profiles requires >=4G of memory -CHECKREQS_MEMORY="4G" - -pkg_pretend() { - use extra-print-profiles && check-reqs_pkg_pretend -} - -pkg_setup() { - use extra-print-profiles && check-reqs_pkg_setup - enewgroup colord - enewuser colord -1 -1 /var/lib/colord colord -} - -src_prepare() { - # Adapt to Gentoo paths - sed -i -e 's/spotread/argyll-spotread/' \ - src/sensors/cd-sensor-argyll.c \ - configure.ac || die - - epatch "${FILESDIR}"/${P}-multiple-users.patch - - eautoreconf - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - # Reverse tools require gusb - # bash-completion test does not work on gentoo - local myconf=( - --disable-bash-completion - --disable-examples - --disable-static - --enable-libcolordcompat - --with-daemon-user=colord - --localstatedir="${EPREFIX}"/var - $(multilib_native_use_enable argyllcms argyllcms-sensor) - $(multilib_native_use_enable extra-print-profiles print-profiles) - $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") - $(use_enable gusb) - $(multilib_native_use_enable gusb reverse) - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_enable scanner sane) - $(multilib_native_use_enable systemd systemd-login) - $(use_enable udev) - --with-udevrulesdir="$(get_udevdir)"/rules.d - $(multilib_native_use_enable vala) - "$(systemd_with_unitdir)" - ) - - if ! multilib_is_native_abi; then - # disable some extraneous checks - myconf+=( - SQLITE_{CFLAGS,LIBS}=' ' - GUDEV_{CFLAGS,LIBS}=' ' - ) - fi - - ECONF_SOURCE=${S} \ - gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - gnome2_src_compile - else - emake -C lib/colord - use gusb && emake -C lib/colorhug - emake -C lib/compat - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - default - else - emake -C lib/colord check - use gusb && emake -C lib/colorhug check - emake -C lib/compat check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - gnome2_src_install - else - gnome2_src_install -C lib/colord - use gusb && gnome2_src_install -C lib/colorhug - gnome2_src_install -C lib/compat - gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS - fi -} - -multilib_src_install_all() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO" - einstalldocs - - newbashcomp data/colormgr colormgr - - # Ensure config and profile directories exist and /var/lib/colord/* - # is writable by colord user - keepdir /var/lib/color{,d}/icc - fowners colord:colord /var/lib/colord{,/icc} - - if use examples; then - docinto examples - dodoc examples/*.c - fi -} diff --git a/x11-misc/colord/files/colord-1.2.11-multiple-users.patch b/x11-misc/colord/files/colord-1.2.11-multiple-users.patch deleted file mode 100644 index e8e755b..0000000 --- a/x11-misc/colord/files/colord-1.2.11-multiple-users.patch +++ /dev/null @@ -1,148 +0,0 @@ -From eeac836f256fe07004d67e13c3c89532982af9bd Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 20 Jul 2015 10:57:28 +0100 -Subject: [PATCH] Allow creating devices with the same device ID from different - users - ---- - src/cd-device-array.c | 13 ++++++++----- - src/cd-device-array.h | 9 ++++++++- - src/cd-main.c | 15 ++++++++++----- - src/cd-self-test.c | 7 +++++-- - 4 files changed, 31 insertions(+), 13 deletions(-) - -diff --git a/src/cd-device-array.c b/src/cd-device-array.c -index 88d4b2c..41a9597 100644 ---- a/src/cd-device-array.c -+++ b/src/cd-device-array.c -@@ -76,7 +76,8 @@ cd_device_array_remove (CdDeviceArray *device_array, CdDevice *device) - CdDevice * - cd_device_array_get_by_id_owner (CdDeviceArray *device_array, - const gchar *id, -- guint owner) -+ guint owner, -+ CdDeviceArrayFlags flags) - { - CdDeviceArrayPrivate *priv = device_array->priv; - CdDevice *device_tmp; -@@ -90,10 +91,12 @@ cd_device_array_get_by_id_owner (CdDeviceArray *device_array, - if (g_strcmp0 (cd_device_get_id (device_tmp), id) == 0) - return g_object_ref (device_tmp); - } -- for (i = 0; i < priv->array->len; i++) { -- device_tmp = g_ptr_array_index (priv->array, i); -- if (g_strcmp0 (cd_device_get_id (device_tmp), id) == 0) -- return g_object_ref (device_tmp); -+ if (flags & CD_DEVICE_ARRAY_FLAG_OWNER_OPTIONAL) { -+ for (i = 0; i < priv->array->len; i++) { -+ device_tmp = g_ptr_array_index (priv->array, i); -+ if (g_strcmp0 (cd_device_get_id (device_tmp), id) == 0) -+ return g_object_ref (device_tmp); -+ } - } - return NULL; - } -diff --git a/src/cd-device-array.h b/src/cd-device-array.h -index b625dbf..31dc067 100644 ---- a/src/cd-device-array.h -+++ b/src/cd-device-array.h -@@ -50,6 +50,12 @@ struct _CdDeviceArrayClass - GObjectClass parent_class; - }; - -+typedef enum { -+ CD_DEVICE_ARRAY_FLAG_NONE = 0, -+ CD_DEVICE_ARRAY_FLAG_OWNER_OPTIONAL = 1, -+ CD_DEVICE_ARRAY_FLAG_LAST, -+} CdDeviceArrayFlags; -+ - GType cd_device_array_get_type (void); - CdDeviceArray *cd_device_array_new (void); - -@@ -59,7 +65,8 @@ void cd_device_array_remove (CdDeviceArray *device_array, - CdDevice *device); - CdDevice *cd_device_array_get_by_id_owner (CdDeviceArray *device_array, - const gchar *id, -- guint owner); -+ guint owner, -+ CdDeviceArrayFlags flags); - CdDevice *cd_device_array_get_by_object_path (CdDeviceArray *device_array, - const gchar *object_path); - CdDevice *cd_device_array_get_by_property (CdDeviceArray *device_array, -diff --git a/src/cd-main.c b/src/cd-main.c -index b5b3a4f..37817e3 100644 ---- a/src/cd-main.c -+++ b/src/cd-main.c -@@ -720,7 +720,8 @@ cd_main_profile_auto_add_from_db (CdMainPrivate *priv, - device_id_tmp = g_ptr_array_index (array, i); - device_tmp = cd_device_array_get_by_id_owner (priv->devices_array, - device_id_tmp, -- cd_profile_get_owner (profile)); -+ cd_profile_get_owner (profile), -+ CD_DEVICE_ARRAY_FLAG_OWNER_OPTIONAL); - if (device_tmp == NULL) - continue; - -@@ -747,7 +748,8 @@ cd_main_profile_auto_add_from_md (CdMainPrivate *priv, - return; - device = cd_device_array_get_by_id_owner (priv->devices_array, - device_id, -- cd_profile_get_owner (profile)); -+ cd_profile_get_owner (profile), -+ CD_DEVICE_ARRAY_FLAG_OWNER_OPTIONAL); - if (device == NULL) - return; - cd_main_auto_add_from_md (priv, device, profile); -@@ -1022,7 +1024,8 @@ cd_main_daemon_method_call (GDBusConnection *connection, const gchar *sender, - sender, device_id); - device = cd_device_array_get_by_id_owner (priv->devices_array, - device_id, -- uid); -+ uid, -+ CD_DEVICE_ARRAY_FLAG_OWNER_OPTIONAL); - if (device == NULL) { - g_dbus_method_invocation_return_error (invocation, - CD_CLIENT_ERROR, -@@ -1279,7 +1282,8 @@ cd_main_daemon_method_call (GDBusConnection *connection, const gchar *sender, - } - device = cd_device_array_get_by_id_owner (priv->devices_array, - device_id, -- uid); -+ uid, -+ CD_DEVICE_ARRAY_FLAG_NONE); - if (device != NULL) { - /* where we try to manually add an existing - * virtual device, which means promoting it to -@@ -1399,7 +1403,8 @@ cd_main_daemon_method_call (GDBusConnection *connection, const gchar *sender, - sender, device_id); - device = cd_device_array_get_by_id_owner (priv->devices_array, - device_id, -- uid); -+ uid, -+ CD_DEVICE_ARRAY_FLAG_OWNER_OPTIONAL); - if (device == NULL) { - /* fall back to checking the object path */ - device = cd_device_array_get_by_object_path (priv->devices_array, -diff --git a/src/cd-self-test.c b/src/cd-self-test.c -index 4a76d07..6536d3c 100644 ---- a/src/cd-self-test.c -+++ b/src/cd-self-test.c -@@ -178,10 +178,13 @@ colord_device_array_func (void) - cd_device_array_add (device_array, device); - g_object_unref (device); - -- device = cd_device_array_get_by_id_owner (device_array, "does not exist", 0); -+ device = cd_device_array_get_by_id_owner (device_array, "does not exist", 0, CD_DEVICE_ARRAY_FLAG_OWNER_OPTIONAL); - g_assert (device == NULL); - -- device = cd_device_array_get_by_id_owner (device_array, "dave", 0); -+ device = cd_device_array_get_by_id_owner (device_array, "dave", 999, CD_DEVICE_ARRAY_FLAG_NONE); -+ g_assert (device == NULL); -+ -+ device = cd_device_array_get_by_id_owner (device_array, "dave", 0, CD_DEVICE_ARRAY_FLAG_OWNER_OPTIONAL); - g_assert (device != NULL); - g_assert_cmpstr (cd_device_get_id (device), ==, "dave"); - g_object_unref (device); --- -2.4.3 - -- 2.45.2 From ac97d4eed2c04ac550bff3fca4f6567caea22741 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Thu, 8 Oct 2015 00:56:08 +0200 Subject: [PATCH 02/16] Aktualizacja app-portage/eix --- app-portage/eix/eix-9999.ebuild | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app-portage/eix/eix-9999.ebuild b/app-portage/eix/eix-9999.ebuild index dfce60a..34ea757 100644 --- a/app-portage/eix/eix-9999.ebuild +++ b/app-portage/eix/eix-9999.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 EGIT_REPO_URI="https://github.com/vaeth/eix.git" -WANT_AUTOMAKE="1.13" WANT_LIBTOOL="none" PLOCALES="de ru" -inherit autotools git-r3 bash-completion-r1 eutils multilib l10n +inherit autotools git-r3 bash-completion-r1 eutils l10n DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more" -HOMEPAGE="http://eix.berlios.de" +HOMEPAGE="https://github.com/vaeth/eix/" LICENSE="GPL-2" SLOT="0" @@ -28,6 +27,7 @@ DEPEND="${BOTHDEPEND} >=sys-devel/gettext-0.18.3" src_prepare() { + sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf epatch_user eautoreconf } @@ -42,7 +42,6 @@ src_configure() { $(use_with prefix always-accept-keywords) \ $(use_with dep dep-default) \ --with-zsh-completion \ - --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \ --with-portage-rootpath="${ROOTPATH}" \ --with-eprefix-default="${EPREFIX}" \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ @@ -52,15 +51,19 @@ src_configure() { src_install() { default dobashcomp bash/eix - keepdir "/var/cache/${PN}" - fowners portage:portage "/var/cache/${PN}" - fperms 775 "/var/cache/${PN}" + insinto "/usr/lib/tmpfiles.d" + doins tmpfiles.d/eix.conf } pkg_postinst() { - # fowners in src_install doesn't work for owner/group portage: - # merging changes this owner/group back to root. - use prefix || chown portage:portage "${EROOT}var/cache/${PN}" + test -d "${EROOT}var/cache/${PN}" || { + mkdir "${EROOT}var/cache/${PN}" + use prefix || chown portage:portage "${EROOT}var/cache/${PN}" + } local obs="${EROOT}var/cache/eix.previous" ! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it" } + +pkg_postrm() { + [ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}" +} -- 2.45.2 From 8e35bf1dd856f76d15d8373541e7b3fbd32a3eb9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Thu, 8 Oct 2015 01:26:05 +0200 Subject: [PATCH 03/16] autotools: wersja z AM_GNU_GETTEXT_REQUIRE_VERSION --- eclass/autotools.eclass | 614 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 614 insertions(+) create mode 100644 eclass/autotools.eclass diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass new file mode 100644 index 0000000..3039a46 --- /dev/null +++ b/eclass/autotools.eclass @@ -0,0 +1,614 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# @ECLASS: autotools.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: Regenerates auto* build scripts +# @DESCRIPTION: +# This eclass is for safely handling autotooled software packages that need to +# regenerate their build scripts. All functions will abort in case of errors. + +# Note: We require GNU m4, as does autoconf. So feel free to use any features +# from the GNU version of m4 without worrying about other variants (i.e. BSD). + +if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then + # See if we were included already, but someone changed the value + # of AUTOTOOLS_AUTO_DEPEND on us. We could reload the entire + # eclass at that point, but that adds overhead, and it's trivial + # to re-order inherit in eclasses/ebuilds instead. #409611 + if [[ ${__AUTOTOOLS_AUTO_DEPEND} != ${AUTOTOOLS_AUTO_DEPEND} ]] ; then + die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit autotools.eclass first! ${__AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" + fi +fi + +if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then +_AUTOTOOLS_ECLASS=1 + +inherit libtool + +# @ECLASS-VARIABLE: WANT_AUTOCONF +# @DESCRIPTION: +# The major version of autoconf your package needs +: ${WANT_AUTOCONF:=latest} + +# @ECLASS-VARIABLE: WANT_AUTOMAKE +# @DESCRIPTION: +# The major version of automake your package needs +: ${WANT_AUTOMAKE:=latest} + +# @ECLASS-VARIABLE: WANT_LIBTOOL +# @DESCRIPTION: +# Do you want libtool? Valid values here are "latest" and "none". +: ${WANT_LIBTOOL:=latest} + +# @ECLASS-VARIABLE: _LATEST_AUTOMAKE +# @INTERNAL +# @DESCRIPTION: +# CONSTANT! +# The latest major version/slot of automake available on each arch. #312315 +# We should list both the latest stable, and the latest unstable. #465732 +# This way the stable builds will still work, but the unstable are allowed +# to build & test things for us ahead of time (if they have it installed). +# If a newer slot is stable on any arch, and is NOT reflected in this list, +# then circular dependencies may arise during emerge @system bootstraps. +# Do NOT change this variable in your ebuilds! +# If you want to force a newer minor version, you can specify the correct +# WANT value by using a colon: : +_LATEST_AUTOMAKE=( 1.15:1.15 ) + +_automake_atom="sys-devel/automake" +_autoconf_atom="sys-devel/autoconf" +if [[ -n ${WANT_AUTOMAKE} ]]; then + case ${WANT_AUTOMAKE} in + # Even if the package doesn't use automake, we still need to depend + # on it because we run aclocal to process m4 macros. This matches + # the autoreconf tool, so this requirement is correct. #401605 + none) ;; + latest) + # Use SLOT deps if we can. For EAPI=0, we get pretty close. + if [[ ${EAPI:-0} != 0 ]] ; then + _automake_atom="|| ( `printf '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )" + else + _automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )" + fi + ;; + *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; + esac + export WANT_AUTOMAKE +fi + +if [[ -n ${WANT_AUTOCONF} ]] ; then + case ${WANT_AUTOCONF} in + none) _autoconf_atom="" ;; # some packages don't require autoconf at all + 2.1) _autoconf_atom="~sys-devel/autoconf-2.13" ;; + # if you change the "latest" version here, change also autotools_env_setup + latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.69" ;; + *) die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;; + esac + export WANT_AUTOCONF +fi + +_libtool_atom=">=sys-devel/libtool-2.4" +if [[ -n ${WANT_LIBTOOL} ]] ; then + case ${WANT_LIBTOOL} in + none) _libtool_atom="" ;; + latest) ;; + *) die "Invalid WANT_LIBTOOL value '${WANT_LIBTOOL}'" ;; + esac + export WANT_LIBTOOL +fi + +# Force people (nicely) to upgrade to a newer version of gettext as +# older ones are known to be crappy. #496454 +AUTOTOOLS_DEPEND="!/dev/null + # Avoid unsafe nested multijob_finish_one for bug #426512. + AT_NOELIBTOOLIZE="yes" eautoreconf || die + popd >/dev/null + fi + done + fi + + einfo "Running eautoreconf in '${PWD}' ..." + + local m4dirs=$(autotools_check_macro_val AC_CONFIG_{AUX,MACRO}_DIR) + [[ -n ${m4dirs} ]] && mkdir -p ${m4dirs} + + # Run all the tools before aclocal so we can gather the .m4 files. + local i tools=( + # + glibgettext false "autotools_run_tool glib-gettextize --copy --force" + gettext false "autotools_run_tool --at-missing autopoint --force" + # intltool must come after autopoint. + intltool false "autotools_run_tool intltoolize --automake --copy --force" + gtkdoc false "autotools_run_tool --at-missing gtkdocize --copy" + gnomedoc false "autotools_run_tool --at-missing gnome-doc-prepare --copy --force" + libtool false "_elibtoolize --auto-ltdl --install --copy --force" + ) + for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do + if _at_uses_${tools[i]} ; then + tools[i+1]=true + ${tools[i+2]} + fi + done + + # Generate aclocal.m4 with our up-to-date m4 files. + local rerun_aclocal=false + eaclocal + + # Check to see if we had macros expanded by other macros or in other + # m4 files that we couldn't detect early. This is uncommon, but some + # packages do this, so we have to handle it correctly. + for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do + if ! ${tools[i+1]} && _at_uses_${tools[i]} ; then + ${tools[i+2]} + rerun_aclocal=true + fi + done + ${rerun_aclocal} && eaclocal + + if [[ ${WANT_AUTOCONF} = 2.1 ]] ; then + eautoconf + else + eautoconf --force + fi + eautoheader + [[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} + + if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then + # Call it here to prevent failures due to elibtoolize called _before_ + # eautoreconf. + elibtoolize --force "${PWD}" + fi + + return 0 +} + +# @FUNCTION: _at_uses_pkg +# @USAGE: +# @INTERNAL +# See if the specified macros are enabled. +_at_uses_pkg() { + if [[ -n $(autotools_check_macro "$@") ]] ; then + return 0 + else + # If the trace didn't find it (perhaps because aclocal.m4 hasn't + # been generated yet), cheat, but be conservative. + local macro args=() + for macro ; do + args+=( -e "^[[:space:]]*${macro}\>" ) + done + egrep -q "${args[@]}" configure.?? + fi +} +_at_uses_autoheader() { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; } +_at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; } +_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_{,REQUIRE_}VERSION; } +_at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; } +_at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; } +_at_uses_gtkdoc() { _at_uses_pkg GTK_DOC_CHECK; } +_at_uses_gnomedoc() { _at_uses_pkg GNOME_DOC_INIT; } +_at_uses_libtool() { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; } +_at_uses_libltdl() { _at_uses_pkg LT_CONFIG_LTDL_DIR; } + +# @FUNCTION: eaclocal_amflags +# @DESCRIPTION: +# Extract the ACLOCAL_AMFLAGS value from the Makefile.am and try to handle +# (most) of the crazy crap that people throw at us. +eaclocal_amflags() { + local aclocal_opts amflags_file + + for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do + [[ -e ${amflags_file} ]] || continue + # setup the env in case the pkg does something crazy + # in their ACLOCAL_AMFLAGS. like run a shell script + # which turns around and runs autotools. #365401 + # or split across multiple lines. #383525 + autotools_env_setup + aclocal_opts=$(sed -n \ + "/^ACLOCAL_AMFLAGS[[:space:]]*=/{ \ + # match the first line + s:[^=]*=::p; \ + # then gobble up all escaped lines + : nextline /\\\\$/{ n; p; b nextline; } \ + }" ${amflags_file}) + eval aclocal_opts=\""${aclocal_opts}"\" + break + done + + echo ${aclocal_opts} +} + +# @FUNCTION: eaclocal +# @DESCRIPTION: +# These functions runs the autotools using autotools_run_tool with the +# specified parametes. The name of the tool run is the same of the function +# without e prefix. +# They also force installing the support files for safety. +# Respects AT_M4DIR for additional directories to search for macro's. +eaclocal() { + [[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \ + autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags) +} + +# @FUNCTION: _elibtoolize +# @DESCRIPTION: +# Runs libtoolize. +# +# Note the '_' prefix: avoid collision with elibtoolize() from libtool.eclass. +_elibtoolize() { + local LIBTOOLIZE=${LIBTOOLIZE:-$(type -P glibtoolize > /dev/null && echo glibtoolize || echo libtoolize)} + + if [[ $1 == "--auto-ltdl" ]] ; then + shift + _at_uses_libltdl && set -- "$@" --ltdl + fi + + [[ -f GNUmakefile.am || -f Makefile.am ]] && set -- "$@" --automake + + autotools_run_tool ${LIBTOOLIZE} "$@" +} + +# @FUNCTION: eautoheader +# @DESCRIPTION: +# Runs autoheader. +eautoheader() { + _at_uses_autoheader || return 0 + autotools_run_tool --at-no-fail --at-m4flags autoheader "$@" +} + +# @FUNCTION: eautoconf +# @DESCRIPTION: +# Runs autoconf. +eautoconf() { + if [[ ! -f configure.ac && ! -f configure.in ]] ; then + echo + eerror "No configure.{ac,in} present in '${PWD}'!" + echo + die "No configure.{ac,in} present!" + fi + if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then + eqawarn "This package has a configure.in file which has long been deprecated. Please" + eqawarn "update it to use configure.ac instead as newer versions of autotools will die" + eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." + fi + + autotools_run_tool --at-m4flags autoconf "$@" +} + +# @FUNCTION: eautomake +# @DESCRIPTION: +# Runs automake. +eautomake() { + local extra_opts=() + local makefile_name + + # Run automake if: + # - a Makefile.am type file exists + # - the configure script is using the AM_INIT_AUTOMAKE directive + for makefile_name in {GNUmakefile,{M,m}akefile}.am "" ; do + [[ -f ${makefile_name} ]] && break + done + + _automake_version() { + autotools_run_tool --at-output automake --version 2>/dev/null | + sed -n -e '1{s:.*(GNU automake) ::p;q}' + } + + if [[ -z ${makefile_name} ]] ; then + _at_uses_automake || return 0 + + elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then + local used_automake + local installed_automake + + installed_automake=$(WANT_AUTOMAKE= _automake_version) + used_automake=$(head -n 1 < ${makefile_name%.am}.in | \ + sed -e 's:.*by automake \(.*\) from .*:\1:') + + if [[ ${installed_automake} != ${used_automake} ]]; then + ewarn "Automake used for the package (${used_automake}) differs from" \ + "the installed version (${installed_automake})." + ewarn "Forcing a full rebuild of the autotools to workaround." + eautoreconf + return 0 + fi + fi + + [[ -f INSTALL && -f AUTHORS && -f ChangeLog && -f NEWS && -f README ]] \ + || extra_opts+=( --foreign ) + + # Older versions of automake do not support --force-missing. But we want + # to use this whenever possible to update random bundled files #133489. + case $(_automake_version) in + 1.4|1.4[.-]*) ;; + *) extra_opts+=( --force-missing ) ;; + esac + + autotools_run_tool automake --add-missing --copy "${extra_opts[@]}" "$@" +} + +# @FUNCTION: eautopoint +# @DESCRIPTION: +# Runs autopoint (from the gettext package). +eautopoint() { + autotools_run_tool autopoint "$@" +} + +# @FUNCTION: config_rpath_update +# @USAGE: [destination] +# @DESCRIPTION: +# Some packages utilize the config.rpath helper script, but don't +# use gettext directly. So we have to copy it in manually since +# we can't let `autopoint` do it for us. +config_rpath_update() { + local dst src=$(type -P gettext | sed 's:bin/gettext:share/gettext/config.rpath:') + + [[ $# -eq 0 ]] && set -- $(find -name config.rpath) + [[ $# -eq 0 ]] && return 0 + + einfo "Updating all config.rpath files" + for dst in "$@" ; do + einfo " ${dst}" + cp "${src}" "${dst}" || die + done +} + +# @FUNCTION: autotools_env_setup +# @INTERNAL +# @DESCRIPTION: +# Process the WANT_AUTO{CONF,MAKE} flags. +autotools_env_setup() { + # We do the "latest" → version switch here because it solves + # possible order problems, see bug #270010 as an example. + if [[ ${WANT_AUTOMAKE} == "latest" ]]; then + local pv + for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do + # has_version respects ROOT, but in this case, we don't want it to, + # thus "ROOT=/" prefix: + ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" + done + [[ ${WANT_AUTOMAKE} == "latest" ]] && \ + die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}" + fi + [[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5 +} + +# @FUNCTION: autotools_run_tool +# @USAGE: [--at-no-fail] [--at-m4flags] [--at-missing] [--at-output] [tool-specific flags] +# @INTERNAL +# @DESCRIPTION: +# Run the specified autotool helper, but do logging and error checking +# around it in the process. +autotools_run_tool() { + # Process our own internal flags first + local autofail=true m4flags=false missing_ok=false return_output=false + while [[ -n $1 ]] ; do + case $1 in + --at-no-fail) autofail=false;; + --at-m4flags) m4flags=true;; + --at-missing) missing_ok=true;; + --at-output) return_output=true;; + # whatever is left goes to the actual tool + *) break;; + esac + shift + done + + if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then + ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" + fi + + if ${missing_ok} && ! type -P ${1} >/dev/null ; then + einfo "Skipping '$*' due $1 not installed" + return 0 + fi + + autotools_env_setup + + # Allow people to pass in full paths. #549268 + local STDERR_TARGET="${T}/${1##*/}.out" + # most of the time, there will only be one run, but if there are + # more, make sure we get unique log filenames + if [[ -e ${STDERR_TARGET} ]] ; then + local i=1 + while :; do + STDERR_TARGET="${T}/${1##*/}-${i}.out" + [[ -e ${STDERR_TARGET} ]] || break + : $(( i++ )) + done + fi + + if ${m4flags} ; then + set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include) + fi + + # If the caller wants to probe something, then let them do it directly. + if ${return_output} ; then + "$@" + return + fi + + printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}" + + ebegin "Running $@" + "$@" >> "${STDERR_TARGET}" 2>&1 + if ! eend $? && ${autofail} ; then + echo + eerror "Failed Running $1 !" + eerror + eerror "Include in your bugreport the contents of:" + eerror + eerror " ${STDERR_TARGET}" + echo + die "Failed Running $1 !" + fi +} + +# Internal function to check for support + +# Keep a list of all the macros we might use so that we only +# have to run the trace code once. Order doesn't matter. +ALL_AUTOTOOLS_MACROS=( + A{C,M}_PROG_LIBTOOL LT_INIT LT_CONFIG_LTDL_DIR + A{C,M}_CONFIG_HEADER{S,} + AC_CONFIG_SUBDIRS + AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR + AM_INIT_AUTOMAKE + AM_GLIB_GNU_GETTEXT + AM_GNU_GETTEXT_{,REQUIRE_}VERSION + {AC,IT}_PROG_INTLTOOL + GTK_DOC_CHECK + GNOME_DOC_INIT +) +autotools_check_macro() { + [[ -f configure.ac || -f configure.in ]] || return 0 + + # We can run in multiple dirs, so we have to cache the trace + # data in $PWD rather than an env var. + local trace_file=".__autoconf_trace_data" + if [[ ! -e ${trace_file} ]] || [[ ! aclocal.m4 -ot ${trace_file} ]] ; then + WANT_AUTOCONF="2.5" autoconf \ + $(autotools_m4dir_include) \ + ${ALL_AUTOTOOLS_MACROS[@]/#/--trace=} > ${trace_file} 2>/dev/null + fi + + local macro args=() + for macro ; do + has ${macro} ${ALL_AUTOTOOLS_MACROS[@]} || die "internal error: add ${macro} to ALL_AUTOTOOLS_MACROS" + args+=( -e ":${macro}:" ) + done + grep "${args[@]}" ${trace_file} +} + +# @FUNCTION: autotools_check_macro_val +# @USAGE: [macros] +# @INTERNAL +# @DESCRIPTION: +# Look for a macro and extract its value. +autotools_check_macro_val() { + local macro scan_out + + for macro ; do + autotools_check_macro "${macro}" | \ + gawk -v macro="${macro}" \ + '($0 !~ /^[[:space:]]*(#|dnl)/) { + if (match($0, macro ":(.*)$", res)) + print res[1] + }' | uniq + done + + return 0 +} + +_autotools_m4dir_include() { + local x include_opts flag + + # Use the right flag to autoconf based on the version #448986 + [[ ${WANT_AUTOCONF} == "2.1" ]] \ + && flag="l" \ + || flag="I" + + for x in "$@" ; do + case ${x} in + # We handle it below + -${flag}) ;; + *) + [[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist" + include_opts+=" -${flag} ${x}" + ;; + esac + done + + echo ${include_opts} +} +autotools_m4dir_include() { _autotools_m4dir_include ${AT_M4DIR} ; } +autotools_m4sysdir_include() { + # First try to use the paths the system integrator has set up. + local paths=( $(eval echo ${AT_SYS_M4DIR}) ) + + if [[ ${#paths[@]} -eq 0 && -n ${SYSROOT} ]] ; then + # If they didn't give us anything, then default to the SYSROOT. + # This helps when cross-compiling. + local path="${SYSROOT}/usr/share/aclocal" + [[ -d ${path} ]] && paths+=( "${path}" ) + fi + _autotools_m4dir_include "${paths[@]}" +} + +fi -- 2.45.2 From 577ee59ae4b4b0785d1eebf1629f0d57a2b96459 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Wed, 21 Oct 2015 21:20:42 +0200 Subject: [PATCH 04/16] =?utf8?q?eclass/autotools.eclass:=20zmiany=20ju?= =?utf8?q?=C5=BC=20s=C4=85=20w=20gentoo.git?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- eclass/autotools.eclass | 614 ---------------------------------------- 1 file changed, 614 deletions(-) delete mode 100644 eclass/autotools.eclass diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass deleted file mode 100644 index 3039a46..0000000 --- a/eclass/autotools.eclass +++ /dev/null @@ -1,614 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# @ECLASS: autotools.eclass -# @MAINTAINER: -# base-system@gentoo.org -# @BLURB: Regenerates auto* build scripts -# @DESCRIPTION: -# This eclass is for safely handling autotooled software packages that need to -# regenerate their build scripts. All functions will abort in case of errors. - -# Note: We require GNU m4, as does autoconf. So feel free to use any features -# from the GNU version of m4 without worrying about other variants (i.e. BSD). - -if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then - # See if we were included already, but someone changed the value - # of AUTOTOOLS_AUTO_DEPEND on us. We could reload the entire - # eclass at that point, but that adds overhead, and it's trivial - # to re-order inherit in eclasses/ebuilds instead. #409611 - if [[ ${__AUTOTOOLS_AUTO_DEPEND} != ${AUTOTOOLS_AUTO_DEPEND} ]] ; then - die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit autotools.eclass first! ${__AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" - fi -fi - -if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then -_AUTOTOOLS_ECLASS=1 - -inherit libtool - -# @ECLASS-VARIABLE: WANT_AUTOCONF -# @DESCRIPTION: -# The major version of autoconf your package needs -: ${WANT_AUTOCONF:=latest} - -# @ECLASS-VARIABLE: WANT_AUTOMAKE -# @DESCRIPTION: -# The major version of automake your package needs -: ${WANT_AUTOMAKE:=latest} - -# @ECLASS-VARIABLE: WANT_LIBTOOL -# @DESCRIPTION: -# Do you want libtool? Valid values here are "latest" and "none". -: ${WANT_LIBTOOL:=latest} - -# @ECLASS-VARIABLE: _LATEST_AUTOMAKE -# @INTERNAL -# @DESCRIPTION: -# CONSTANT! -# The latest major version/slot of automake available on each arch. #312315 -# We should list both the latest stable, and the latest unstable. #465732 -# This way the stable builds will still work, but the unstable are allowed -# to build & test things for us ahead of time (if they have it installed). -# If a newer slot is stable on any arch, and is NOT reflected in this list, -# then circular dependencies may arise during emerge @system bootstraps. -# Do NOT change this variable in your ebuilds! -# If you want to force a newer minor version, you can specify the correct -# WANT value by using a colon: : -_LATEST_AUTOMAKE=( 1.15:1.15 ) - -_automake_atom="sys-devel/automake" -_autoconf_atom="sys-devel/autoconf" -if [[ -n ${WANT_AUTOMAKE} ]]; then - case ${WANT_AUTOMAKE} in - # Even if the package doesn't use automake, we still need to depend - # on it because we run aclocal to process m4 macros. This matches - # the autoreconf tool, so this requirement is correct. #401605 - none) ;; - latest) - # Use SLOT deps if we can. For EAPI=0, we get pretty close. - if [[ ${EAPI:-0} != 0 ]] ; then - _automake_atom="|| ( `printf '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )" - else - _automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )" - fi - ;; - *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; - esac - export WANT_AUTOMAKE -fi - -if [[ -n ${WANT_AUTOCONF} ]] ; then - case ${WANT_AUTOCONF} in - none) _autoconf_atom="" ;; # some packages don't require autoconf at all - 2.1) _autoconf_atom="~sys-devel/autoconf-2.13" ;; - # if you change the "latest" version here, change also autotools_env_setup - latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.69" ;; - *) die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;; - esac - export WANT_AUTOCONF -fi - -_libtool_atom=">=sys-devel/libtool-2.4" -if [[ -n ${WANT_LIBTOOL} ]] ; then - case ${WANT_LIBTOOL} in - none) _libtool_atom="" ;; - latest) ;; - *) die "Invalid WANT_LIBTOOL value '${WANT_LIBTOOL}'" ;; - esac - export WANT_LIBTOOL -fi - -# Force people (nicely) to upgrade to a newer version of gettext as -# older ones are known to be crappy. #496454 -AUTOTOOLS_DEPEND="!/dev/null - # Avoid unsafe nested multijob_finish_one for bug #426512. - AT_NOELIBTOOLIZE="yes" eautoreconf || die - popd >/dev/null - fi - done - fi - - einfo "Running eautoreconf in '${PWD}' ..." - - local m4dirs=$(autotools_check_macro_val AC_CONFIG_{AUX,MACRO}_DIR) - [[ -n ${m4dirs} ]] && mkdir -p ${m4dirs} - - # Run all the tools before aclocal so we can gather the .m4 files. - local i tools=( - # - glibgettext false "autotools_run_tool glib-gettextize --copy --force" - gettext false "autotools_run_tool --at-missing autopoint --force" - # intltool must come after autopoint. - intltool false "autotools_run_tool intltoolize --automake --copy --force" - gtkdoc false "autotools_run_tool --at-missing gtkdocize --copy" - gnomedoc false "autotools_run_tool --at-missing gnome-doc-prepare --copy --force" - libtool false "_elibtoolize --auto-ltdl --install --copy --force" - ) - for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do - if _at_uses_${tools[i]} ; then - tools[i+1]=true - ${tools[i+2]} - fi - done - - # Generate aclocal.m4 with our up-to-date m4 files. - local rerun_aclocal=false - eaclocal - - # Check to see if we had macros expanded by other macros or in other - # m4 files that we couldn't detect early. This is uncommon, but some - # packages do this, so we have to handle it correctly. - for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do - if ! ${tools[i+1]} && _at_uses_${tools[i]} ; then - ${tools[i+2]} - rerun_aclocal=true - fi - done - ${rerun_aclocal} && eaclocal - - if [[ ${WANT_AUTOCONF} = 2.1 ]] ; then - eautoconf - else - eautoconf --force - fi - eautoheader - [[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} - - if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then - # Call it here to prevent failures due to elibtoolize called _before_ - # eautoreconf. - elibtoolize --force "${PWD}" - fi - - return 0 -} - -# @FUNCTION: _at_uses_pkg -# @USAGE: -# @INTERNAL -# See if the specified macros are enabled. -_at_uses_pkg() { - if [[ -n $(autotools_check_macro "$@") ]] ; then - return 0 - else - # If the trace didn't find it (perhaps because aclocal.m4 hasn't - # been generated yet), cheat, but be conservative. - local macro args=() - for macro ; do - args+=( -e "^[[:space:]]*${macro}\>" ) - done - egrep -q "${args[@]}" configure.?? - fi -} -_at_uses_autoheader() { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; } -_at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; } -_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_{,REQUIRE_}VERSION; } -_at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; } -_at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; } -_at_uses_gtkdoc() { _at_uses_pkg GTK_DOC_CHECK; } -_at_uses_gnomedoc() { _at_uses_pkg GNOME_DOC_INIT; } -_at_uses_libtool() { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; } -_at_uses_libltdl() { _at_uses_pkg LT_CONFIG_LTDL_DIR; } - -# @FUNCTION: eaclocal_amflags -# @DESCRIPTION: -# Extract the ACLOCAL_AMFLAGS value from the Makefile.am and try to handle -# (most) of the crazy crap that people throw at us. -eaclocal_amflags() { - local aclocal_opts amflags_file - - for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do - [[ -e ${amflags_file} ]] || continue - # setup the env in case the pkg does something crazy - # in their ACLOCAL_AMFLAGS. like run a shell script - # which turns around and runs autotools. #365401 - # or split across multiple lines. #383525 - autotools_env_setup - aclocal_opts=$(sed -n \ - "/^ACLOCAL_AMFLAGS[[:space:]]*=/{ \ - # match the first line - s:[^=]*=::p; \ - # then gobble up all escaped lines - : nextline /\\\\$/{ n; p; b nextline; } \ - }" ${amflags_file}) - eval aclocal_opts=\""${aclocal_opts}"\" - break - done - - echo ${aclocal_opts} -} - -# @FUNCTION: eaclocal -# @DESCRIPTION: -# These functions runs the autotools using autotools_run_tool with the -# specified parametes. The name of the tool run is the same of the function -# without e prefix. -# They also force installing the support files for safety. -# Respects AT_M4DIR for additional directories to search for macro's. -eaclocal() { - [[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \ - autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags) -} - -# @FUNCTION: _elibtoolize -# @DESCRIPTION: -# Runs libtoolize. -# -# Note the '_' prefix: avoid collision with elibtoolize() from libtool.eclass. -_elibtoolize() { - local LIBTOOLIZE=${LIBTOOLIZE:-$(type -P glibtoolize > /dev/null && echo glibtoolize || echo libtoolize)} - - if [[ $1 == "--auto-ltdl" ]] ; then - shift - _at_uses_libltdl && set -- "$@" --ltdl - fi - - [[ -f GNUmakefile.am || -f Makefile.am ]] && set -- "$@" --automake - - autotools_run_tool ${LIBTOOLIZE} "$@" -} - -# @FUNCTION: eautoheader -# @DESCRIPTION: -# Runs autoheader. -eautoheader() { - _at_uses_autoheader || return 0 - autotools_run_tool --at-no-fail --at-m4flags autoheader "$@" -} - -# @FUNCTION: eautoconf -# @DESCRIPTION: -# Runs autoconf. -eautoconf() { - if [[ ! -f configure.ac && ! -f configure.in ]] ; then - echo - eerror "No configure.{ac,in} present in '${PWD}'!" - echo - die "No configure.{ac,in} present!" - fi - if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then - eqawarn "This package has a configure.in file which has long been deprecated. Please" - eqawarn "update it to use configure.ac instead as newer versions of autotools will die" - eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." - fi - - autotools_run_tool --at-m4flags autoconf "$@" -} - -# @FUNCTION: eautomake -# @DESCRIPTION: -# Runs automake. -eautomake() { - local extra_opts=() - local makefile_name - - # Run automake if: - # - a Makefile.am type file exists - # - the configure script is using the AM_INIT_AUTOMAKE directive - for makefile_name in {GNUmakefile,{M,m}akefile}.am "" ; do - [[ -f ${makefile_name} ]] && break - done - - _automake_version() { - autotools_run_tool --at-output automake --version 2>/dev/null | - sed -n -e '1{s:.*(GNU automake) ::p;q}' - } - - if [[ -z ${makefile_name} ]] ; then - _at_uses_automake || return 0 - - elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then - local used_automake - local installed_automake - - installed_automake=$(WANT_AUTOMAKE= _automake_version) - used_automake=$(head -n 1 < ${makefile_name%.am}.in | \ - sed -e 's:.*by automake \(.*\) from .*:\1:') - - if [[ ${installed_automake} != ${used_automake} ]]; then - ewarn "Automake used for the package (${used_automake}) differs from" \ - "the installed version (${installed_automake})." - ewarn "Forcing a full rebuild of the autotools to workaround." - eautoreconf - return 0 - fi - fi - - [[ -f INSTALL && -f AUTHORS && -f ChangeLog && -f NEWS && -f README ]] \ - || extra_opts+=( --foreign ) - - # Older versions of automake do not support --force-missing. But we want - # to use this whenever possible to update random bundled files #133489. - case $(_automake_version) in - 1.4|1.4[.-]*) ;; - *) extra_opts+=( --force-missing ) ;; - esac - - autotools_run_tool automake --add-missing --copy "${extra_opts[@]}" "$@" -} - -# @FUNCTION: eautopoint -# @DESCRIPTION: -# Runs autopoint (from the gettext package). -eautopoint() { - autotools_run_tool autopoint "$@" -} - -# @FUNCTION: config_rpath_update -# @USAGE: [destination] -# @DESCRIPTION: -# Some packages utilize the config.rpath helper script, but don't -# use gettext directly. So we have to copy it in manually since -# we can't let `autopoint` do it for us. -config_rpath_update() { - local dst src=$(type -P gettext | sed 's:bin/gettext:share/gettext/config.rpath:') - - [[ $# -eq 0 ]] && set -- $(find -name config.rpath) - [[ $# -eq 0 ]] && return 0 - - einfo "Updating all config.rpath files" - for dst in "$@" ; do - einfo " ${dst}" - cp "${src}" "${dst}" || die - done -} - -# @FUNCTION: autotools_env_setup -# @INTERNAL -# @DESCRIPTION: -# Process the WANT_AUTO{CONF,MAKE} flags. -autotools_env_setup() { - # We do the "latest" → version switch here because it solves - # possible order problems, see bug #270010 as an example. - if [[ ${WANT_AUTOMAKE} == "latest" ]]; then - local pv - for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do - # has_version respects ROOT, but in this case, we don't want it to, - # thus "ROOT=/" prefix: - ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" - done - [[ ${WANT_AUTOMAKE} == "latest" ]] && \ - die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}" - fi - [[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5 -} - -# @FUNCTION: autotools_run_tool -# @USAGE: [--at-no-fail] [--at-m4flags] [--at-missing] [--at-output] [tool-specific flags] -# @INTERNAL -# @DESCRIPTION: -# Run the specified autotool helper, but do logging and error checking -# around it in the process. -autotools_run_tool() { - # Process our own internal flags first - local autofail=true m4flags=false missing_ok=false return_output=false - while [[ -n $1 ]] ; do - case $1 in - --at-no-fail) autofail=false;; - --at-m4flags) m4flags=true;; - --at-missing) missing_ok=true;; - --at-output) return_output=true;; - # whatever is left goes to the actual tool - *) break;; - esac - shift - done - - if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then - ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" - fi - - if ${missing_ok} && ! type -P ${1} >/dev/null ; then - einfo "Skipping '$*' due $1 not installed" - return 0 - fi - - autotools_env_setup - - # Allow people to pass in full paths. #549268 - local STDERR_TARGET="${T}/${1##*/}.out" - # most of the time, there will only be one run, but if there are - # more, make sure we get unique log filenames - if [[ -e ${STDERR_TARGET} ]] ; then - local i=1 - while :; do - STDERR_TARGET="${T}/${1##*/}-${i}.out" - [[ -e ${STDERR_TARGET} ]] || break - : $(( i++ )) - done - fi - - if ${m4flags} ; then - set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include) - fi - - # If the caller wants to probe something, then let them do it directly. - if ${return_output} ; then - "$@" - return - fi - - printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}" - - ebegin "Running $@" - "$@" >> "${STDERR_TARGET}" 2>&1 - if ! eend $? && ${autofail} ; then - echo - eerror "Failed Running $1 !" - eerror - eerror "Include in your bugreport the contents of:" - eerror - eerror " ${STDERR_TARGET}" - echo - die "Failed Running $1 !" - fi -} - -# Internal function to check for support - -# Keep a list of all the macros we might use so that we only -# have to run the trace code once. Order doesn't matter. -ALL_AUTOTOOLS_MACROS=( - A{C,M}_PROG_LIBTOOL LT_INIT LT_CONFIG_LTDL_DIR - A{C,M}_CONFIG_HEADER{S,} - AC_CONFIG_SUBDIRS - AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR - AM_INIT_AUTOMAKE - AM_GLIB_GNU_GETTEXT - AM_GNU_GETTEXT_{,REQUIRE_}VERSION - {AC,IT}_PROG_INTLTOOL - GTK_DOC_CHECK - GNOME_DOC_INIT -) -autotools_check_macro() { - [[ -f configure.ac || -f configure.in ]] || return 0 - - # We can run in multiple dirs, so we have to cache the trace - # data in $PWD rather than an env var. - local trace_file=".__autoconf_trace_data" - if [[ ! -e ${trace_file} ]] || [[ ! aclocal.m4 -ot ${trace_file} ]] ; then - WANT_AUTOCONF="2.5" autoconf \ - $(autotools_m4dir_include) \ - ${ALL_AUTOTOOLS_MACROS[@]/#/--trace=} > ${trace_file} 2>/dev/null - fi - - local macro args=() - for macro ; do - has ${macro} ${ALL_AUTOTOOLS_MACROS[@]} || die "internal error: add ${macro} to ALL_AUTOTOOLS_MACROS" - args+=( -e ":${macro}:" ) - done - grep "${args[@]}" ${trace_file} -} - -# @FUNCTION: autotools_check_macro_val -# @USAGE: [macros] -# @INTERNAL -# @DESCRIPTION: -# Look for a macro and extract its value. -autotools_check_macro_val() { - local macro scan_out - - for macro ; do - autotools_check_macro "${macro}" | \ - gawk -v macro="${macro}" \ - '($0 !~ /^[[:space:]]*(#|dnl)/) { - if (match($0, macro ":(.*)$", res)) - print res[1] - }' | uniq - done - - return 0 -} - -_autotools_m4dir_include() { - local x include_opts flag - - # Use the right flag to autoconf based on the version #448986 - [[ ${WANT_AUTOCONF} == "2.1" ]] \ - && flag="l" \ - || flag="I" - - for x in "$@" ; do - case ${x} in - # We handle it below - -${flag}) ;; - *) - [[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist" - include_opts+=" -${flag} ${x}" - ;; - esac - done - - echo ${include_opts} -} -autotools_m4dir_include() { _autotools_m4dir_include ${AT_M4DIR} ; } -autotools_m4sysdir_include() { - # First try to use the paths the system integrator has set up. - local paths=( $(eval echo ${AT_SYS_M4DIR}) ) - - if [[ ${#paths[@]} -eq 0 && -n ${SYSROOT} ]] ; then - # If they didn't give us anything, then default to the SYSROOT. - # This helps when cross-compiling. - local path="${SYSROOT}/usr/share/aclocal" - [[ -d ${path} ]] && paths+=( "${path}" ) - fi - _autotools_m4dir_include "${paths[@]}" -} - -fi -- 2.45.2 From 95886083e15c7fa2b5a9b74c4067222eb30cf028 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Wed, 13 Apr 2016 17:15:42 +0200 Subject: [PATCH 05/16] .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..17df616 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/metadata/md5-cache/ +/profiles/use.local.desc -- 2.45.2 From 27baf28132682f35d6451446e31a54951e5f94d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sat, 16 Apr 2016 05:15:32 +0200 Subject: [PATCH 06/16] Aktualizacja games-roguelike/adom-60 --- games-roguelike/adom/Manifest | 4 ++-- games-roguelike/adom/adom-60.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/games-roguelike/adom/Manifest b/games-roguelike/adom/Manifest index 7139ea3..985fa51 100644 --- a/games-roguelike/adom/Manifest +++ b/games-roguelike/adom/Manifest @@ -1,2 +1,2 @@ -DIST adom_linux_debian_32_r60.tar.gz 1356106 SHA256 6d6f1590b8a55b3c9aedaae78236051f4f4c7e246d78a78ce3aa8e25468210c0 SHA512 1c9db069dcd900d6c784545dbe55a281094cb844563dc6a5906d8de5831887b35bab73b32ad35421f401d27ff740cb4ec1f6559f107440340336ce0f2be25fb4 WHIRLPOOL b619e67ea082208bae7cb10ec6d29a2855585c88a9de72ea4191ab703bce8f92762ceebec948ff9280ab9d0561ce523152386b64752873b993fe9269e5ec0d53 -DIST adom_linux_debian_64_r60.tar.gz 1446341 SHA256 7807739760f2895c56d6c48c4a2e9e99a163059df9a4a77dbeee20e296d199a7 SHA512 7ae7311081371b85a020f0a79bcb4cf000b20b5817e85bdc857d34e7db22ea39addf8f12eea0118b124b223f457c2a088a6ff3041a44a1cac0ae1c3efc7bada0 WHIRLPOOL 915a0f457abc00116becd94986c66c0fe11a66af66644d4f45797441b74a627072e91ed33fa8ce8d8888baf2bfd8a3be7d6c78bd20af87e301a508183150c743 +DIST adom_linux_debian_32_r60_pub.tar.gz 1352605 SHA256 20b1aba07ac7d90a9437937ae5714fbb0199d2ba460d3b18473370baca665554 SHA512 8eaf3f9c590f2c22f9ed8e4091958342c2fcef6fc1e5cde3d656d466d0ec2a053966c818e09878e7054a46838b8d3e9c01269389b8c1ee06f0014305cc00f631 WHIRLPOOL 4f9da2763470ee0dcf559a69baee25588d0e2dfde2be7cbbf7042d58c6506dad8612bec34f9b1738f3668644e215c4ca73b3c98a059227e3655567d2d1464a5d +DIST adom_linux_debian_64_r60_pub.tar.gz 1442712 SHA256 e36ec001566cb8bc4c5857dcfa8839b0797888be2c1e3b8476e8c5a9bb93ce2c SHA512 7b09b70066617f9a47ade03864d64bf09a9bb367df3c230979e12b314cdcd0f30eb873857f9b8aeacb94d8c87883b6c5e63c62beecc7c2f08778e52655192fde WHIRLPOOL 53f1bbf15dafbebe4aab062f1efa6317dd112d4a743a9928e7d1a5f9767ee9a0ffc3c69be6c66d7088ce77e8911ec5dc2552aecc7828ae19e631d5c5716de124 diff --git a/games-roguelike/adom/adom-60.ebuild b/games-roguelike/adom/adom-60.ebuild index 50288bf..95f7bec 100644 --- a/games-roguelike/adom/adom-60.ebuild +++ b/games-roguelike/adom/adom-60.ebuild @@ -2,8 +2,8 @@ EAPI="5" DESCRIPTION="Ancient Domains Of Mystery, one of the most successful roguelikes" HOMEPAGE="http://www.adom.de/" -SRC_URI="x86? ( mirror://adom-secret/r${PV}/adom_linux_debian_32_r${PV}.tar.gz ) - amd64? ( mirror://adom-secret/r${PV}/adom_linux_debian_64_r${PV}.tar.gz )" +SRC_URI="x86? ( http://www.ancardia.com/download/adom_linux_debian_32_r${PV}_pub.tar.gz ) + amd64? ( http://www.ancardia.com/download/adom_linux_debian_64_r${PV}_pub.tar.gz )" RESTRICT="mirror" LICENSE="adom" -- 2.45.2 From 7dcab02f385ae52709bbeb75b1b2f3c03466d244 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sat, 16 Apr 2016 05:15:45 +0200 Subject: [PATCH 07/16] Podbicie wersji: games-roguelike/adom-65 --- games-roguelike/adom/Manifest | 2 ++ games-roguelike/adom/adom-65.ebuild | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 games-roguelike/adom/adom-65.ebuild diff --git a/games-roguelike/adom/Manifest b/games-roguelike/adom/Manifest index 985fa51..63e57ec 100644 --- a/games-roguelike/adom/Manifest +++ b/games-roguelike/adom/Manifest @@ -1,2 +1,4 @@ DIST adom_linux_debian_32_r60_pub.tar.gz 1352605 SHA256 20b1aba07ac7d90a9437937ae5714fbb0199d2ba460d3b18473370baca665554 SHA512 8eaf3f9c590f2c22f9ed8e4091958342c2fcef6fc1e5cde3d656d466d0ec2a053966c818e09878e7054a46838b8d3e9c01269389b8c1ee06f0014305cc00f631 WHIRLPOOL 4f9da2763470ee0dcf559a69baee25588d0e2dfde2be7cbbf7042d58c6506dad8612bec34f9b1738f3668644e215c4ca73b3c98a059227e3655567d2d1464a5d +DIST adom_linux_debian_32_r65.tar.gz 1386748 SHA256 c4fa97cdc4b31a694bfeb41c44541ac529c9ffdc5a9b56514456a6e595f4d4c1 SHA512 41e733faad0c458c5af7dbbea44b4eacb85e0557b80b4d8fcf53fa02a4e342a61da49c867a26d46efcb40903b3d8ee0f9eb2e69850f38483fbf9874f49df37ee WHIRLPOOL 47e6d9f2f8acc50c12a7337ca7ee3da2412aff83da6f8915e10b32ef192a1e629c0f0b6d59d105a1703fda6a1f2a0ddad5be9fdfc44acd31538d69fa25010dd1 DIST adom_linux_debian_64_r60_pub.tar.gz 1442712 SHA256 e36ec001566cb8bc4c5857dcfa8839b0797888be2c1e3b8476e8c5a9bb93ce2c SHA512 7b09b70066617f9a47ade03864d64bf09a9bb367df3c230979e12b314cdcd0f30eb873857f9b8aeacb94d8c87883b6c5e63c62beecc7c2f08778e52655192fde WHIRLPOOL 53f1bbf15dafbebe4aab062f1efa6317dd112d4a743a9928e7d1a5f9767ee9a0ffc3c69be6c66d7088ce77e8911ec5dc2552aecc7828ae19e631d5c5716de124 +DIST adom_linux_debian_64_r65.tar.gz 1482591 SHA256 565bcab99235b9af4d1992814e617ebed5ff0ade75fe9cf809d1cd018281c79b SHA512 90f406d142b48dd3dc370a3be6aeac674c7839acb21e7e7acadcf10536e2fade7dd7fadf6fa529ca10488dd1d032049041727c87bcc347383c3c6f1436790b9e WHIRLPOOL 03c52cd0addb1917cb2f822fac32eb0f9bf29cbac7c77fb4edfc355b598ffd9153b4ed78e3de5c9ae9e0d6b5165717101cb787d81721614867f109ed3e7dc5cd diff --git a/games-roguelike/adom/adom-65.ebuild b/games-roguelike/adom/adom-65.ebuild new file mode 100644 index 0000000..50288bf --- /dev/null +++ b/games-roguelike/adom/adom-65.ebuild @@ -0,0 +1,22 @@ +EAPI="5" + +DESCRIPTION="Ancient Domains Of Mystery, one of the most successful roguelikes" +HOMEPAGE="http://www.adom.de/" +SRC_URI="x86? ( mirror://adom-secret/r${PV}/adom_linux_debian_32_r${PV}.tar.gz ) + amd64? ( mirror://adom-secret/r${PV}/adom_linux_debian_64_r${PV}.tar.gz )" +RESTRICT="mirror" + +LICENSE="adom" +KEYWORDS="-* ~amd64 ~x86" +SLOT="0" + +RDEPEND="sys-libs/ncurses:5/5" + +QA_PREBUILT="*/adom" + +S=${WORKDIR}/${PN} + +src_install() { + dobin adom + dodoc docs/*.txt +} -- 2.45.2 From 06892395dfd0b3e6fff92c221de3d5e84bcd7f9c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Tue, 16 Aug 2016 22:00:59 +0200 Subject: [PATCH 08/16] Aktualizacja app-portage/eix-9999 --- app-portage/eix/eix-9999.ebuild | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app-portage/eix/eix-9999.ebuild b/app-portage/eix/eix-9999.ebuild index 34ea757..163ba6e 100644 --- a/app-portage/eix/eix-9999.ebuild +++ b/app-portage/eix/eix-9999.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 EGIT_REPO_URI="https://github.com/vaeth/eix.git" WANT_LIBTOOL="none" PLOCALES="de ru" -inherit autotools git-r3 bash-completion-r1 eutils l10n +inherit autotools git-r3 bash-completion-r1 l10n systemd DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more" HOMEPAGE="https://github.com/vaeth/eix/" @@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/vaeth/eix/" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools" +IUSE="debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools" BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl )" @@ -27,8 +27,8 @@ DEPEND="${BOTHDEPEND} >=sys-devel/gettext-0.18.3" src_prepare() { - sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf - epatch_user + sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die + eapply_user eautoreconf } @@ -41,18 +41,16 @@ src_configure() { $(use_enable swap-remote) \ $(use_with prefix always-accept-keywords) \ $(use_with dep dep-default) \ + $(use_with required-use required-use-default) \ --with-zsh-completion \ --with-portage-rootpath="${ROOTPATH}" \ - --with-eprefix-default="${EPREFIX}" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + --with-eprefix-default="${EPREFIX}" } src_install() { default dobashcomp bash/eix - insinto "/usr/lib/tmpfiles.d" - doins tmpfiles.d/eix.conf + systemd_dotmpfilesd tmpfiles.d/eix.conf } pkg_postinst() { -- 2.45.2 From 1fab20981473267ee921ad6172955d2d9e0fbca3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sun, 30 Oct 2016 22:47:12 +0100 Subject: [PATCH 09/16] Aktualizacja app-portage/eix --- app-portage/eix/eix-9999.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app-portage/eix/eix-9999.ebuild b/app-portage/eix/eix-9999.ebuild index 163ba6e..7b92c64 100644 --- a/app-portage/eix/eix-9999.ebuild +++ b/app-portage/eix/eix-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,8 @@ IUSE="debug +dep doc nls optimization +required-use security strong-optimization BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl )" RDEPEND="${BOTHDEPEND} - app-shells/push" + app-shells/push + app-shells/quoter" DEPEND="${BOTHDEPEND} doc? ( dev-python/docutils ) >=sys-devel/gettext-0.18.3" -- 2.45.2 From 2c2707fc80158a9b0d0e3d87dbfbe881c57d86ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sun, 30 Oct 2016 22:47:39 +0100 Subject: [PATCH 10/16] =?utf8?q?Usuni=C4=99cie=20app-portage/man-symlinker?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../man-symlinker/man-symlinker-9999.ebuild | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 app-portage/man-symlinker/man-symlinker-9999.ebuild diff --git a/app-portage/man-symlinker/man-symlinker-9999.ebuild b/app-portage/man-symlinker/man-symlinker-9999.ebuild deleted file mode 100644 index 454d4c4..0000000 --- a/app-portage/man-symlinker/man-symlinker-9999.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -EAPI="5" - -EGIT_REPO_URI="git://toy.bzium.org/~embe/man-symlinker.git" - -PYTHON_COMPAT=(python2_7) - -inherit git-r3 distutils-r1 - -DESCRIPTION="A program to make symlinks from .so links in manpages." -HOMEPAGE="" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="" -IUSE="" -- 2.45.2 From ce759fd9e249b2b421a6cad4dd02934e1da3371c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sun, 6 Nov 2016 23:45:15 +0100 Subject: [PATCH 11/16] Dodanie app-shells/push-2.0 --- app-shells/push/Manifest | 1 + app-shells/push/push-2.0.ebuild | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 app-shells/push/Manifest create mode 100644 app-shells/push/push-2.0.ebuild diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest new file mode 100644 index 0000000..869e65d --- /dev/null +++ b/app-shells/push/Manifest @@ -0,0 +1 @@ +DIST push-2.0.tar.gz 2211 SHA256 2d5e1c5b580f77ac9fb65b7b75c6220ee88687b6e7340ccc746e42e5632604b0 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff WHIRLPOOL 6abbad060edbb3d9873c24b73bc61f38f6a4fd38633021e66f8d3a5a04b61dfcdec4c68afed5e8fe06f817cf924adfafb439ddb415c71fc4e1b52ce561ec6fa1 diff --git a/app-shells/push/push-2.0.ebuild b/app-shells/push/push-2.0.ebuild new file mode 100644 index 0000000..2d55029 --- /dev/null +++ b/app-shells/push/push-2.0.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit vcs-snapshot + +DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args" +HOMEPAGE="https://github.com/vaeth/push/" +SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="" + +src_install() { + dobin bin/push.sh + dodoc README +} -- 2.45.2 From dbc2f5e2029fb3c8810573f71afcf41bc8b16d76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sun, 6 Nov 2016 23:45:28 +0100 Subject: [PATCH 12/16] Dodanie app-shells/quoter-3.0_p1 --- app-shells/quoter/Manifest | 1 + app-shells/quoter/quoter-3.0_p1.ebuild | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 app-shells/quoter/Manifest create mode 100644 app-shells/quoter/quoter-3.0_p1.ebuild diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest new file mode 100644 index 0000000..2a3003b --- /dev/null +++ b/app-shells/quoter/Manifest @@ -0,0 +1 @@ +DIST quoter-3.0_p1.tar.gz 10495 SHA256 0f84677af372be37c8e9c339789f671b9b7a7ab401a1f489cde29c856dc8af6b SHA512 f0064652b0751ba219a6d1546d5cab4d587e3a0b1f3e8bedf5e59da65d775446cdae12def6c8f963a7f7359253dce2c218dae54a85d1c36f69c541f004b8bbaa WHIRLPOOL e30c13da1ded4efc34bd541b477a4366acb5da25c352725d87583bcb3a171c09c3820e69eba0f698ad7ae6a083d910b80d446377365dcf82aecf80a3f02ae842 diff --git a/app-shells/quoter/quoter-3.0_p1.ebuild b/app-shells/quoter/quoter-3.0_p1.ebuild new file mode 100644 index 0000000..7bd3b5e --- /dev/null +++ b/app-shells/quoter/quoter-3.0_p1.ebuild @@ -0,0 +1,18 @@ +# Copyright 2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit vcs-snapshot + +DESCRIPTION="Quote arguments or standard input for usage in POSIX shell by eval" +HOMEPAGE="https://github.com/vaeth/quoter/" +SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="" + +src_install() { + emake DESTDIR="${ED}" install +} -- 2.45.2 From 90463b1cf3c545fa7e168298071158be94274ae0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sun, 6 Nov 2016 23:45:54 +0100 Subject: [PATCH 13/16] =?utf8?q?Zale=C5=BCno=C5=9Bci=20w=20app-portage/eix?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app-portage/eix/eix-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-portage/eix/eix-9999.ebuild b/app-portage/eix/eix-9999.ebuild index 7b92c64..c4ac101 100644 --- a/app-portage/eix/eix-9999.ebuild +++ b/app-portage/eix/eix-9999.ebuild @@ -21,8 +21,8 @@ IUSE="debug +dep doc nls optimization +required-use security strong-optimization BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl )" RDEPEND="${BOTHDEPEND} - app-shells/push - app-shells/quoter" + >=app-shells/push-2.0 + >=app-shells/quoter-3.0" DEPEND="${BOTHDEPEND} doc? ( dev-python/docutils ) >=sys-devel/gettext-0.18.3" -- 2.45.2 From 3b135b450e0883c9b2d0d79632394615f65969f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sun, 6 Nov 2016 23:48:55 +0100 Subject: [PATCH 14/16] Dodanie app-vim/extra-syntax-4-r1 --- app-vim/extra-syntax/extra-syntax-4-r1.ebuild | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 app-vim/extra-syntax/extra-syntax-4-r1.ebuild diff --git a/app-vim/extra-syntax/extra-syntax-4-r1.ebuild b/app-vim/extra-syntax/extra-syntax-4-r1.ebuild new file mode 100644 index 0000000..39ec8de --- /dev/null +++ b/app-vim/extra-syntax/extra-syntax-4-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="vim plugin: metapackage for all extra syntax packages" +HOMEPAGE="http://www.vim.org/" +LICENSE="metapackage" +KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" +SRC_URI="" +IUSE="" +SLOT="0" + +RDEPEND=" + ${RDEPEND} + app-vim/bnf-syntax + app-vim/brainfuck-syntax + app-vim/cfengine-syntax + app-vim/dhcpd-syntax + app-vim/ebnf-syntax + app-vim/eruby-syntax + app-vim/fluxbox-syntax + app-vim/gentoo-syntax + app-vim/gtk-syntax + app-vim/help-extra-syntax + app-vim/nagios-syntax + app-vim/ntp-syntax + app-vim/pam-syntax + app-vim/pgn-syntax + app-vim/selinux-syntax + app-vim/wikipedia-syntax + app-vim/xquery-syntax + app-vim/xsl-syntax" -- 2.45.2 From ad6717f76c6125214393b01b5a0021235126764d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Sun, 4 Dec 2016 20:36:11 +0100 Subject: [PATCH 15/16] =?utf8?q?Usuni=C4=99cie=20app-vim/extra-syntax?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app-vim/extra-syntax/extra-syntax-4-r1.ebuild | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 app-vim/extra-syntax/extra-syntax-4-r1.ebuild diff --git a/app-vim/extra-syntax/extra-syntax-4-r1.ebuild b/app-vim/extra-syntax/extra-syntax-4-r1.ebuild deleted file mode 100644 index 39ec8de..0000000 --- a/app-vim/extra-syntax/extra-syntax-4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -DESCRIPTION="vim plugin: metapackage for all extra syntax packages" -HOMEPAGE="http://www.vim.org/" -LICENSE="metapackage" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" -SRC_URI="" -IUSE="" -SLOT="0" - -RDEPEND=" - ${RDEPEND} - app-vim/bnf-syntax - app-vim/brainfuck-syntax - app-vim/cfengine-syntax - app-vim/dhcpd-syntax - app-vim/ebnf-syntax - app-vim/eruby-syntax - app-vim/fluxbox-syntax - app-vim/gentoo-syntax - app-vim/gtk-syntax - app-vim/help-extra-syntax - app-vim/nagios-syntax - app-vim/ntp-syntax - app-vim/pam-syntax - app-vim/pgn-syntax - app-vim/selinux-syntax - app-vim/wikipedia-syntax - app-vim/xquery-syntax - app-vim/xsl-syntax" -- 2.45.2 From 970cb938048cacc8fc624deb209e4797fba841b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Tue, 17 Jan 2017 15:34:14 +0100 Subject: [PATCH 16/16] =?utf8?q?Usuni=C4=99cie=20app-shells/push?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app-shells/push/Manifest | 1 - app-shells/push/push-2.0.ebuild | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 app-shells/push/Manifest delete mode 100644 app-shells/push/push-2.0.ebuild diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest deleted file mode 100644 index 869e65d..0000000 --- a/app-shells/push/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST push-2.0.tar.gz 2211 SHA256 2d5e1c5b580f77ac9fb65b7b75c6220ee88687b6e7340ccc746e42e5632604b0 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff WHIRLPOOL 6abbad060edbb3d9873c24b73bc61f38f6a4fd38633021e66f8d3a5a04b61dfcdec4c68afed5e8fe06f817cf924adfafb439ddb415c71fc4e1b52ce561ec6fa1 diff --git a/app-shells/push/push-2.0.ebuild b/app-shells/push/push-2.0.ebuild deleted file mode 100644 index 2d55029..0000000 --- a/app-shells/push/push-2.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit vcs-snapshot - -DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args" -HOMEPAGE="https://github.com/vaeth/push/" -SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="" - -src_install() { - dobin bin/push.sh - dodoc README -} -- 2.45.2