From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- app-portage/Manifest.gz | Bin 10081 -> 10072 bytes app-portage/eclass-manpages/Manifest | 6 - .../eclass-manpages-20180812.ebuild | 33 -- .../eclass-manpages-99999999.ebuild | 45 -- .../eclass-manpages/files/eclass-to-manpage.awk | 457 --------------------- .../eclass-manpages/files/eclass-to-manpage.sh | 44 -- app-portage/eclass-manpages/metadata.xml | 12 - app-portage/pfl/Manifest | 5 - .../pfl/files/e-file-20110906-http-response.patch | 11 - .../pfl/files/e-file-20110906-portageq.patch | 44 -- app-portage/pfl/files/pfl-2.4-reponame.patch | 11 - app-portage/pfl/pfl-2.4-r5.ebuild | 50 --- app-portage/pram/Manifest | 3 + app-portage/pram/metadata.xml | 16 + app-portage/pram/pram-1.ebuild | 23 ++ app-portage/repoman/Manifest | 1 - .../repoman/files/repoman-2.3.0-bug-586864.patch | 32 -- 17 files changed, 42 insertions(+), 751 deletions(-) delete mode 100644 app-portage/eclass-manpages/Manifest delete mode 100644 app-portage/eclass-manpages/eclass-manpages-20180812.ebuild delete mode 100644 app-portage/eclass-manpages/eclass-manpages-99999999.ebuild delete mode 100644 app-portage/eclass-manpages/files/eclass-to-manpage.awk delete mode 100755 app-portage/eclass-manpages/files/eclass-to-manpage.sh delete mode 100644 app-portage/eclass-manpages/metadata.xml delete mode 100644 app-portage/pfl/files/e-file-20110906-http-response.patch delete mode 100644 app-portage/pfl/files/e-file-20110906-portageq.patch delete mode 100644 app-portage/pfl/files/pfl-2.4-reponame.patch delete mode 100644 app-portage/pfl/pfl-2.4-r5.ebuild create mode 100644 app-portage/pram/Manifest create mode 100644 app-portage/pram/metadata.xml create mode 100644 app-portage/pram/pram-1.ebuild delete mode 100644 app-portage/repoman/files/repoman-2.3.0-bug-586864.patch (limited to 'app-portage') diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz index 8b57248e985e..4888e2911a23 100644 Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest deleted file mode 100644 index 236ef2e48ffb..000000000000 --- a/app-portage/eclass-manpages/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX eclass-to-manpage.awk 10909 BLAKE2B e41b792f8316c612609da17c16ba41f01a4fc27c847bc380a26a570abef030d6e11a74673d703da77e17bb3db796ed3207d95cd9d8e7604551a6d0b10c6a3e07 SHA512 c37d502f66c31b2e5be8c27071ade6bfe7617d84bbca57ab3ac9d0f2d3403281d50fd8c6bada2c3dbe29041bcef4c0dafc76506a1ddca82fc26aa83d4785bae2 -AUX eclass-to-manpage.sh 780 BLAKE2B 74c9580dd603e036f8209107794d39eb6705333312a98f1c1fba86feb807792ba8ae52420b3ab4b5296c6dbd42af597e591ce928c19b26c5fc80be09202973c3 SHA512 266f15ac5d2efc42ce792d9e0c1d91e99502a5cd93ee1b915fe952cdd894bc4e773014c3f6731d2a11a2d82466676035cff21a1d88070fe85f1dca915dca203c -DIST eclass-manpages-20180812.tar.xz 419912 BLAKE2B 35659ac43e43e71c600fb4955267c9d57ed36f29e0607150a8e8c061b158b6135a4b91f4e4c05fa178a03aa3068726ac13cd54e4cd135fbe152c8bebf81659bb SHA512 6d01070c6113e5d5f4102d466abaa03ae824350285ca71a5a4f84d859f6c473e8e92d3f5387b76c4bb5dc8bcedcc6b36a63e074d70725c87233dea4fa6a6d0c6 -EBUILD eclass-manpages-20180812.ebuild 1087 BLAKE2B f8e430423d389e06cfec6689539e28dbdcf61be418786df4aafd63314397c5b62383781fa8c2cfbd0b4bbeecf34ae401ecb092c8fd503f53e1513319abca6b4b SHA512 25b0db417330fb5c5caed47d9bafb7c0b4cc15c8c6d813db72ddd7264f201e246617305609e992f4d67dd130bd5f081cfdcb51438fc4370a9fec78a570e2b24d -EBUILD eclass-manpages-99999999.ebuild 954 BLAKE2B 654df18ee7a23338c3d87fbe1e545858aa8ef64bec0cc54e5795f7431e513776d1d40d136ffbd0061aedd63f956bb49e118f1f82de38acfdb80f3abc77125612 SHA512 ac8ecd64716f06e3130345e45b5d5ee2c5c339dac5429d0d765bfac0c50dcab433a6d210c5b425fd52c516ee2af8fb9cc47888b0a398da8fe0f85adb09409be9 -MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9 diff --git a/app-portage/eclass-manpages/eclass-manpages-20180812.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180812.ebuild deleted file mode 100644 index db10d2aba060..000000000000 --- a/app-portage/eclass-manpages/eclass-manpages-20180812.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Collection of Gentoo eclass manpages" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -# Keep the keywords stabled. No need to change to ~arch. -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" - -DEPEND="app-arch/xz-utils" - -# How to create a snapshot and upload it to your dev-space: -# -# mkdir eclass-manpages-$(date +%Y%m%d) -# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/ -# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d) -# xz -e eclass-manpages-$(date +%Y%m%d).tar -# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/ -# -# Then copy the ebuild and update your name in SRC_URI ;-). - -src_compile() { - env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die -} - -src_install() { - doman *.5 -} diff --git a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild b/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild deleted file mode 100644 index ea11ad476084..000000000000 --- a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Collection of Gentoo eclass manpages" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND=" - || ( - sys-apps/portage - sys-apps/portage-mgorny - )" - -S=${WORKDIR} - -genit() { - local e=${1:-${ECLASSDIR}} - einfo "Generating man pages from: ${e}" - # Need `bash` because the .sh isn't +x on the servers #451352 - env ECLASSDIR=${e} bash "${FILESDIR}"/eclass-to-manpage.sh || die -} - -src_compile() { - # First process any eclasses found in overlays. Then process - # the main eclassdir last so that its output will clobber anything - # that might have come from overlays. Main tree wins! - local o e - for o in $(portageq get_repos /) ; do - e="$(portageq get_repo_path / ${o})/eclass" - [[ -d ${e} ]] || continue - genit "${e}" || die - done - genit || die -} - -src_install() { - doman *.5 -} diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/app-portage/eclass-manpages/files/eclass-to-manpage.awk deleted file mode 100644 index b40eaf112091..000000000000 --- a/app-portage/eclass-manpages/files/eclass-to-manpage.awk +++ /dev/null @@ -1,457 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This awk converts the comment documentation found in eclasses -# into man pages for easier/nicer reading. -# -# If you wish to have multiple paragraphs in a description, then -# create empty comment lines. Paragraph parsing ends when the comment -# block does. - -# The format of the eclass description: -# @ECLASS: foo.eclass -# @MAINTAINER: -# -# @AUTHOR: -# -# @BUGREPORTS: -# -# @VCSURL: -# @SUPPORTED_EAPIS: -# @BLURB: -# @DESCRIPTION: -# -# @EXAMPLE: -# - -# The format of functions: -# @FUNCTION: foo -# @USAGE: [optional arguments to foo] -# @RETURN: -# @MAINTAINER: -# -# [@INTERNAL] -# @DESCRIPTION: -# - -# The format of function-specific variables: -# @VARIABLE: foo -# [@USER_VARIABLE] (set in make.conf, not ebuilds) -# [@INTERNAL] (internal eclass use variable) -# [@DEFAULT_UNSET] -# [@REQUIRED] -# @DESCRIPTION: -# -# foo="" - -# The format of eclass variables: -# @ECLASS-VARIABLE: foo -# [@PRE_INHERIT] (the variable must be set before inheriting the eclass) -# [@USER_VARIABLE] (set in make.conf, not ebuilds) -# [@OUTPUT_VARIABLE] (set by eclass, to be read in ebuilds) -# [@INTERNAL] (internal eclass use variable) -# [@DEFAULT_UNSET] -# [@REQUIRED] -# @DESCRIPTION: -# -# foo="" - -# Disable manpage generation: -# @DEAD - -# Common features: -# @CODE -# In multiline paragraphs, you can create chunks of unformatted -# code by using this marker at the start and end. -# @CODE -# -# @ROFF -# If you want a little more manual control over the formatting, you can -# insert roff macros directly into the output by using the @ROFF escape. - -function _stderr_msg(text, type, file, cnt) { - if (_stderr_header_done != 1) { - cnt = split(FILENAME, file, /\//) - print "\n" file[cnt] ":" > "/dev/stderr" - _stderr_header_done = 1 - } - - print " " type ":" NR ": " text > "/dev/stderr" -} -function warn(text) { - _stderr_msg(text, "warning") -} -function fail(text) { - _stderr_msg(text, "error") - exit(1) -} -function xfail(text) { - _stderr_msg(text, "error (ignoring)") - exit(77) -} - -function eat_line() { - ret = $0 - sub(/^# @[A-Z]*:[[:space:]]*/,"",ret) - getline - return ret -} -function eat_paragraph() { - code = 0 - ret = "" - getline - while ($0 ~ /^#/) { - # Only allow certain tokens in the middle of paragraphs - if ($2 ~ /^@/ && $2 !~ /^@(CODE|ROFF)$/) - break - - sub(/^#[[:space:]]?/, "", $0) - - # Escape . at start of line #420153 - if ($0 ~ /^[.]/) - $0 = "\\&" $0 - - # Translate @CODE into @ROFF - if ($1 == "@CODE" && NF == 1) { - if (code) - $0 = "@ROFF .fi" - else - $0 = "@ROFF .nf" - code = !code - } - - # Allow people to specify *roff commands directly - if ($1 == "@ROFF") - sub(/^@ROFF[[:space:]]*/, "", $0) - - ret = ret "\n" $0 - - # Handle the common case of trailing backslashes in - # code blocks to cross multiple lines #335702 - if (code && $NF == "\\") - ret = ret "\\" - getline - } - sub(/^\n/,"",ret) - return ret -} - -function pre_text(p) { - return ".nf\n" p "\n.fi" -} - -function man_text(p) { - return gensub(/-/, "\\-", "g", p) -} - -# -# Handle an @ECLASS block -# -function handle_eclass() { - eclass = $3 - eclass_maintainer = "" - eclass_author = "" - supported_eapis = "" - blurb = "" - desc = "" - example = "" - - # Sanity check the eclass name. #537392 - if (eclass !~ /[.]eclass$/) - fail(eclass ": @ECLASS name is missing a '.eclass' suffix") - - # first the man page header - print ".\\\" -*- coding: utf-8 -*-" - print ".\\\" ### DO NOT EDIT THIS FILE" - print ".\\\" ### This man page is autogenerated by eclass-to-manpage.awk" - print ".\\\" ### based on comments found in " eclass - print ".\\\"" - print ".\\\" See eclass-to-manpage.awk for documentation on how to get" - print ".\\\" your eclass nicely documented as well." - print ".\\\"" - print ".TH \"" toupper(eclass) "\" 5 \"" strftime("%b %Y") "\" \"Portage\" \"portage\"" - - # now eat the global data - getline - if ($2 == "@MAINTAINER:") - eclass_maintainer = eat_paragraph() - if ($2 == "@AUTHOR:") - eclass_author = eat_paragraph() - if ($2 == "@BUGREPORTS:") - reporting_bugs = eat_paragraph() - if ($2 == "@VCSURL:") - vcs_url = eat_line() - if ($2 == "@SUPPORTED_EAPIS:") - supported_eapis = eat_line() - if ($2 == "@BLURB:") - blurb = eat_line() - if ($2 == "@DESCRIPTION:") - desc = eat_paragraph() - if ($2 == "@EXAMPLE:") - example = eat_paragraph() - # in case they typo-ed the keyword, bail now - if ($2 ~ /^@/) - fail(eclass ": unknown keyword " $2) - - # finally display it - print ".SH \"NAME\"" - print eclass " \\- " man_text(blurb) - if (desc != "") { - print ".SH \"DESCRIPTION\"" - print man_text(desc) - } - if (example != "") { - print ".SH \"EXAMPLE\"" - print man_text(example) - } - - # sanity checks - if (blurb == "") - fail(eclass ": no @BLURB found") - if (eclass_maintainer == "") - warn(eclass ": no @MAINTAINER found") -} - -# -# Handle a @FUNCTION block -# -function show_function_header() { - if (_function_header_done != 1) { - print ".SH \"FUNCTIONS\"" - _function_header_done = 1 - } -} -function handle_function() { - func_name = $3 - usage = "" - funcret = "" - maintainer = "" - internal = 0 - desc = "" - - # make sure people haven't specified this before (copy & paste error) - if (all_funcs[func_name]) - fail(eclass ": duplicate definition found for function: " func_name) - all_funcs[func_name] = func_name - - # grab the docs - getline - if ($2 == "@USAGE:") - usage = eat_line() - if ($2 == "@RETURN:") - funcret = eat_line() - if ($2 == "@MAINTAINER:") - maintainer = eat_paragraph() - if ($2 == "@INTERNAL") { - internal = 1 - getline - } - if ($2 == "@DESCRIPTION:") - desc = eat_paragraph() - - if (internal == 1) - return - - show_function_header() - - # now print out the stuff - print ".TP" - print "\\fB" func_name "\\fR " man_text(usage) - if (desc != "") - print man_text(desc) - if (funcret != "") { - if (desc != "") - print "" - print "Return value: " funcret - } - - if (blurb == "") - fail(func_name ": no @BLURB found") - if (desc == "" && funcret == "") - fail(func_name ": no @DESCRIPTION found") -} - -# -# Handle @VARIABLE and @ECLASS-VARIABLE blocks -# -function _handle_variable() { - var_name = $3 - desc = "" - val = "" - default_unset = 0 - internal = 0 - required = 0 - - # additional variable classes - pre_inherit = 0 - user_variable = 0 - output_variable = 0 - - # make sure people haven't specified this before (copy & paste error) - if (all_vars[var_name]) - fail(eclass ": duplicate definition found for variable: " var_name) - all_vars[var_name] = var_name - - # grab the optional attributes - opts = 1 - while (opts) { - getline - if ($2 == "@DEFAULT_UNSET") - default_unset = 1 - else if ($2 == "@INTERNAL") - internal = 1 - else if ($2 == "@REQUIRED") - required = 1 - else if ($2 == "@PRE_INHERIT") - pre_inherit = 1 - else if ($2 == "@USER_VARIABLE") - user_variable = 1 - else if ($2 == "@OUTPUT_VARIABLE") - output_variable = 1 - else - opts = 0 - } - if ($2 == "@DESCRIPTION:") - desc = eat_paragraph() - - # extract the default variable value - # first try var="val" - op = "=" - regex = "^.*" var_name "=(.*)$" - val = gensub(regex, "\\1", 1, $0) - if (val == $0) { - # next try : ${var:=val} - op = "?=" - regex = "^[[:space:]]*:[[:space:]]*[$]{" var_name ":?=(.*)}" - val = gensub(regex, "\\1", 1, $0) - if (val == $0) { - if (default_unset + required + internal + output_variable == 0) - warn(var_name ": unable to extract default variable content: " $0) - val = "" - } else if (val !~ /^["']/ && val ~ / /) { - if (default_unset == 1) - warn(var_name ": marked as unset, but has value: " val) - val = "\"" val "\"" - } - } - if (length(val)) - val = " " op " \\fI" val "\\fR" - if (required == 1) - val = val " (REQUIRED)" - # TODO: group variables using those classes - if (pre_inherit == 1) - val = val " (SET BEFORE INHERIT)" - if (user_variable == 1) - val = val " (USER VARIABLE)" - if (output_variable == 1) - val = val " (GENERATED BY ECLASS)" - - # check for invalid combos - if (internal + pre_inherit + user_variable + output_variable > 1) - fail(var_name ": multiple variable classes specified") - - if (internal == 1) - return "" - - # now accumulate the stuff - ret = \ - ".TP" "\n" \ - "\\fB" var_name "\\fR" val "\n" \ - man_text(desc) - - if (desc == "") - fail(var_name ": no @DESCRIPTION found") - - return ret -} -function handle_variable() { - show_function_header() - ret = _handle_variable() - if (ret == "") - return - print ret -} -function handle_eclass_variable() { - ret = _handle_variable() - if (ret == "") - return - if (eclass_variables != "") - eclass_variables = eclass_variables "\n" - eclass_variables = eclass_variables ret -} - -# -# Spit out the common footer of manpage -# -function handle_footer() { - if (eclass_variables != "") { - print ".SH \"ECLASS VARIABLES\"" - print man_text(eclass_variables) - } - if (eclass_author != "") { - print ".SH \"AUTHORS\"" - print pre_text(man_text(eclass_author)) - } - if (eclass_maintainer != "") { - print ".SH \"MAINTAINERS\"" - print pre_text(man_text(eclass_maintainer)) - } - print ".SH \"REPORTING BUGS\"" - print reporting_bugs - print ".SH \"FILES\"" - print ".BR " eclass - print ".SH \"SEE ALSO\"" - print ".BR ebuild (5)" - print pre_text(gensub("@ECLASS@", eclass, 1, vcs_url)) -} - -# -# Init parser -# -BEGIN { - state = "header" - reporting_bugs = "Please report bugs via https://bugs.gentoo.org/" - vcs_url = "https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@" -} - -# -# Main parsing routine -# -{ - if (state == "header") { - if ($0 ~ /^# @ECLASS:/) { - handle_eclass() - state = "funcvar" - } else if ($0 == "# @DEAD") { - eclass = "dead" - exit(77) - } else if ($0 == "# @eclass-begin") { - # White list old eclasses that haven't been updated so we can block - # new ones from being added to the tree. - if (eclass == "") - xfail("java documentation not supported") - fail("java documentation not supported") - } else if ($0 ~ /^# @/) - warn("Unexpected tag in \"" state "\" state: " $0) - } else if (state == "funcvar") { - if ($0 ~ /^# @FUNCTION:/) - handle_function() - else if ($0 ~ /^# @VARIABLE:/) - handle_variable() - else if ($0 ~ /^# @ECLASS-VARIABLE:/) - handle_eclass_variable() - else if ($0 ~ /^# @/) - warn("Unexpected tag in \"" state "\" state: " $0) - } -} - -# -# Tail end -# -END { - if (eclass == "") - xfail("eclass not documented yet (no @ECLASS found)") - else if (eclass != "dead") - handle_footer() -} diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/app-portage/eclass-manpages/files/eclass-to-manpage.sh deleted file mode 100755 index 5f389390d60e..000000000000 --- a/app-portage/eclass-manpages/files/eclass-to-manpage.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -: ${ECLASSDIR:=${0%/*}/../../../eclass} -: ${FILESDIR:=${ECLASSDIR}/../app-portage/eclass-manpages/files} - -AWK="gawk" -while [[ $# -gt 0 ]] ; do - case $1 in - -e) ECLASSDIR=$2; shift;; - -f) FILESDIR=$2; shift;; - -d) AWK="dgawk";; - *) break;; - esac - shift -done - -if [[ ! -d ${ECLASSDIR} ]] ; then - echo "Usage: ${0##*/} [-e eclassdir] [-f eclass-to-manpage.awk FILESDIR] [eclasses]" 1>&2 - exit 1 -fi - -[[ $# -eq 0 ]] && set -- "${ECLASSDIR}"/*.eclass - -ret=0 -for e in "$@" ; do - set -- \ - ${AWK} \ - -f "${FILESDIR}"/eclass-to-manpage.awk \ - ${e} - if [[ ${AWK} == "gawk" ]] ; then - "$@" > ${e##*/}.5 - tret=$? - if [[ ${tret} -ne 0 ]] ; then - rm -f ${e##*/}.5 - if [[ ${tret} -ne 77 ]] ; then - echo "FAIL: ${e}" - ret=1 - fi - fi - else - "$@" - fi -done -exit ${ret} diff --git a/app-portage/eclass-manpages/metadata.xml b/app-portage/eclass-manpages/metadata.xml deleted file mode 100644 index adfe3aaf03f3..000000000000 --- a/app-portage/eclass-manpages/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mgorny@gentoo.org - Michał Górny - - - tools-portage@gentoo.org - Gentoo Portage tools team - - diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest index 60609e2d2851..1ddc1c471bcb 100644 --- a/app-portage/pfl/Manifest +++ b/app-portage/pfl/Manifest @@ -1,8 +1,3 @@ -AUX e-file-20110906-http-response.patch 356 BLAKE2B b995c07f558e398615fcaf74e87fae5599d651714707e72415a07206d637c1432b7e185b028f2002c54dc8a903bd6ee7c8abefd5ad314bb8d809144543453b17 SHA512 92d469ebff864e47a196db012d4b04422700b76bddbdcd03c8c2dce26015f2e354b41d4cea0e458383ca72f356843d137f3de64b78f0ddf416fb31d846dbcbab -AUX e-file-20110906-portageq.patch 1256 BLAKE2B e7cbbc0de5c592b4088d732f4f5a8c03d32842b4a375aedbcac4d82de11760221ea170a19fbb54cc909b4383e693b9ac3a1970047b6aeca0f32ebe10cf7bb50a SHA512 370f74f68888860e8b8d82ea55288c67df45e946e3fc1ff6e4a0c24a4036a045a942347c7eaee02574f7c3d66a6c5c5b3a2208a2c7457f4e7d1fed65e95466aa -AUX pfl-2.4-reponame.patch 336 BLAKE2B 246570c1c8e77a0cedbac41a9f639cf9ebf1c6c0ed40eb968f4db1c03f6c4cad6688faf86d384b81f7c835438853a43833ff27b854a5d4de41a788934284cae5 SHA512 bb1d4af5b29f070ef75cebd0374fd50556bbc38c8b7b15256c1156dae9887b6e794a0bcc35a199e4e232cae20251a7b74da614779ed589ae9f0420829a5a4659 -DIST pfl-2.4.tar.bz2 6274 BLAKE2B 7cf72dc4b9182b3ea43fb1661330debeb79afdaaab8a519dc2f8f0a048f5f7e66ee2466a44b4683f36eebae248f6df407d0d0fc3914f3a8eb427bc2af0692bb6 SHA512 a33712bc38d6e02474856dc3a9eac0d39be032a9554f2510815602e94648cd6bf499111a3354568788ddcc0a653a2ac54fac56b0af03fb1cf822ec44ffcb1d72 DIST pfl-3.0.tar.bz2 4332 BLAKE2B 8e1dd17d0017cd972c02a9e8d3610a036447d7b898c6f0a9557ef2c598c0581a09ee7a72ca04860f3695d06d3fe3ee9426a99b1158db71e232ccaff69479d068 SHA512 94f7cc575689f46a0b9ce50c3de7d6a42767766c8c447616c7f3587438a6b3c09e5d00b3b80cd71b0d386ead1e396d49aa266ff408146f85b18e25ebfe887108 -EBUILD pfl-2.4-r5.ebuild 1198 BLAKE2B f5bb1fc20d4de3e00b6bfc3dd220605148d12888b7807071d499d923133317e10944e941f38c51c96d940578d071487ee5a83fe8cc7d24bdf338c955cd89514b SHA512 146f86054a8d782bf1947ef46b9710155cc938b231aed95e27d917fab8103021592cf5a853e6418927a19c7da4fdbe7297b5b99c96c4152092b43b749cc72889 EBUILD pfl-3.0-r2.ebuild 1054 BLAKE2B e4db877c8886c4be510cb820428c29c805aa45f00ec7caf9e3586a1de9997112f64c719d919eaa583664231c4255f083dd012f10efd77af6460bd065bdfa143e SHA512 ff15cb1e506aa372506f4bab4389e86cccbe693ac86e898e5044496d6b1ee345f792e544c3a37dd07045a5cc5fed41f2174e024b731055ce10f632f21dc08c11 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b diff --git a/app-portage/pfl/files/e-file-20110906-http-response.patch b/app-portage/pfl/files/e-file-20110906-http-response.patch deleted file mode 100644 index 672cde5f5375..000000000000 --- a/app-portage/pfl/files/e-file-20110906-http-response.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/e-file 2013-10-14 21:33:54.421701259 +0200 -+++ bin/e-file 2013-10-14 21:34:10.004702370 +0200 -@@ -25,7 +25,7 @@ - - URL="http://www.portagefilelist.de/index.php/Special:PFLQuery2?file=$1&searchfile=lookup&lookup=file&txt" - --curl -s $URL | awk -v isgentoo=$isgentoo ' -+curl -s -f $URL | awk -v isgentoo=$isgentoo ' - BEGIN{ - FOUND=0 - if(isgentoo){ diff --git a/app-portage/pfl/files/e-file-20110906-portageq.patch b/app-portage/pfl/files/e-file-20110906-portageq.patch deleted file mode 100644 index 2a65519f459b..000000000000 --- a/app-portage/pfl/files/e-file-20110906-portageq.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- bin/e-file -+++ bin/e-file -@@ -16,11 +16,11 @@ - exit 1 - fi - --if type emerge >/dev/null 2>&1; then -+if type portageq >/dev/null 2>&1; then - isgentoo=1 - else - isgentoo=0 -- echo 'WARNING: "emerge" no found. If your system is not gentoo, a part of function will not available!' >&2 -+ echo 'WARNING: "portageq" no found. If your system is not gentoo, a part of function will not available!' >&2 - fi - - URL="http://www.portagefilelist.de/index.php/Special:PFLQuery2?file=$1&searchfile=lookup&lookup=file&txt" -@@ -29,8 +29,7 @@ - BEGIN{ - FOUND=0 - if(isgentoo){ -- "emerge --info | grep PORTDIR" | getline -- split($0,PORTDIR,/\"/) -+ "portageq get_repo_path $(portageq envvar EROOT) gentoo" | getline PORTDIR - } - } - { -@@ -75,7 +74,7 @@ - } - - NF=0 -- cmd="(grep -h HOMEPAGE\\= " PORTDIR[2] "/" pkg "/*.ebuild | tail -n 1)2>/dev/null" -+ cmd="(grep -h HOMEPAGE\\= " PORTDIR "/" pkg "/*.ebuild | tail -n 1)2>/dev/null" - cmd | getline - if(NF==0){ - HOMEPAGE="" -@@ -85,7 +84,7 @@ - } - - NF=0 -- cmd="(grep -h DESCRIPTION " PORTDIR[2] "/" pkg "/*.ebuild | tail -n 1)2>/dev/null" -+ cmd="(grep -h DESCRIPTION " PORTDIR "/" pkg "/*.ebuild | tail -n 1)2>/dev/null" - cmd | getline - if(NF==0){ - DESCRIPTION="" diff --git a/app-portage/pfl/files/pfl-2.4-reponame.patch b/app-portage/pfl/files/pfl-2.4-reponame.patch deleted file mode 100644 index a9041d46b329..000000000000 --- a/app-portage/pfl/files/pfl-2.4-reponame.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pfl/pfl.py (Revision 68) -+++ pfl/pfl.py (Arbeitskopie) -@@ -226,6 +226,8 @@ - v = '%s-%s' % (v, r) - - repo, = self._vardbapi.aux_get(cpv, ['repository']) -+ if len(repo) == 0: -+ repo, = self._vardbapi.aux_get(cpv, ['REPOSITORY']) - - # timestamp of merge - mergedstamp = self._vardbapi.aux_get(cpv, ['_mtime_'])[0] diff --git a/app-portage/pfl/pfl-2.4-r5.ebuild b/app-portage/pfl/pfl-2.4-r5.ebuild deleted file mode 100644 index a803e6e0b359..000000000000 --- a/app-portage/pfl/pfl-2.4-r5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit eutils distutils-r1 - -DESCRIPTION="Searchable online file/package database for Gentoo" -HOMEPAGE="http://www.portagefilelist.de" -SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+network-cron" - -DEPEND="" -RDEPEND="${DEPEND} - net-misc/curl - || ( - sys-apps/portage[${PYTHON_USEDEP}] - sys-apps/portage-mgorny[${PYTHON_USEDEP}] - )" - -src_prepare() { - epatch "${FILESDIR}"/e-file-20110906-http-response.patch \ - "${FILESDIR}"/e-file-20110906-portageq.patch \ - "${FILESDIR}"/pfl-2.4-reponame.patch -} - -python_install_all() { - if use network-cron ; then - exeinto /etc/cron.weekly - doexe cron/pfl - fi - - keepdir /var/lib/${PN} - distutils-r1_python_install_all -} - -pkg_postinst() { - if [[ ! -e "${EROOT%/}/var/lib/${PN}/pfl.info" ]]; then - touch "${EROOT%/}/var/lib/${PN}/pfl.info" || die - chown -R 0:portage "${EROOT%/}/var/lib/${PN}" || die - chmod 775 "${EROOT%/}/var/lib/${PN}" || die - fi -} diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest new file mode 100644 index 000000000000..5559c32a0144 --- /dev/null +++ b/app-portage/pram/Manifest @@ -0,0 +1,3 @@ +DIST pram-1.tar.gz 3759 BLAKE2B da8670ceb689893bde486f6b7332dae8f793b945c71034354853195c4639c2a515533f56fd5ea67b91aba550219cde0a50d7c4c7e60bfeda1877904ecb4e2872 SHA512 fb0d2a2b177973d710d2e68eda82101d64e573e9d90e6aeb2a7bf2be86bcba01b4047c857d6d29d40a5768490a8f999aa001e7e5e45022cf2d1c08bed8ee8d44 +EBUILD pram-1.ebuild 481 BLAKE2B 7f94cb01c1e1523c4c98bda91caa88f4d4e5db398aa5e856edc704af74635feb7f2a0edd475eff43a349b1cab03e6eb49068bbbd89cca37f8baaf70711360882 SHA512 ccd69af34182419703430ecb7c5846cd2d6cf6af2cab47822805639630881607582dde068c80dc84d53fd8fa5edbe8e912cc0a225a159cc1d94220861c242575 +MISC metadata.xml 497 BLAKE2B ed7f60c0693229da828921bfcf6e0a579a7ac07fda8bfa47124677d83e288a738a9c237a71070bacdaadce91708827ca7bc2ecf1755cec249945fe6fae752a9f SHA512 5588a6d5c641976a95b0696de4343cf3f96ef67515339e33f22a6f1255d05c6675a5f440a32354513f96fea7c57ae15230f02610f0650a400a2ef25815a5400c diff --git a/app-portage/pram/metadata.xml b/app-portage/pram/metadata.xml new file mode 100644 index 000000000000..af57dcce87b9 --- /dev/null +++ b/app-portage/pram/metadata.xml @@ -0,0 +1,16 @@ + + + + + mgorny@gentoo.org + Michał Górny + + + + mgorny@gentoo.org + Michał Górny + + https://github.com/mgorny/pram/issues/ + mgorny/pram + + diff --git a/app-portage/pram/pram-1.ebuild b/app-portage/pram/pram-1.ebuild new file mode 100644 index 000000000000..718e513c9cd8 --- /dev/null +++ b/app-portage/pram/pram-1.ebuild @@ -0,0 +1,23 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Tool to ease merging Pull Requests and git patches" +HOMEPAGE="https://github.com/mgorny/pram" +SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-vcs/git + net-misc/wget[ssl] + virtual/editor + !dev-perl/Gentoo-App-Pram" + +src_install() { + dobin pram + einstalldocs +} diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest index 7829c1384887..5ae047b71af8 100644 --- a/app-portage/repoman/Manifest +++ b/app-portage/repoman/Manifest @@ -1,4 +1,3 @@ -AUX repoman-2.3.0-bug-586864.patch 1034 BLAKE2B a2641d1c47907ec6069c490de30aabdcb654fefbff36665899463f2bd4fab343f254ab54038b5756c32b8df9058f270e9ef17c743898bdfec6b65847dae2f443 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e DIST repoman-2.3.10.tar.bz2 87545 BLAKE2B 67e1e514eebd50516aeaea2708ebe4c9d69cbf61add5fa19a31681f085a6dd8c39695cb63d9b4cd23caa955c85669148fce3c31c08b913e31839ff186e3b3ecc SHA512 498ce493661eb5939a5f1345337e11a84e97fc11a0556f2660bd8900f0cb0f6340a401e5728c4557248dd54bcdc0a7d2c72dbb23eea3acb35e053d7359c0e535 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367 DIST repoman-2.3.12.tar.bz2 86737 BLAKE2B b27d89b0fe62d52607c55b1cf1d5662699d1e46ad7ef85553d642be8fb915435f1748914b9d63febb7dddd67bd5623f72ba4aa9ca7634af98f85634af91a74c1 SHA512 64bede0e1deb7d2a8c4c702d6845e84f8937cbfb54f6f35d88a10b13c961f28948f17c9e1d623bf0f663b22f98dc4e8f514c200fb4f1b93d7535addd5efa1342 diff --git a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch deleted file mode 100644 index adba72fdcc57..000000000000 --- a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ef33db45a0c1d462411d4ced1857a322c0ab28f6 Mon Sep 17 00:00:00 2001 -From: Zac Medico -Date: Thu, 23 Jun 2016 23:22:41 -0700 -Subject: repoman: skip QA checks in manifest mode (bug 586864) - -The relevent Scanner loop control logic broke in commit 4062c69dc27a -because it was relying on the return value from the Manifest module's -"check" method. - -Fixes: 4062c69dc27a ("repoman: Move manifest generation to modules/commit/manifest.py") -X-Gentoo-Bug: 586864 -X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864 ---- - pym/repoman/scanner.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py -index d7cd81f..8999751 100644 ---- a/pym/repoman/scanner.py -+++ b/pym/repoman/scanner.py -@@ -294,6 +294,8 @@ class Scanner(object): - - if self.generate_manifest: - manifest.Manifest(**self.kwargs).update_manifest(checkdir) -+ if self.options.mode == 'manifest': -+ continue - checkdirlist = os.listdir(checkdir) - - dynamic_data = { --- -cgit v0.12 - -- cgit v1.2.3