[gentoo-commits] repo/gentoo:master commit in: dev-util/cpuinfo-collection/
commit: a630be31f9de6d8e6f966c52f733a5dfdf28ae6f
Author: Michał Górny gentoo org>
AuthorDate: Sat Oct 12 07:01:09 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Oct 12 07:01:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a630be31
dev-util/cpuinfo-collection: Drop old (EAPI 0)
Signed-off-by: Michał Górny gentoo.org>
dev-util/cpuinfo-collection/Manifest | 1 -
.../cpuinfo-collection-20070104.ebuild | 23 --
2 files changed, 24 deletions(-)
diff --git a/dev-util/cpuinfo-collection/Manifest
b/dev-util/cpuinfo-collection/Manifest
index 2b9251dad41..da7b6851572 100644
--- a/dev-util/cpuinfo-collection/Manifest
+++ b/dev-util/cpuinfo-collection/Manifest
@@ -1,2 +1 @@
-DIST test_proc-04January2007.tar.gz 28831 BLAKE2B
1d405fb971eb0a4958a6127fadd9535ba24529b88d63e22ee726b6296ef5bf77f20e739b4c9475f8f20879950ed9fdb85a53f19dd7f14b91613b51b3a8403407
SHA512
6ff9f42c0847ef897069a7b36ad184b05ac022d1db5ab581e87d2992ee2a511218ef2019a0a94aadb91038e2b99e530618b0b6a380b0aa36f4178620e6719922
DIST test_proc-14November2010.tar.gz 95697 BLAKE2B
476cf9784d3718ca27f030bc85ca1f526db43cc740ae77fb7cd4b45fad13ead8645ab9a17fec1216d54da8390e04205960c543cf4205f9f6677afe38dafd054c
SHA512
2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
b/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
deleted file mode 100644
index 2355333bcff..000
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=test_proc-${PV:6:2}January${PV:0:4}
-DESCRIPTION="huge collection of /proc/cpuinfo files"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/;
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz;
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
- insinto /usr/share/cpuinfo
- doins -r * || die
-}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/vtwm/
commit: a0a9c16e328a97125676ef05ffa2a52f4cd9e7e4
Author: Michał Górny gentoo org>
AuthorDate: Sat Oct 12 07:01:24 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Oct 12 07:01:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a9c16e
x11-wm/vtwm: Drop old (EAPI 0)
Signed-off-by: Michał Górny gentoo.org>
x11-wm/vtwm/Manifest | 1 -
x11-wm/vtwm/vtwm-5.4.6a.ebuild | 42 --
2 files changed, 43 deletions(-)
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index 05340f23564..50231ab3294 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -1,2 +1 @@
-DIST vtwm-5.4.6a.tar.gz 992488 BLAKE2B
15a28556c78a9fc81f656eb6d50a2bf9f2d86ef6938cb8926cbb909c2c0edce6cbbe09270e72dfc29f9c665aecc36dcd57bcbf26af96b1f3b24518427b652395
SHA512
2500dfe50fae90cbc2b3dcf1dd05c330abd978a51abdf2768b3231fabdd71975f3bbdc341ebe25101773009cbf7cb12f263a013165bbda5c048e8b602686
DIST vtwm-5.4.7.tar.gz 1021160 BLAKE2B
a669e21d2fad5a93036c866053fb73db25f3ab1e877256650d4cc295db3861bd6ff90517e00d7042b00621c05d1947b9747380eac72fec85cfc1d68c8a6b59bb
SHA512
abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728
diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
deleted file mode 100644
index b97b7621cc6..000
--- a/x11-wm/vtwm/vtwm-5.4.6a.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
-HOMEPAGE="http://www.vtwm.org/;
-SRC_URI="ftp://ftp.visi.com/users/hawkeyd/X/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libXpm"
-DEPEND="${RDEPEND}
- app-text/rman
- x11-base/xorg-proto
- x11-misc/imake"
-
-src_compile() {
- xmkmf || die "xmkmf failed"
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- make BINDIR=/usr/bin \
- LIBDIR=/etc/X11 \
- MANPATH=/usr/share/man \
- DESTDIR="${D}" install || die "make install failed"
-
- echo "#!/bin/sh" > vtwm
- echo "xsetroot -cursor_name left_ptr &" >> vtwm
- echo "/usr/bin/vtwm" >> vtwm
- exeinto /etc/X11/Sessions
- doexe vtwm || die
- dodoc doc/{4.6.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} ||
die
-}
[gentoo-commits] proj/portage:master commit in: lib/portage/_emirrordist/
commit: 8c92c14269dfadc87413ebd952397021b1c4dcc7
Author: Michał Górny gentoo org>
AuthorDate: Fri Oct 11 21:24:12 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Oct 12 06:40:29 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8c92c142
emirrordist: Support specifying custom --layout-conf
Support specifying custom layout.conf file to use. This makes it
possible to start propagating new mirror layout without exposing it
to users.
Reviewed-by: Zac Medico gentoo.org>
Closes: https://github.com/gentoo/portage/pull/465
Signed-off-by: Michał Górny gentoo.org>
lib/portage/_emirrordist/Config.py | 6 --
lib/portage/_emirrordist/main.py | 6 ++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/portage/_emirrordist/Config.py
b/lib/portage/_emirrordist/Config.py
index ace3b0a6a..c1f59f725 100644
--- a/lib/portage/_emirrordist/Config.py
+++ b/lib/portage/_emirrordist/Config.py
@@ -74,8 +74,10 @@ class Config(object):
options.deletion_db, 'deletion')
self.layout_conf = MirrorLayoutConfig()
- self.layout_conf.read_from_file(
- os.path.join(self.distfiles, 'layout.conf'))
+ if options.layout_conf is None:
+ options.layout_conf = os.path.join(self.distfiles,
+ 'layout.conf')
+ self.layout_conf.read_from_file(options.layout_conf)
self.layouts = self.layout_conf.get_all_layouts()
def _open_log(self, log_desc, log_path, mode):
diff --git a/lib/portage/_emirrordist/main.py b/lib/portage/_emirrordist/main.py
index 0ae45ab6f..ce0c2929f 100644
--- a/lib/portage/_emirrordist/main.py
+++ b/lib/portage/_emirrordist/main.py
@@ -193,6 +193,12 @@ common_options = (
"distfiles between layouts",
"action" : "store_true"
},
+ {
+ "longopt" : "--layout-conf",
+ "help" : "specifies layout.conf file to use instead of "
+ "the one present in the distfiles directory",
+ "metavar" : "FILE"
+ },
)
def parse_args(args):
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/highline/
commit: 1b06b1d5715b78e1977db46a8722d981ed7613c2
Author: Hans de Graaff gentoo org>
AuthorDate: Sat Oct 12 05:27:27 2019 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sat Oct 12 05:27:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b06b1d5
dev-ruby/highline: add 2.0.3
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Hans de Graaff gentoo.org>
dev-ruby/highline/Manifest | 1 +
dev-ruby/highline/highline-2.0.3.ebuild | 34 +
2 files changed, 35 insertions(+)
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 6614f97b533..5126c144b0c 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,3 +1,4 @@
DIST highline-1.7.8.gem 224768 BLAKE2B
683fa70e3ea4bf697ab5a1cd40da2528e2586f8fe12fb0ffb799938f2bfa2efe64fe1424c0ee1f90ae3df69f86a92f44eebcbb2ab34f18b3c4cdbb143e596067
SHA512
85f57ab732009cc961b824e252f0b65bbe7c0a8c97849d453773a331016b2ea8fa0efe393bc1a0073eae6d3cf523d97b9434cd73bdceed55bc069be0b6f4b41d
DIST highline-2.0.1.tar.gz 233862 BLAKE2B
ca65792d99f31a03f3ae86c774498692197b6e7db5bef6c3c47a88edeb476c0b41abb3afd7640eab16d2946235a72e247318de14ad600e542a999c124b96b03c
SHA512
1d6176465f0f1dd21084b5632e47b52a734ec97c1de849c40d4e904abc1fa1ff33ad8f70aba10047debfad16d60364b3acab224a6e57f6278c27c9c25ab37fa9
DIST highline-2.0.2.tar.gz 234108 BLAKE2B
5d4b234d03e4569348a68991dd2319afd329c9840858d9e6686afc57c24cfda8836d5c912072ccd14b61a25ceaed64e46a44c7c5f4e930658b8827ccb74ac08b
SHA512
07098366a7c59f2b0bfb194f92daff4f7bc16c2e78e0a6d85da50f9a72e58cafe0281c0e8ee86f84f31e70228f09b75e9e5bcb73dd05256118279e0c02a3ccee
+DIST highline-2.0.3.tar.gz 234205 BLAKE2B
4748c3ad8a15e551162ab9f2eb6e176297d833d13e6f5db7898f99c71f25e8a2a01057b0438c5d30b56a66333bbba0da1a435cfa07db97f2ffc5e301157618ef
SHA512
f432c8836040bcfb147a84efa2dd3feee7f3f6e03eafbf4232e9457aeef8cb9ca83fcf854d3b261f59a16abc3f2c8fc0f1279a7efeb07dea8a13be22ebde
diff --git a/dev-ruby/highline/highline-2.0.3.ebuild
b/dev-ruby/highline/highline-2.0.3.ebuild
new file mode 100644
index 000..d1cc7672f8f
--- /dev/null
+++ b/dev-ruby/highline/highline-2.0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="highline.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby"
+HOMEPAGE="https://github.com/JEG2/highline;
+SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+all_ruby_prepare() {
+ # fix up gemspec file not to call git
+ sed -i -e 's/git ls-files -z/find -print0/' highline.gemspec || die
+
+ # Avoid unneeded dependencies
+ sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
+ -e '/PackageTask/,/end/ s:^:#:' Rakefile || die
+ sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+ # Remove almost empty doc directory to allow rdoc recipe to work
+ rm -rf doc || die
+}
