[gentoo-commits] repo/dev/tamiko:master commit in: sys-apps/likwid/files/, sys-apps/likwid/
commit: b509733e3a93ec709fcc15e85afcf0fea67f89c9 Author: Matthias Maier gentoo org> AuthorDate: Thu Oct 31 04:47:52 2019 + Commit: Matthias Maier gentoo org> CommitDate: Thu Oct 31 04:47:52 2019 + URL:https://gitweb.gentoo.org/repo/dev/tamiko.git/commit/?id=b509733e sys-apps/likwid: add package and use bundled lua Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Matthias Maier gentoo.org> sys-apps/likwid/Manifest | 1 + .../likwid/files/likwid-4.3.1-fix-gnustack.patch | 32 + sys-apps/likwid/likwid-4.3.4-r50.ebuild| 151 + sys-apps/likwid/metadata.xml | 11 ++ 4 files changed, 195 insertions(+) diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest new file mode 100644 index 000..4b7da33 --- /dev/null +++ b/sys-apps/likwid/Manifest @@ -0,0 +1 @@ +DIST likwid-4.3.4.tar.gz 1584829 SHA256 5c0d1c66b25dac8292a02232f06454067f031a238f010c62f40ef913c6609a83 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2 WHIRLPOOL 956070af7bd2893bfe8bbd994d44ba783795916f3f70e0253501e798b2cc4880a77a541c4089749decd4fd4ba14e7170c3404096b334377ac6caa322d1ed8aaa diff --git a/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch b/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch new file mode 100644 index 000..c543a6c --- /dev/null +++ b/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch @@ -0,0 +1,32 @@ +--- likwid-likwid-4.3.1/bench/Makefile.org 2018-02-26 14:03:17.706837535 +0800 likwid-likwid-4.3.1/bench/Makefile 2018-02-26 14:04:19.427195208 +0800 +@@ -115,6 +115,7 @@ + $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.pas + @echo "===> ASSEMBLE $@" + $(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $< '$(DEFINES)' ++ @cat ../fix_gnustack.txt >> $(BUILD_DIR)/$*.s + $(Q)$(AS) $(ASFLAGS) $(BUILD_DIR)/$*.s -o $@ + + ifeq ($(findstring $(MAKECMDGOALS),clean),) + +diff --git a/fix_gnustack.txt b/fix_gnustack.txt +new file mode 100644 +index 000..965af94 +--- /dev/null likwid-likwid-4.1.1/fix_gnustack.txt +@@ -0,0 +1,3 @@ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif + +--- likwid-likwid-4.3.1/src/loadData.S.org 2018-02-26 14:06:16.418872121 +0800 likwid-likwid-4.3.1/src/loadData.S 2018-02-26 14:19:03.281289307 +0800 +@@ -41,4 +41,6 @@ + #endif + .size _loadData, .-_loadData + +- ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif + diff --git a/sys-apps/likwid/likwid-4.3.4-r50.ebuild b/sys-apps/likwid/likwid-4.3.4-r50.ebuild new file mode 100644 index 000..59693e7 --- /dev/null +++ b/sys-apps/likwid/likwid-4.3.4-r50.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +FORTRAN_NEEDED=fortran +#PYTHON_COMPAT=( python3_{5,6,7} ) + +# 4.3.4 will need python-single-r1 +inherit fcaps fortran-2 linux-info toolchain-funcs + +DESCRIPTION="A performance-oriented tool suite for x86 multicore environments" +HOMEPAGE="https://github.com/rrze-likwid/likwid; +SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz; + +LICENSE="GPL-3+ BSD MIT" + +SLOT="0" +KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64 +IUSE="fortran" # ${PYTHON_REQUIRED_USE} + +CDEPEND="dev-lang/perl" + +# filter/json uses Python3 +RDEPEND="${CDEPEND}" + +DEPEND="${CDEPEND}" + +CONFIG_CHECK="~X86_MSR" + +FILECAPS=( + -M 755 cap_sys_rawio+ep usr/sbin/likwid-accessD + -- + -M 755 cap_sys_rawio+ep usr/sbin/likwid-setFreq +) + +PATCHES=( + "${FILESDIR}/${PN}-4.3.1-fix-gnustack.patch" +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + # Ensure we build with a non executable stack + sed \ + -e '/^SHARED_CFLAGS/s/$/ -Wa,--noexecstack/' \ + -i make/include_{GCC*,CLANG}.mk \ + || die "Failed to set nonexecstack" + + # Make the install targets respect Q= for being quiet or not + # MUCH easier for debugging + sed -r \ + -e '/^install/,/^[a-z]/{/^\t@/{ s/@/$(Q)/; }}' \ + -i \ + Makefile || die "Failed to sed Makefile" + + sed -i \ + -e '/^\.NOTPARALLEL:/d' \ + Makefile \ + bench/Makefile \ + ext/hwloc/Makefile || die "Failed to re-enable parallel" + + default +} + +export_emake_opts() { + # Warning: this build system uses PREFIX in a way that differs from + # autoconf! It's more like: + # PREFIX=$(DESTDIR)$(INSTALLED_PREFIX) + # it's not 100% like that, because parts of the Makefiles are inconsistent. + # this is the same solution used in the upstream RPM specs + # these variables are uppercase so they match what's put into Make. +
[gentoo-commits] proj/gentoo-bugzilla: New tag: gentoo-5.0.4.14
commit: Commit: Michał Górny gentoo org> CommitDate: Thu Oct 31 03:43:29 2019 + New tag: gentoo-5.0.4.14
[gentoo-commits] proj/gentoo-bugzilla:master commit in: template/en/default/bug/
commit: 1e91418328b01e228577120817471a435a9cb801 Author: Michał Górny gentoo org> AuthorDate: Fri Sep 20 21:14:38 2019 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 31 03:42:38 2019 + URL: https://gitweb.gentoo.org/proj/gentoo-bugzilla.git/commit/?id=1e914183 bug template: Add a link to clone in same product Signed-off-by: Michał Górny gentoo.org> template/en/default/bug/navigate.html.tmpl | 4 1 file changed, 4 insertions(+) diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl index b5e3ba7a2..21db1128f 100644 --- a/template/en/default/bug/navigate.html.tmpl +++ b/template/en/default/bug/navigate.html.tmpl @@ -17,6 +17,10 @@ -Clone This [% terms.Bug %] +-Clone In The Same +Product [%# Links to more things users can do with this bug. %] [% Hook.process("links") %] -Top of page
[gentoo-commits] proj/gentoo-bugzilla:master commit in: extensions/SecureMail/
commit: 3d0c4817b8de016be2a90caacfc0536626c26ee9 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 31 03:41:59 2019 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 31 03:41:59 2019 + URL: https://gitweb.gentoo.org/proj/gentoo-bugzilla.git/commit/?id=3d0c4817 Revert "Try reenabling SecureMail" The attempt failed. Signed-off-by: Michał Górny gentoo.org> extensions/SecureMail/disabled | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/extensions/SecureMail/disabled b/extensions/SecureMail/disabled new file mode 100644 index 0..e69de29bb
[gentoo-commits] proj/gentoo-bugzilla:master commit in: template/en/default/attachment/
commit: a1c661884709ee728a24acd336fb770b90d06893 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 31 03:42:13 2019 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 31 03:42:13 2019 + URL: https://gitweb.gentoo.org/proj/gentoo-bugzilla.git/commit/?id=a1c66188 attachment: Add a note about file read permissions Signed-off-by: Michał Górny gentoo.org> template/en/default/attachment/createformcontents.html.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl index a12dee82d..e38ab27a9 100644 --- a/template/en/default/attachment/createformcontents.html.tmpl +++ b/template/en/default/attachment/createformcontents.html.tmpl @@ -11,6 +11,7 @@ + Make sure that your user has permissions to read the file you are trying to attach. If you don't, you will most likel get a confusing error message. Please attach build logs and other informational files as plain text. If build log is larger than [% max_limit FILTER html %] KB, please compress it using compression tool such as bzip2 or xz (without tar). Patches, ebuilds and other copyrightable files meant for integration must conform to the Gentoo copyright policy. Such conformance must be explicitly acknowledged through GCO sign-off, confirmed with your real name. Please attach ebuild updates and new packages preferably as git-format patches with explanatory commit messages (see: GLEP 66) and a GCO sign-off. Alternatively, please include the sign-off in a comment when attaching non-patch format files.
[gentoo-commits] repo/gentoo:master commit in: dev-db/percona-toolkit/
commit: a47a750a777b67a70deaffd8e5d5a3601ec81144 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 31 02:09:07 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 31 02:09:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47a750a dev-db/percona-toolkit: bump to v3.1.0 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/percona-toolkit/Manifest| 1 + .../percona-toolkit/percona-toolkit-3.1.0.ebuild | 51 ++ 2 files changed, 52 insertions(+) diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest index da54a336ef9..afa034eb912 100644 --- a/dev-db/percona-toolkit/Manifest +++ b/dev-db/percona-toolkit/Manifest @@ -1,3 +1,4 @@ DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679 DIST percona-toolkit-3.0.13.tar.gz 10855538 BLAKE2B 30dfbd3c56da64de10ce5d960a9b35b5729c7ea07ec8a40b97f2707af935e57d2291201926dae8794e623a2f60095502a5b97709d3343bd95318ab832f3a5ca5 SHA512 4f8050f3f3a43363c9ee1b15c161d60deafd443a0e057b7960881870d10d1fe0214b885e77b404f03081eb27adfa337e3adea26ca238efac753fb949272f36d3 DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb8ff13b3084caa46498c8c789cd4e7b18473d41992701e393ad91cd7fdda8b3e56a099600285aeb4ba788110d36a028f76b6 SHA512 56a8732cfdbd58d0602e482d7bf049d2049104b7ae203d756db81a052cd837f16d2a35f75def4f23748534d0d2eb6441cb9fe49175a931fbcdbb6adeb42f1c53 +DIST percona-toolkit-3.1.0.tar.gz 18106856 BLAKE2B 4a08e70a03d80e86e2fd7ba4ac77be9568643faf46bb653ef9e18015b95d36936034369a8adf9de4e09d2ca6cd25a845b140d6dd2c41027597f08d74f328ad26 SHA512 6dd2de997fe9627897dad453277544142cbdcba41bf30de21ee10c292c671bc089df0e299a8e386af082511c57ac53621b8e11f4ae43e98ea41eeca0c76f652f diff --git a/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild new file mode 100644 index 000..700a8fd2957 --- /dev/null +++ b/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit perl-module + +DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" +HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit; +SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz; + +LICENSE="|| ( GPL-2 Artistic )" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +# Package warrants IUSE doc +IUSE="" + +COMMON_DEPEND="dev-perl/DBI + dev-perl/DBD-mysql + virtual/perl-Time-HiRes" +RDEPEND="${COMMON_DEPEND} + dev-perl/JSON + dev-perl/libwww-perl + dev-perl/Role-Tiny + virtual/perl-File-Path + virtual/perl-Getopt-Long + virtual/perl-Time-Local + virtual/perl-Digest-MD5 + virtual/perl-IO-Compress + virtual/perl-File-Temp + virtual/perl-File-Spec + virtual/perl-Scalar-List-Utils + dev-perl/TermReadKey" +DEPEND="${COMMON_DEPEND} + virtual/perl-ExtUtils-MakeMaker" + +# Bug #501904 - CVE-2014-2029 +# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* +# ^ is *-no-versioncheck.patch +PATCHES=( + "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch + "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch +) + +src_prepare() { + default + + sed -i \ + -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ + Makefile.PL || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-db/percona-toolkit/files/, dev-db/percona-toolkit/
commit: a8910e154ceb795860c0610f7b2dd8a29b732b81 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 31 01:57:19 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 31 01:57:19 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8910e15 dev-db/percona-toolkit: drop old Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/percona-toolkit/Manifest| 8 .../percona-toolkit-2.2.17-fix-package-name.patch | 35 --- .../percona-toolkit-2.2.19-fix-package-name.patch | 13 -- .../percona-toolkit/percona-toolkit-2.2.11.ebuild | 47 .../percona-toolkit/percona-toolkit-2.2.17.ebuild | 44 --- .../percona-toolkit/percona-toolkit-2.2.19.ebuild | 44 --- .../percona-toolkit-3.0.10-r1.ebuild | 51 -- .../percona-toolkit/percona-toolkit-3.0.10.ebuild | 49 - .../percona-toolkit/percona-toolkit-3.0.11.ebuild | 51 -- .../percona-toolkit/percona-toolkit-3.0.12.ebuild | 51 -- .../percona-toolkit/percona-toolkit-3.0.7.ebuild | 42 -- .../percona-toolkit/percona-toolkit-3.0.8.ebuild | 49 - 12 files changed, 484 deletions(-) diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest index 4f959d5cc17..da54a336ef9 100644 --- a/dev-db/percona-toolkit/Manifest +++ b/dev-db/percona-toolkit/Manifest @@ -1,11 +1,3 @@ -DIST percona-toolkit-2.2.11.tar.gz 1389718 BLAKE2B 3d8c1207cda30aefc710ab5329aa94c76b3cd285a83f421b303e23e0544c4a51a0e8bf3ecdbb8532b67dcde808096bcb47c74ef63725b09ad59ca2b3f21e0fa5 SHA512 d5e34fce1b6b69dfc1a8ecd7bcbe84e586e950976553f4fd30afb887a850770c08990216e41fc194bdd0a5642034905ee2d69c2f8b3781503c9b4aab47017cdb -DIST percona-toolkit-2.2.17.tar.gz 1420968 BLAKE2B 886634cb4f1ed196595c0ebe9d2d53bea898a41d81e6881173949181fbdbc752be671a22344e4e5b142d22e724e86389bf2885273a67222feb28511e1de429b0 SHA512 a6ac84db9fc77b57fffd4f18b1e6c147fa39821a8b8db128af15bac6884a2937f973aa59adb05b738c3a15d9006c71db49276207c5b321acbefd8bd3a6130b76 -DIST percona-toolkit-2.2.19.tar.gz 1425623 BLAKE2B fe9b363ec924b1af9110ea7e7dab70ad4471ddf30868391f9e02a2f6d5a5698a2cb0238dd1cca81428adcac2f21262f10ea2da272ffd881dee1b8b88be1405e0 SHA512 8da35e2ee4d81465131623e5b423c2c49c0bf0faf01862952dd5ca72c2ffea64fabcaf88dda883e633e23de8ae4a6c75a095a751708bac6a8136fc8daaae2383 DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679 -DIST percona-toolkit-3.0.10.tar.gz 17335242 BLAKE2B c24103576c537eb9afbdcedc6acf51671853c8e0764092f76d3ee4a1de338a521d91b956b13665ca92a06a70726b92cb9d530ab04b50ed30990868305bd0a7a0 SHA512 e9477f908bbcc5c975f11d42fe9b2b61adebe823657e23a2c74c639767c73f3f71ebdf2bec1d839ad14f2d5080c5f1f9620db07c6bf9694bd7623e86f390e902 -DIST percona-toolkit-3.0.11.tar.gz 18254993 BLAKE2B a6c582bdda96bf5c74e7b5340c465d71f4f119d8364c1d36fc02c650d741972e706bb5eee86fd5bc22ed4f7298a45f0d5c5d9e4438230a8b7b09a58498dda7e8 SHA512 f722ccc8b0fde8f61d4cf269ec89df410f656153da06cf396d222cbb817e88b50e23c0ace383429acf39ddec0501e75d6d3e358fb5ed53ee50a0162eaed9a717 -DIST percona-toolkit-3.0.12.tar.gz 16205557 BLAKE2B e159867d7c6a8b1fd8fa0f31d3a7bdff45f45353995d57d71cd2fb763044524fb62c6c0dcff893ff9d92b5a18dd695445ac46b01ff99be7cbac9d625e5521c44 SHA512 4c01a04f6a4efb444e248d55ab846f32d4784e021b51b272875de3f1f0907298c66073f6d2a941ad407aefa9840407e55095c5ec848998f731539b12ec1875f8 DIST percona-toolkit-3.0.13.tar.gz 10855538 BLAKE2B 30dfbd3c56da64de10ce5d960a9b35b5729c7ea07ec8a40b97f2707af935e57d2291201926dae8794e623a2f60095502a5b97709d3343bd95318ab832f3a5ca5 SHA512 4f8050f3f3a43363c9ee1b15c161d60deafd443a0e057b7960881870d10d1fe0214b885e77b404f03081eb27adfa337e3adea26ca238efac753fb949272f36d3 -DIST percona-toolkit-3.0.7.tar.gz 79294306 BLAKE2B e3a556c823d355e5af504210dfb360e6fcf217ca6bfb7ba729e83e66cfdd09231c09d05fb51df1eac6bee0c6615620ac96ffce47c4f0473394d9c008ce8bdabe SHA512 e5a23ce6f4fd74f0956187679810de23a9d60f8073609289d641411c9f397f49b02c05cbcd0a68d78992849f17b70fb3ae411ac967e25c7be45f95ec374414fe -DIST percona-toolkit-3.0.8.tar.gz 79316265 BLAKE2B 5d6efdbaa4fd3ac914c059c9240f6dcd0de89c6b2ea444c407b115b380bb676c51266f907f6e37a62a40032fd5aa6e1816752c8ec08150dddf71c7568f42c739 SHA512 d5380395b052aebe651806649ff22f259d1af9401112b7ffe86b10664b87f917fecfe91bdc72b401d00471fc9c141391006cd322c9464fca1343f704ecaa8623 DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb8ff13b3084caa46498c8c789cd4e7b18473d41992701e393ad91cd7fdda8b3e56a099600285aeb4ba788110d36a028f76b6 SHA512
[gentoo-commits] repo/gentoo:master commit in: dev-db/percona-server/files/
commit: 1e197b6d121108fc0ffcfc7c294f9d6aa5bbb423 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 31 01:45:20 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 31 01:45:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e197b6d dev-db/percona-server: add missing files Fixes 1675444 ("dev-db/percona-server: bump to v8.0.17-8") Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> .../percona-server/files/my.cnf-8.0.distro-client | 23 + .../percona-server/files/my.cnf-8.0.distro-server | 30 ++ 2 files changed, 53 insertions(+) diff --git a/dev-db/percona-server/files/my.cnf-8.0.distro-client b/dev-db/percona-server/files/my.cnf-8.0.distro-client new file mode 100644 index 000..1c2ee7da1d9 --- /dev/null +++ b/dev-db/percona-server/files/my.cnf-8.0.distro-client @@ -0,0 +1,23 @@ +# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d/50-distro-client.cnf: The global mysql configuration file. + +# The following options will be passed to all MySQL clients +[client] +# Should match default server to save a round trip +loose-default-auth = mysql_native_password +socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock +character-sets-dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +loose-default-character-set= utf8mb4 + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[mysqldump] +quick +max_allowed_packet = 16M + +[myisamchk] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets + +[myisampack] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets diff --git a/dev-db/percona-server/files/my.cnf-8.0.distro-server b/dev-db/percona-server/files/my.cnf-8.0.distro-server new file mode 100644 index 000..ac087963972 --- /dev/null +++ b/dev-db/percona-server/files/my.cnf-8.0.distro-server @@ -0,0 +1,30 @@ +# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d/50-distro-server.cnf: The global mysql configuration file. + +# add a section [mysqld-8.0] for specific configurations +[mysqld] +# Using "mysql_native_password" for compatibility with Perl, PHP, Ruby... +loose-default-authentication-plugin= mysql_native_password +character-set-server = utf8mb4 +user = mysql +port = 3306 +socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock +pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysql.pid +log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err +basedir= @GENTOO_PORTAGE_EPREFIX@/usr +datadir= @DATADIR@ +skip-external-locking +lc_messages_dir= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql +#Set this to your desired error message language +lc_messages= en_US + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +bind-address = 127.0.0.1 + +log-bin +server-id = 1 + +# point the following paths to different dedicated disks +#tmpdir= @GENTOO_PORTAGE_EPREFIX@/tmp/ +#log-update= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/
commit: 6ad4237876b682895e3651d948e1342b80354243 Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 31 01:41:53 2019 + Commit: Lars Wendler gentoo org> CommitDate: Thu Oct 31 01:42:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad42378 dev-util/cmake: Removed old Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> dev-util/cmake/Manifest| 1 - dev-util/cmake/cmake-3.15.3.ebuild | 226 - 2 files changed, 227 deletions(-) diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 34e599ff675..13c45b0b9ad 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,7 +1,6 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56 DIST cmake-3.14.7.tar.gz 8861587 BLAKE2B c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09 SHA512 2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4 -DIST cmake-3.15.3.tar.gz 9270184 BLAKE2B bdca3d45d603d9f40584e54102fedd736dae9eadb3ccaaf9bdb2e071da57eff5201dab390ba651772fb5f78fdd7683a86ac721a8b8273936782559a95be0167d SHA512 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658 DIST cmake-3.15.4.tar.gz 9270648 BLAKE2B b1c46ce76a549c78caa5c95be38fdbdcca685b1fade0a1687971d3b1cbb10953ec62b12401f67c389b096c87a6fa895ff339e1646e449472df76660b76e7d1ed SHA512 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650 DIST cmake-3.15.5.tar.gz 9271925 BLAKE2B 9e30227600542edb4dc3dbafc1874db718816270d045fafe140037b8eb39e5d066d1ccd5b2f6c817babfa43a0e3ff7c5d58d243b97f616ec504cafc428872b67 SHA512 c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6 DIST cmake-3.16.0-rc2.tar.gz 9100272 BLAKE2B facce463a92b32a51676d638aad4dbd84f2184c48e7df478fcc34fbcd9c7e5dbf18223fc11a774ebe588160a9458507c7974a9e9c564e8fddd86b88ea0a60238 SHA512 d457388f4cf0512e3aee12d12d445b160bb6b19888caf0c2fd69ec10bfbcd910790aecb025a1062cfb2b0048c4cac0e2370a76116c75db2a7000aa56af4c81f7 diff --git a/dev-util/cmake/cmake-3.15.3.ebuild b/dev-util/cmake/cmake-3.15.3.ebuild deleted file mode 100644 index 8379ddfb933..000 --- a/dev-util/cmake/cmake-3.15.3.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/; -SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt5 test" - -RDEPEND=" - app-crypt/rhash - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=dev-libs/libuv-1.10.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-python/requests - dev-python/sphinx - ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch - # Next patch requires new work from prefix people - #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch - "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch -
[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/
commit: 263eea878145a62b3f8d4a9afdfd36421638a3ad Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 31 01:40:39 2019 + Commit: Lars Wendler gentoo org> CommitDate: Thu Oct 31 01:42:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=263eea87 dev-util/cmake: Bump to version 3.15.5 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> dev-util/cmake/Manifest| 1 + dev-util/cmake/cmake-3.15.5.ebuild | 226 + 2 files changed, 227 insertions(+) diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index cf34c351ae7..34e599ff675 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -3,4 +3,5 @@ DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee DIST cmake-3.14.7.tar.gz 8861587 BLAKE2B c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09 SHA512 2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4 DIST cmake-3.15.3.tar.gz 9270184 BLAKE2B bdca3d45d603d9f40584e54102fedd736dae9eadb3ccaaf9bdb2e071da57eff5201dab390ba651772fb5f78fdd7683a86ac721a8b8273936782559a95be0167d SHA512 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658 DIST cmake-3.15.4.tar.gz 9270648 BLAKE2B b1c46ce76a549c78caa5c95be38fdbdcca685b1fade0a1687971d3b1cbb10953ec62b12401f67c389b096c87a6fa895ff339e1646e449472df76660b76e7d1ed SHA512 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650 +DIST cmake-3.15.5.tar.gz 9271925 BLAKE2B 9e30227600542edb4dc3dbafc1874db718816270d045fafe140037b8eb39e5d066d1ccd5b2f6c817babfa43a0e3ff7c5d58d243b97f616ec504cafc428872b67 SHA512 c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6 DIST cmake-3.16.0-rc2.tar.gz 9100272 BLAKE2B facce463a92b32a51676d638aad4dbd84f2184c48e7df478fcc34fbcd9c7e5dbf18223fc11a774ebe588160a9458507c7974a9e9c564e8fddd86b88ea0a60238 SHA512 d457388f4cf0512e3aee12d12d445b160bb6b19888caf0c2fd69ec10bfbcd910790aecb025a1062cfb2b0048c4cac0e2370a76116c75db2a7000aa56af4c81f7 diff --git a/dev-util/cmake/cmake-3.15.5.ebuild b/dev-util/cmake/cmake-3.15.5.ebuild new file mode 100644 index 000..8379ddfb933 --- /dev/null +++ b/dev-util/cmake/cmake-3.15.5.ebuild @@ -0,0 +1,226 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES="no" +inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/; +SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + +LICENSE="CMake" +SLOT="0" +[[ "${PV}" = *_rc* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs system-jsoncpp ncurses qt5 test" + +RDEPEND=" + app-crypt/rhash + >=app-arch/libarchive-3.0.0:= + >=dev-libs/expat-2.0.1 + >=dev-libs/libuv-1.10.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + emacs? ( virtual/emacs ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-python/requests + dev-python/sphinx + ) +" + +S="${WORKDIR}/${MY_P}" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # prefix + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch + "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch + # Next patch requires new work from prefix people + #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch + + # handle gentoo packaging in find modules + "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch + "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch + + # respect python eclasses + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch + + # upstream fixes (can usually be removed with a version bump) +) + +cmake_src_bootstrap() { + # Cleanup args to extract only JOBS. + # Because bootstrap does not know anything else. + grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null + if [[ $? -eq 0 ]] ; then + par_arg=$(grep
[gentoo-commits] repo/gentoo:master commit in: dev-db/percona-server/
commit: 1675444a6cc3f7b25911b91bf4f9076a08b5ec63 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 31 01:38:08 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 31 01:41:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1675444a dev-db/percona-server: bump to v8.0.17-8 Closes: https://bugs.gentoo.org/697980 Closes: https://bugs.gentoo.org/679266 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/percona-server/Manifest |3 + dev-db/percona-server/metadata.xml |1 + .../percona-server/percona-server-8.0.17.8.ebuild | 1128 3 files changed, 1132 insertions(+) diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest index f766c8cf7fc..27e6e7919bb 100644 --- a/dev-db/percona-server/Manifest +++ b/dev-db/percona-server/Manifest @@ -1,4 +1,7 @@ DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae +DIST boost_1_69_0.tar.bz2 95078138 BLAKE2B ccab52b911066ed41db6555fe13fbc142cd51250ad620665d3fcf25508e158b7b766f4f3654333b4a19517215ebe4a6ce14e64395b093b9604b3f0e570419841 SHA512 d0e9bb858c44880d56c0291afef6a1b011a62f659a2d8f58dcb6147ea0899f9157bd8db3097896618fee0116847ebeac78b6d0f0fec8a92c3469500828bbe552 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8 +DIST mysql-extras-20191031-0134Z.tar.bz2 340718 BLAKE2B 8c228d6953aa888449a006ab1000ef3ecb1747fd055f58a8eaa5f5680b223fa840debbb7fce7404aa7ef4524ce71144a6a970483ad6536ff7521bd949f4dfa90 SHA512 6d61c4a70980759ac90fc3ac35a677a340d88f63260fb2c130ef70de0c05654895fe17b5f4915ca6d96f2406f215559182af61f7d88c1a4157e9bcbcc0f4d4e2 DIST percona-server-5.7.26-29.tar.gz 84327421 BLAKE2B beedb4b5025c337a63ae56644e47991e90c2c0e57c6d03f1562095f9470cef4b67c8df6c3774d88dfc6ed6dfb81f9dd4b62325db30bc26802651279921bd3a2d SHA512 c8100e69f7e29a5aa2de9dddbc1a3cba9836fe485b7f829a8db0a7e5ac1d1bdabfb1360dacad90665f4c9c78ac91226209c6c15158ef449e84519e36bb06f0a1 DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871ab0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b +DIST percona-server-8.0.17-8.tar.gz 249562136 BLAKE2B d3bf20d9fee43f17b8aef3e403e74d9c5924a5a012d0c4208b22ce37f48867a2a1fb7992d7837f35492d5c5871901f3e0f68cde54793090bb2c089cee310 SHA512 c875492e8b67307aef439ae54b8ff6320464ac495a2d06029f1b33b2117e56bd1c2b3ce4ba7b406c1bd6604d0016d04a5c3f36643097cbf36425d60a44b6adc3 diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml index 01da26f9882..f282af30876 100644 --- a/dev-db/percona-server/metadata.xml +++ b/dev-db/percona-server/metadata.xml @@ -14,6 +14,7 @@ Enable NUMA support using sys-process/numactl (NUMA kernel support is also required) Add support for statement profiling (requires USE=community). Add support for RocksDB; a key/value, LSM database optimized for flash storage + Build the MySQL router program Build the server program Build support for profiling and tracing using dev-util/systemtap Add support for TokuDB storage engine diff --git a/dev-db/percona-server/percona-server-8.0.17.8.ebuild b/dev-db/percona-server/percona-server-8.0.17.8.ebuild new file mode 100644 index 000..4d7c2105e69 --- /dev/null +++ b/dev-db/percona-server/percona-server-8.0.17.8.ebuild @@ -0,0 +1,1128 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +MY_EXTRAS_VER="20191031-0134Z" + +CMAKE_MAKEFILE_GENERATOR=emake + +inherit cmake-utils flag-o-matic linux-info \ + multiprocessing prefix toolchain-funcs check-reqs + +MY_BOOST_VERSION="1.69.0" +MY_PV=$(ver_rs 3 '-') +MY_PV="${MY_PV//_pre*}" +MY_PN="Percona-Server" +MY_P="${PN}-${MY_PV}" +MY_MAJOR_PV=$(ver_cut 1-2) +MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/; + +S="${WORKDIR}/${PN}-${MY_PV}" + +SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz + https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2 +" + +# Gentoo patches to MySQL +if [[ "${MY_EXTRAS_VER}" != "live" &&
[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/
commit: 4063579617e0e9e250510946a3b12c0ed640189d Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 31 01:41:02 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 31 01:41:23 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40635796 dev-db/mysql: backport some changes from percona-server package Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/mysql/mysql-8.0.18.ebuild | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dev-db/mysql/mysql-8.0.18.ebuild b/dev-db/mysql/mysql-8.0.18.ebuild index 450b754c297..95f1b274f5c 100644 --- a/dev-db/mysql/mysql-8.0.18.ebuild +++ b/dev-db/mysql/mysql-8.0.18.ebuild @@ -77,9 +77,9 @@ COMMON_DEPEND=" dev-libs/libaio:0= sys-process/procps:0= ) - numa? ( sys-process/numactl ) - !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) + !libressl? ( >=dev-libs/openssl-1.0.0:0= ) + numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) " DEPEND="${COMMON_DEPEND} @@ -373,6 +373,8 @@ src_test() { unset info_msg MTR_PARALLEL=4 fi + else + einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'" fi # create directories because mysqladmin might run out of order @@ -395,12 +397,8 @@ src_test() { disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)") disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)") disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)") - disabled_tests+=( "main.mysqlslap;1253001;Known failure - no upstream bug yet (RH)" ) disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet") disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet") - disabled_tests+=( "perfschema.idx_threads;0;Known failure - no upstream bug yet" ) - disabled_tests+=( "perfschema.idx_session_connect_attrs;0;Known failure - no upstream bug yet" ) - disabled_tests+=( "perfschema.idx_session_account_connect_attrs;0;Known failure - no upstream bug yet" ) disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" ) disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Known failure - no upstream bug yet" ) disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware")
[gentoo-commits] proj/mysql-extras: New tag: mysql-extras-20191031-0134Z
commit: Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 31 01:34:55 2019 + New tag: mysql-extras-20191031-0134Z
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/heat/
commit: 13809e8bcb9454e2f3596cf5f6b7b9d817ec0754 Author: Matthew Thode gentoo org> AuthorDate: Thu Oct 31 01:32:24 2019 + Commit: Matthew Thode gentoo org> CommitDate: Thu Oct 31 01:33:16 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13809e8b sys-cluster/heat: fix sdir for heat-13.0.0 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Matthew Thode gentoo.org> sys-cluster/heat/heat-13.0.0.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-cluster/heat/heat-13.0.0.ebuild b/sys-cluster/heat/heat-13.0.0.ebuild index e2d5eb4e2b2..883519e2487 100644 --- a/sys-cluster/heat/heat-13.0.0.ebuild +++ b/sys-cluster/heat/heat-13.0.0.ebuild @@ -19,6 +19,7 @@ else https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz; KEYWORDS="~amd64 ~arm64 ~x86" fi +S="${WORKDIR}/openstack-${P}" LICENSE="Apache-2.0" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/
commit: b2cac7556cccbe939e2d5f8e9ba96ee050f9062d Author: Matthew Thode gentoo org> AuthorDate: Thu Oct 31 01:31:23 2019 + Commit: Matthew Thode gentoo org> CommitDate: Thu Oct 31 01:33:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2cac755 sys-cluster/neutron: fix config tarball compression Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Matthew Thode gentoo.org> sys-cluster/neutron/Manifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest index 4ce8799676c..e3f1ff2dc49 100644 --- a/sys-cluster/neutron/Manifest +++ b/sys-cluster/neutron/Manifest @@ -5,10 +5,10 @@ DIST neutron-15.0.0.tar.gz 10512007 BLAKE2B a0cbd9a9279daf89ac6c162063c1e1f70633 DIST neutron-configs-13.0.4.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c DIST neutron-configs-14.0.2.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b DIST neutron-configs-14.0.3.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b -DIST neutron-configs-15.0.0.tar.gz 23401 BLAKE2B cb3280e17ee58a8afffafc6d6db8011b4959751e4bbba4429c0a4bfca5d83c2f651504c326facf0c24ec1f9fe27f12d5183431c2040f9d00dfdc7b02f89f58b5 SHA512 2a423f8d963eea464ca6a16cc53f2d726b89920745874ab87a5dfb2bd661e711875c063214e2fe1baf212e66e5c2be0f5fee9972b8af529b671d80dc2530353e +DIST neutron-configs-15.0.0.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe DIST neutron-configs-2018.2..tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c DIST neutron-configs-2019.1..tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b -DIST neutron-configs-2019.2..tar.gz 23401 BLAKE2B cb3280e17ee58a8afffafc6d6db8011b4959751e4bbba4429c0a4bfca5d83c2f651504c326facf0c24ec1f9fe27f12d5183431c2040f9d00dfdc7b02f89f58b5 SHA512 2a423f8d963eea464ca6a16cc53f2d726b89920745874ab87a5dfb2bd661e711875c063214e2fe1baf212e66e5c2be0f5fee9972b8af529b671d80dc2530353e +DIST neutron-configs-2019.2..tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe DIST neutron-ml2-plugins-13.0.4.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f DIST neutron-ml2-plugins-14.0.2.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2 DIST neutron-ml2-plugins-14.0.3.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: a2ad81add180c3980619ffb2cf31fc8cf8232580 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 31 00:49:57 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 31 00:49:57 2019 + URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=a2ad81ad Fix 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch Signed-off-by: Thomas Deutschmann gentoo.org> 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch b/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch index cf7f747..a1a6eb0 100644 --- a/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch +++ b/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch @@ -20,7 +20,7 @@ ADD_SUBDIRECTORY(dbug) ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) -@@ -1295,7 +1295,6 @@ IF(WITH_UNIT_TESTS) +@@ -1295,11 +1295,16 @@ IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() @@ -28,9 +28,6 @@ ADD_SUBDIRECTORY(utilities) ADD_SUBDIRECTORY(share) ADD_SUBDIRECTORY(libservices) -@@ -1340,6 +1339,12 @@ IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() +IF(NOT WITHOUT_TOOLS) + # Add system/bundled editline @@ -39,8 +36,8 @@ +ENDIF(NOT WITHOUT_TOOLS) + IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(packaging/rpm-common) - ADD_SUBDIRECTORY(packaging/rpm-oel) + ADD_SUBDIRECTORY(testclients) + ADD_SUBDIRECTORY(sql) --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -240,12 +240,17 @@ IF(WIN32) @@ -180,4 +177,3 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) -
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: c82b072c1bedd43a42f3eb9b0e214dff66d8faab Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Oct 30 23:49:16 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Oct 30 23:49:16 2019 + URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=c82b072c Add 20018_all_percona-server-8.0.17-fix-libressl-support.patch Signed-off-by: Thomas Deutschmann gentoo.org> ...ercona-server-8.0.17-fix-libressl-support.patch | 230 + 1 file changed, 230 insertions(+) diff --git a/20018_all_percona-server-8.0.17-fix-libressl-support.patch b/20018_all_percona-server-8.0.17-fix-libressl-support.patch new file mode 100644 index 000..29f2a0e --- /dev/null +++ b/20018_all_percona-server-8.0.17-fix-libressl-support.patch @@ -0,0 +1,230 @@ +--- a/cmake/ssl.cmake b/cmake/ssl.cmake +@@ -304,7 +304,8 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" + ) + ENDIF() +- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") ++CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++IF(HAVE_TLS1_3_VERSION) +ADD_DEFINITIONS(-DHAVE_TLSv13) + ENDIF() + IF(OPENSSL_INCLUDE_DIR AND +--- a/extra/libevent/openssl-compat.h b/extra/libevent/openssl-compat.h +@@ -24,7 +24,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) + #define BIO_set_init(b, val) (b)->init = (val) + #define BIO_set_data(b, val) (b)->ptr = (val) + #define BIO_set_shutdown(b, val) (b)->shutdown = (val) +-#define BIO_get_init(b) (b)->init + #define BIO_get_data(b) (b)->ptr + #define BIO_get_shutdown(b) (b)->shutdown + +@@ -32,4 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) + + #endif /* OPENSSL_VERSION_NUMBER < 0x1010L */ + ++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER) ++#define BIO_get_init(b) (b)->init ++#endif ++ + #endif /* OPENSSL_COMPAT_H */ +--- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c +@@ -297,7 +297,7 @@ error: + return 1; + } + +-#ifndef HAVE_WOLFSSL ++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) + #define OPENSSL_ERROR_LENGTH 512 + static int configure_ssl_fips_mode(const uint fips_mode) { + int rc = -1; +@@ -521,7 +521,7 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file, + int verify_server = SSL_VERIFY_NONE; + int verify_client = SSL_VERIFY_NONE; + +-#ifndef HAVE_WOLFSSL ++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) + if (configure_ssl_fips_mode(ssl_fips_mode) != 1) { + G_ERROR("Error setting the ssl fips mode"); + goto error; +--- a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc +@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_id) { + return XError(CR_SSL_CONNECTION_ERROR, buffer); + } + +-#ifndef HAVE_WOLFSSL ++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) + /** + Set fips mode in openssl library, + When we set fips mode ON/STRICT, it will perform following operations: +@@ -573,7 +573,7 @@ XError Connection_impl::activate_tls() { + if (!m_context->m_ssl_config.is_configured()) + return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED}; + +-#ifndef HAVE_WOLFSSL ++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) + char err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; + if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) != + 1) { +--- a/router/src/http/src/tls_client_context.cc b/router/src/http/src/tls_client_context.cc +@@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) { + + void TlsClientContext::cipher_suites(const std::string ) { + // TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites() +-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1) ++#ifdef TLS1_3_VERSION + if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) { + throw TlsError("set-cipher-suites"); + } +--- a/router/src/http/src/tls_context.cc b/router/src/http/src/tls_context.cc +@@ -93,7 +93,7 @@ static constexpr int o11x_version(TlsVersion version) { + return TLS1_1_VERSION; + case TlsVersion::TLS_1_2: + return TLS1_2_VERSION; +-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1) ++#ifdef TLS1_3_VERSION + case TlsVersion::TLS_1_3: + return TLS1_3_VERSION; + #endif +@@ -123,9 +123,11 @@ void TlsContext::version_range(TlsVersion min_version, TlsVersion max_version) { + default: + // unknown, leave all disabled + // fallthrough ++#ifdef TLS1_3_VERSION + case TlsVersion::TLS_1_3: + opts |= SSL_OP_NO_TLSv1_2; + // fallthrough ++#endif + case TlsVersion::TLS_1_2: + opts |=
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 2f686e103725496893e808b7761abc1d7673301f Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Oct 30 23:47:28 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Oct 30 23:47:28 2019 + URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=2f686e10 Add 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch Signed-off-by: Thomas Deutschmann gentoo.org> ...na-server-8.0.17-without-clientlibs-tools.patch | 183 + 1 file changed, 183 insertions(+) diff --git a/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch b/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch new file mode 100644 index 000..cf7f747 --- /dev/null +++ b/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch @@ -0,0 +1,183 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -1159,8 +1159,6 @@ ENDIF() + MYSQL_CHECK_SSL() + MYSQL_CHECK_SSL_DLLS() + +-# Add system/bundled editline. +-MYSQL_CHECK_EDITLINE() + # Add libevent + IF(NOT WITHOUT_SERVER) + MYSQL_CHECK_LIBEVENT() +@@ -1252,7 +1250,9 @@ IF(WITH_UNIT_TESTS) + ENABLE_TESTING() + ENDIF() + +-ADD_SUBDIRECTORY(include) ++IF(NOT WITHOUT_CLIENTLIBS) ++ ADD_SUBDIRECTORY(include) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + ADD_SUBDIRECTORY(dbug) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) +@@ -1295,7 +1295,6 @@ IF(WITH_UNIT_TESTS) + ADD_SUBDIRECTORY(unittest/mytap/t) + ENDIF() + +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(utilities) + ADD_SUBDIRECTORY(share) + ADD_SUBDIRECTORY(libservices) +@@ -1340,6 +1339,12 @@ IF(UNIX) + ADD_SUBDIRECTORY(man) + ENDIF() + ++IF(NOT WITHOUT_TOOLS) ++ # Add system/bundled editline ++ MYSQL_CHECK_EDITLINE() ++ ADD_SUBDIRECTORY(client) ++ENDIF(NOT WITHOUT_TOOLS) ++ + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(packaging/rpm-common) + ADD_SUBDIRECTORY(packaging/rpm-oel) +--- a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +@@ -240,12 +240,17 @@ IF(WIN32) + LIST(APPEND LIBS_TO_MERGE auth_win_client) + ENDIF() + +-# LDAP authentication SASL client plugin +-MESSAGE(STATUS "Creating LDAP authentication SASL client library.") +-ADD_SUBDIRECTORY(authentication_ldap) +- +-# Merge several convenience libraries into one big perconaserverclient +-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development) ++IF(WITHOUT_CLIENTLIBS) ++ # Merge several convenience libraries into one big perconaserverclient ++ MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) ++ # LDAP authentication SASL client plugin ++ MESSAGE(STATUS "Creating LDAP authentication SASL client library.") ++ ADD_SUBDIRECTORY(authentication_ldap) ++ ++ # Merge several convenience libraries into one big perconaserverclient ++ MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development) ++ENDIF(WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(perconaserverclient PRIVATE ${LIBS_TO_LINK}) + + # Visual Studio users need debug static library for debug projects +@@ -283,9 +288,15 @@ ENDIF() + IF(NOT DISABLE_SHARED) + # Merge several convenience libraries into one big perconaserverclient + # and link them together into shared library. ++IF(WITHOUT_CLIENTLIBS) ++ MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} ++EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS} ++COMPONENT SharedLibraries SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS} + COMPONENT SharedLibraries) ++ENDIF(WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) + + IF(WIN32) +--- a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +@@ -459,14 +459,12 @@ ELSE() + + IF(WITH_SYSTEMD) + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + ps_mysqld_helper + ps-admin + ) + ELSE() + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + mysqld_multi + mysqld_safe +@@ -475,6 +473,13 @@ ELSE() + ) + ENDIF() + ++ IF(NOT WITHOUT_CLIENTLIBS) ++SET(BIN_SCRIPTS ++ ${BIN_SCRIPTS} ++ mysql_config ++) ++ ENDIF(NOT WITHOUT_CLIENTLIBS) ++ + SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) + STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") + SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig") +@@ -489,7 +494,7 @@ ELSE() + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} + ESCAPE_QUOTES @ONLY) + +- IF(INSTALL_PKGCONFIGDIR) ++ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS) + MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") + INSTALL(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} +--- a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt +@@ -24,8 +24,9 @@
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgaminggear/, dev-libs/libgaminggear/files/
commit: 9dfd85df26fd72950ef7dda96b9b67d58d4d1005 Author: Lars Wendler gentoo org> AuthorDate: Wed Oct 30 23:33:14 2019 + Commit: Lars Wendler gentoo org> CommitDate: Wed Oct 30 23:33:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfd85df dev-libs/libgaminggear: Fixed build with newer cmake releases Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> .../files/libgaminggear-0.15.1-cmake-3.13.patch| 25 ++ dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild | 2 ++ 2 files changed, 27 insertions(+) diff --git a/dev-libs/libgaminggear/files/libgaminggear-0.15.1-cmake-3.13.patch b/dev-libs/libgaminggear/files/libgaminggear-0.15.1-cmake-3.13.patch new file mode 100644 index 000..1afc05c0dbe --- /dev/null +++ b/dev-libs/libgaminggear/files/libgaminggear-0.15.1-cmake-3.13.patch @@ -0,0 +1,25 @@ +From eb4ef0dcfcb4b9325f2cc520445b03f2b63c3b6d Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Thu, 31 Oct 2019 00:28:39 +0100 +Subject: [PATCH] Fix build with >=cmake-3.13 + +https://aur.archlinux.org/packages/libgaminggear/ +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 36b5f93..3b02457 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -75,6 +75,7 @@ INCLUDE_DIRECTORIES( + ${GTK_INCLUDE_DIRS} + ${M_INCLUDE_DIR} + ${NOTIFY_INCLUDE_DIRS} ++ /usr/include/harfbuzz + ) + + ADD_SUBDIRECTORY(configuration) +-- +2.24.0.rc1 + diff --git a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild index f25ccc7bd7b..5a1347b66e7 100644 --- a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild +++ b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild @@ -27,6 +27,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} dev-libs/libgudev + media-libs/harfbuzz " BDEPEND=" dev-util/glib-utils @@ -35,6 +36,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.10.0-doc.patch + "${FILESDIR}"/${P}-cmake-3.13.patch ) # Required because xdg.eclass overrides src_prepare() from cmake-utils.eclass
[gentoo-commits] repo/gentoo:master commit in: app-admin/terraform/
commit: ce4dfec84e961fc3399ce116855a8a2635c61969 Author: Alexys Jacob gentoo org> AuthorDate: Wed Oct 30 22:56:19 2019 + Commit: Alexys Jacob gentoo org> CommitDate: Wed Oct 30 22:57:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce4dfec8 app-admin/terraform: version bump Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Alexys Jacob gentoo.org> app-admin/terraform/Manifest | 1 + app-admin/terraform/terraform-0.12.12.ebuild | 36 2 files changed, 37 insertions(+) diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest index 76402d02300..ec1205e8cd3 100644 --- a/app-admin/terraform/Manifest +++ b/app-admin/terraform/Manifest @@ -1,2 +1,3 @@ DIST terraform-0.11.13.tar.gz 10906645 BLAKE2B dafdc1acddd4ea97b41cc5899a541701731fce7b13b914c0859fe148b10b5c8ac877d71b665e8d80a65f376bb09fb8ae6fd0e0263ff711a156ca48119522f89d SHA512 1c16f20d1a65c763f1091ff2d20e0752e62903e07a12d41dd722e5c4c989f477da7d64901336d7536ed1693d5c82f4548ae5a643edae85b4e83325fc8c81b245 DIST terraform-0.12.11.tar.gz 10338506 BLAKE2B 62c33591d55345e8c3b9c61b6f9279a81f1df86f5942cee787e4b525eefdf7834f0e4a6a42835b4ae038591fd467941454be674a3c1c8b329ef52c7d5e39359b SHA512 2b9fc6157aea8e7159d7089135620433d75843f2b3dd48af18ecb7837a5ca3ea72d9dfb8b36a25a65f9b9cc29b11bc7910f124a359a6589bfb941a714e0b7b23 +DIST terraform-0.12.12.tar.gz 10441883 BLAKE2B c30366c46bc77b7b5c1a44766ce891db01a139e1fa9f936962341d2b9230f85c9137ffc3236e6baad5aad5bada845fd0327846ebfb0c93037ae7c9c46fd70f13 SHA512 58e15da1cc5345e7780573bfeda4a6f34dc281682a0e3f7bf6b129d0db42ff343b79575bb06472e1c994f8d3e3d7e3ab507a4a09f1cfd166690a611af221bd8e diff --git a/app-admin/terraform/terraform-0.12.12.ebuild b/app-admin/terraform/terraform-0.12.12.ebuild new file mode 100644 index 000..effc18ec223 --- /dev/null +++ b/app-admin/terraform/terraform-0.12.12.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit golang-base go-module + +DESCRIPTION="A tool for building, changing, and combining infrastructure safely" +HOMEPAGE="https://www.terraform.io/; + +EGO_PN="github.com/hashicorp/${PN}" +SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +DEPEND="" + +DOCS=( {README,CHANGELOG}.md ) + +src_compile() { + GOCACHE="${T}/go-cache" go build \ + -work -o "bin/${PN}" ./ || die +} + +src_install() { + dobin bin/terraform + + einstalldocs +} + +pkg_postinst() { + elog "If you would like to install shell completions please run:" + elog "terraform -install-autocomplete" +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 16b3a70bde20e94375d77af5e916cd8f60befc0f Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Oct 30 22:35:29 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Oct 30 22:40:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b3a70b sys-apps/file: stable 5.37-r1 for sparc, bug #698610 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/file/file-5.37-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild index 214ca4a8cd8..373195e384e 100644 --- a/sys-apps/file/file-5.37-r1.ebuild +++ b/sys-apps/file/file-5.37-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then inherit autotools git-r3 else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz; - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/
commit: 47928b5c235ec1d105d64dde8d233df612beaa7c Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Thu Oct 17 00:46:08 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Oct 30 22:19:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47928b5c app-emulation/dosemu: Fix dependencies. Drop "sndfile" USE flag. Use EAPI="7". Fixes: https://bugs.gentoo.org/697900 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Sergei Trofimovich gentoo.org> .../dosemu/dosemu-1.4.1_pre20130107-r5.ebuild | 51 -- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild index 6eb911c30a1..d6de58d0a4b 100644 --- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild +++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2002-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" inherit autotools eutils flag-o-matic pax-utils toolchain-funcs @@ -18,30 +18,32 @@ SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz LICENSE="GPL-2" SLOT="0" KEYWORDS="-* amd64 x86" -IUSE="X svga gpm debug alsa sndfile fluidsynth" +IUSE="X alsa debug fluidsynth gpm svga" -RDEPEND="X? ( x11-libs/libX11 - x11-libs/libXxf86vm - x11-libs/libXau - x11-libs/libXext - x11-libs/libXdmcp - x11-apps/xset - x11-apps/xlsfonts +BDEPEND="app-arch/unzip + X? ( x11-apps/bdftopcf - >=x11-apps/mkfontscale-1.2.0 ) - svga? ( media-libs/svgalib ) - gpm? ( sys-libs/gpm ) + >=x11-apps/mkfontscale-1.2.0 + )" +COMMON_DEPEND="media-libs/libsdl + >=sys-libs/slang-1.4 + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + ) alsa? ( media-libs/alsa-lib ) - sndfile? ( media-libs/libsndfile ) - fluidsynth? ( media-sound/fluidsynth - media-sound/fluid-soundfont ) - media-libs/libsdl - >=sys-libs/slang-1.4" - -DEPEND="${RDEPEND} - app-arch/unzip - X? ( x11-base/xorg-proto ) - >=sys-devel/autoconf-2.57" + fluidsynth? ( + media-sound/fluid-soundfont + media-sound/fluidsynth + ) + gpm? ( sys-libs/gpm ) + svga? ( media-libs/svgalib )" +# sndfile? ( media-libs/libsndfile ) +DEPEND="${COMMON_DEPEND} + X? ( x11-base/xorg-proto )" +RDEPEND="${COMMON_DEPEND} + X? ( x11-apps/xset )" S="${WORKDIR}/${PN}-code-${COMMIT}" @@ -79,13 +81,14 @@ src_configure() { fi fi + # sndfile support is unconditionally disabled in src/plugin/sndfile/snd_o_wav.c econf $(use_with X x) \ $(use_with svga svgalib) \ $(use_enable debug) \ $(use_with gpm) \ $(use_with alsa) \ - $(use_with sndfile) \ $(use_with fluidsynth) \ + --without-sndfile \ --with-fdtarball="${DISTDIR}"/${P_FD}.tgz \ --sysconfdir="${EPREFIX}"/etc/dosemu/ \ --with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/
commit: a0fc6045b8d9c8367089525d0bf462a1062e322d Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Oct 30 21:21:38 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Oct 30 21:56:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0fc6045 app-shells/bash-completion: stable 2.9-r1 for hppa, bug #693738 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-shells/bash-completion/bash-completion-2.9-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild index d336aa2df2f..220069bc375 100644 --- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild +++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" IUSE="+eselect test" RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/zeitwerk/
commit: 18a008ee87cbdbee869135349b7721d5faf68bce Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Oct 30 21:20:46 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Oct 30 21:56:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a008ee dev-ruby/zeitwerk: keyworded 2.1.9 for hppa, bug #692324 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild index ecf037dcde6..e497cb065b3 100644 --- a/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild +++ b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="2" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" IUSE="" all_ruby_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-java/javatoolkit/
commit: 038f5617066efd4e1226eb6bd166bfb8e13ff8e5 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 20:27:03 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 20:27:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038f5617 dev-java/javatoolkit-0.6.2-r1: new dir for scripts Closes: https://bugs.gentoo.org/627440 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Miroslav Šulc gentoo.org> .../{javatoolkit-0.6.2.ebuild => javatoolkit-0.6.2-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/javatoolkit/javatoolkit-0.6.2.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild similarity index 92% rename from dev-java/javatoolkit/javatoolkit-0.6.2.ebuild rename to dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild index 7dfee0ff04d..dc16dbce00e 100644 --- a/dev-java/javatoolkit/javatoolkit-0.6.2.ebuild +++ b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild @@ -23,5 +23,5 @@ python_prepare_all() { python_install() { distutils-r1_python_install \ - --install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin + --install-scripts="${EPREFIX}"/usr/libexec/${PN} }
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 8cb182d6a7c9a6f75df73e64f15d34e077271405 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 20:25:00 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 20:27:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb182d6 eclass/java-{ant,utils}: updated for new javatoolkit layout Bug: https://bugs.gentoo.org/627440 Signed-off-by: Miroslav Šulc gentoo.org> eclass/java-ant-2.eclass | 15 ++- eclass/java-utils-2.eclass | 9 ++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 1fd4feb3913..5be76953edd 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -224,8 +224,13 @@ java-ant_bsfix_files() { files+=( -f "${file}" ) done - local rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" - local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" + if [ -e "${EPREFIX}/usr/libexec/javatoolkit" ]; then + local rewriter3="${EPREFIX}/usr/libexec/javatoolkit/xml-rewrite-3.py" + local rewriter4="${EPREFIX}/usr/libexec/javatoolkit/build-xml-rewrite" + else + local rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" + local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" + fi if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g" @@ -375,11 +380,11 @@ java-ant_ignore-system-classes() { # @DESCRIPTION: # Run the right xml-rewrite binary with the given arguments java-ant_xml-rewrite() { - local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py" local gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" + local gen2_2="${EPREFIX}/usr/libexec/javatoolkit/xml-rewrite-2.py" # gen1 is deprecated - if [[ -x "${gen2}" ]]; then - ${gen2} "${@}" || die "${gen2} failed" + if [[ -x "${gen2_2}" ]]; then + ${gen2_2} "${@}" || die "${gen2_2} failed" elif [[ -x "${gen2_1}" ]]; then ${gen2_1} "${@}" || die "${gen2_1} failed" else diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 4f7eb0356fc..e32cb572f14 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2729,10 +2729,13 @@ java-pkg_jar-list() { java-pkg_verify-classes() { #$(find ${D} -type f -name '*.jar' -o -name '*.class') - local version_verify="/usr/bin/class-version-verify.py" + local version_verify_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" + local version_verify_2="${EPREFIX}/usr/libexec/javatoolkit/class-version-verify.py" - if [[ ! -x "${version_verify}" ]]; then - version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" + if [[ -x "${version_verify_1}" ]]; then + local version_verify=${version_verify_1} + else + local version_verify=${version_verify_2} fi if [[ ! -x "${version_verify}" ]]; then
[gentoo-commits] repo/gentoo:master commit in: net-mail/courier-imap/
commit: 5c95d15b9438f1d198b511f73cc23603998d2f5a Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 30 20:10:46 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 30 20:10:46 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c95d15b net-mail/courier-imap: adding info as courier-imap run now as user mail Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> net-mail/courier-imap/courier-imap-5.0.7.ebuild | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild index d4cbd2694fc..c6499cdb38a 100644 --- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild +++ b/net-mail/courier-imap/courier-imap-5.0.7.ebuild @@ -62,7 +62,7 @@ For a quick-start howto please refer to ${PN}-gentoo.readme in /usr/share/doc/${PF} Please convert maildir to utf8 -and rerun mkdhparams if needed. Locatio has changed +and rerun mkdhparams if needed. Location has changed " PATCHES=( @@ -244,4 +244,11 @@ pkg_postinst() { fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}" readme.gentoo_print_elog + + elog "" + elog "Courier Imap now run as user mail:mail." + elog "" + elog "This require you to enable read/write access to the caches:" + elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)" + elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )" }
[gentoo-commits] repo/gentoo:master commit in: app-portage/java-ebuilder/
commit: 5b365713e2bc9751eb00c88e363d6265a3743205 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 20:02:55 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 20:03:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b365713 app-portage/java-ebuilder: bump and fixes Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Miroslav Šulc gentoo.org> app-portage/java-ebuilder/Manifest | 3 +- app-portage/java-ebuilder/java-ebuilder-0.2.ebuild | 65 -- ...ilder-0.1.ebuild => java-ebuilder-0.3.0.ebuild} | 26 + .../java-ebuilder/java-ebuilder-.ebuild| 24 +--- 4 files changed, 32 insertions(+), 86 deletions(-) diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest index 5c6b9f0e520..5cf9428f053 100644 --- a/app-portage/java-ebuilder/Manifest +++ b/app-portage/java-ebuilder/Manifest @@ -1,2 +1 @@ -DIST java-ebuilder-0.1.tar.gz 22291 BLAKE2B c958ec8c02d33dba4f70877aefe9c8e11a9a8b9acadad614c4c792f736f9a25306ac45fe6730dcebcbf33bb5135d9086a7915f01c58f6273d1a3e54c0c52766c SHA512 bc058b03da53bab03d7a48b2971f34da812bfd03aff7cc64ee4a3209245f4855bf8095d12c5c506f49b896db69fba09f06814f4c35e13a25c4e8f381d6416637 -DIST java-ebuilder-0.2.tar.gz 22998 BLAKE2B 3ba143a765f2f9b6a99bce1733724aa90ea5d0472d4d3d679217d3854ad61eefb32fd760cb117ef6ecd3a9a57b477895353f471b59a3d79748b383e6bf1fec05 SHA512 c76b15d4a81413e05359202c7b73b84baa3b277faddb7aa5f904290e5e47ed2bc6d80638c7b5417acc4224d067e4f48f1687972b7e36c363da8e9a89ea7f2766 +DIST java-ebuilder-0.3.0.tar.gz 23127 BLAKE2B 2893d8afffe128bff769f2e2bbeaa393182c8d6671cdc3da0755a3cabb07552f6f22d9120e77232f7db83dbde5baae8ce9b40becbad85fabaf5238f6ee96bbeb SHA512 0f6ce22d144e888c05d4cbe488434454f9f5ff8598ebb6e6f9734bab90cead14283b6b82b5bfc52aa43f39ad786085453d6171d81537af2983717363645b6c63 diff --git a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild deleted file mode 100644 index f294a30ebbc..000 --- a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2016-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -if [[ ${PV} == ]]; then - ECLASS="git-r3" - EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git; -else - SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -inherit java-pkg-2 java-pkg-simple prefix ${ECLASS} - -DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml" -HOMEPAGE="https://github.com/gentoo/java-ebuilder; - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8 - sys-process/parallel - >=dev-java/maven-bin-3" - -S="${WORKDIR}/${P}" - -JAVA_SRC_DIR="src/main/java" -JAVA_ADDRES_DIRS="src/main/resources" - -MAIN_CLASS="org.gentoo.java.ebuilder.Main" - -java_prepare() { - eapply_user - local base_dir="target/classes/" - [[ ! -d "${base_dir}" ]] & -p "${base_dir}META-INF" - echo "Manifest-Version: 1.0 -Main-Class: ${MAIN_CLASS}" \ - >> "${base_dir}META-INF/MANIFEST.MF" -} - -src_prepare() { - eapply_user - hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${PN} --main ${MAIN_CLASS} - - insinto /var/lib/${PN} - doins -r maven - dodir /var/lib/${PN}/{poms,cache} - - dodoc README maven.conf - - exeinto /usr/lib/${PN} - doexe scripts/{tree,meta}.sh - - dobin scripts/movl - - insinto /etc - doins java-ebuilder.conf -} diff --git a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.3.0.ebuild similarity index 72% rename from app-portage/java-ebuilder/java-ebuilder-0.1.ebuild rename to app-portage/java-ebuilder/java-ebuilder-0.3.0.ebuild index 1c42c4d5eee..ecd724819f2 100644 --- a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild +++ b/app-portage/java-ebuilder/java-ebuilder-0.3.0.ebuild @@ -1,13 +1,13 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2016-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 if [[ ${PV} == ]]; then ECLASS="git-r3" - EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git; + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git; else - SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz; KEYWORDS="~amd64" fi @@ -31,18 +31,23 @@ JAVA_ADDRES_DIRS="src/main/resources" MAIN_CLASS="org.gentoo.java.ebuilder.Main" -java_prepare() { - eapply_user +src_prepare() { + default + local
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/resources/
commit: a9eaed866badaffb61c98b4ec9bf7281c6d4d30e Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 20:00:05 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 20:00:05 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=a9eaed86 fixed usage app name Signed-off-by: Miroslav Šulc gentoo.org> src/main/resources/usage.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/usage.txt b/src/main/resources/usage.txt index 40e1914..c874ace 100644 --- a/src/main/resources/usage.txt +++ b/src/main/resources/usage.txt @@ -1,4 +1,4 @@ -Usage: jar +Usage: java-ebuilder --download-uri|-u uri that goes to SRC_URI --ebuild|-e path to ebuild that should be created --generate-ebuild|-ggenerates ebuild from pom.xml
[gentoo-commits] proj/java-ebuilder:master commit in: /
commit: 527a7af2c4863fd76321e1f077539ff60b4aa182 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 19:59:43 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 19:59:43 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=527a7af2 version updated Signed-off-by: Miroslav Šulc gentoo.org> pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d669adc..921c3ef 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.gentoo java-ebuilder -0.3.0 +0.3.1-SNAPSHOT jar Gentoo Java ebuild Builder Java team tool for semi-automatic creation of ebuilds from pom.xml.
[gentoo-commits] proj/java-ebuilder:master commit in: /
commit: 59d676837063bd608fd288c4d42c54858151b2ab Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 19:56:54 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 19:56:54 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=59d67683 release 0.3.0 Signed-off-by: Miroslav Šulc gentoo.org> pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0f6d2e..d669adc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.gentoo java-ebuilder -1.0.0-SNAPSHOT +0.3.0 jar Gentoo Java ebuild Builder Java team tool for semi-automatic creation of ebuilds from pom.xml.
[gentoo-commits] proj/java-ebuilder: New tag: 0.3.0
commit: Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 19:57:30 2019 + New tag: 0.3.0
[gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/
commit: af776366a29213cc6fdbcd990c59aceb65911dea Author: Ben Kohler gentoo org> AuthorDate: Wed Oct 30 18:26:38 2019 + Commit: Ben Kohler gentoo org> CommitDate: Wed Oct 30 18:26:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af776366 net-wireless/iwd: revbump 0.23 for strict ell dep, drop old iwd-0.23 actually needs ~ell-0.25, it will segfault with 0.26. Keeping iwd-0.23 since NetworkManager doesn't work with 1.0 yet. Drop old revisions with incorrect deps. Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> .../iwd/{iwd-0.23.ebuild => iwd-0.23-r1.ebuild}| 2 +- net-wireless/iwd/iwd-1.0.ebuild| 144 - 2 files changed, 1 insertion(+), 145 deletions(-) diff --git a/net-wireless/iwd/iwd-0.23.ebuild b/net-wireless/iwd/iwd-0.23-r1.ebuild similarity index 99% rename from net-wireless/iwd/iwd-0.23.ebuild rename to net-wireless/iwd/iwd-0.23-r1.ebuild index e8302612e25..e249a29033b 100644 --- a/net-wireless/iwd/iwd-0.23.ebuild +++ b/net-wireless/iwd/iwd-0.23-r1.ebuild @@ -19,7 +19,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3" -COMMON_DEPEND=">=dev-libs/ell-0.25 +COMMON_DEPEND="~dev-libs/ell-0.25 sys-apps/dbus client? ( sys-libs/readline:0= )" diff --git a/net-wireless/iwd/iwd-1.0.ebuild b/net-wireless/iwd/iwd-1.0.ebuild deleted file mode 100644 index ba253b60989..000 --- a/net-wireless/iwd/iwd-1.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic linux-info systemd - -if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git; - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86" -fi - -DESCRIPTION="Wireless daemon for linux" -HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/; - -LICENSE="GPL-2" -SLOT="0" -IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3" - -COMMON_DEPEND=">=dev-libs/ell-0.25 - sys-apps/dbus - client? ( sys-libs/readline:0= )" - -RDEPEND="${COMMON_DEPEND} - net-wireless/wireless-regdb - crda? ( net-wireless/crda )" - -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -[[ ${PV} == ** ]] && DEPEND+=" dev-python/docutils" - -pkg_pretend() { - CONFIG_CHECK=" - ~ASYMMETRIC_KEY_TYPE - ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE - ~CFG80211 - ~CRYPTO_AES - ~CRYPTO_ARC4 - ~CRYPTO_CBC - ~CRYPTO_CMAC - ~CRYPTO_DES - ~CRYPTO_ECB - ~CRYPTO_HMAC - ~CRYPTO_MD4 - ~CRYPTO_MD5 - ~CRYPTO_RSA - ~CRYPTO_SHA1 - ~CRYPTO_SHA256 - ~CRYPTO_SHA512 - ~CRYPTO_USER_API_HASH - ~CRYPTO_USER_API_SKCIPHER - ~KEY_DH_OPERATIONS - ~PKCS7_MESSAGE_PARSER - ~X509_CERTIFICATE_PARSER - " - if use crda;then - CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT" - WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support" - fi - - if use amd64;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64" - WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance" - WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance" - fi - - if use cpu_flags_x86_aes;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL" - WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance" - fi - - if use cpu_flags_x86_ssse3 && use amd64; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3" - WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance" - fi - - if use kernel_linux && kernel_is -ge 4 20; then - CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER" - fi - - check_extra_config - - if ! use crda; then - if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \ - && [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]] -
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, ...
commit: e71822f64bdddf72820cdbda93a3339946a2f9e3 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 19:22:19 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 19:22:30 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=e71822f6 added header to the cache file Signed-off-by: Miroslav Šulc gentoo.org> src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java | 2 +- src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java index 9d91528..4772e61 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java @@ -112,7 +112,7 @@ public class MavenCache { line = reader.readLine(); while (line != null) { -if (!line.isEmpty()) { +if (!line.isEmpty() && line.charAt(0) != '#') { addCacheItem(new CacheItem(line)); } diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java index 095e001..12422c2 100644 --- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java @@ -386,7 +386,8 @@ public class PortageParser { StandardOpenOption.TRUNCATE_EXISTING), Charset.forName("UTF-8"))) { writer.write(CACHE_VERSION); -writer.write('\n'); +writer.write("\n#category:pkg:version:slot:useFlag:groupId:" ++ "artifactId:mavenVersion\n"); for (final CacheItem cacheItem : cacheItems) { writer.write(cacheItem.getCategory());
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, ...
commit: 6997747f61ccd821b0f31a1f0228a57ba9a2ded6 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 19:26:31 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 19:26:31 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=6997747f reformatted Signed-off-by: Miroslav Šulc gentoo.org> src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java | 4 ++-- .../java/org/gentoo/java/ebuilder/portage/PortageParser.java | 11 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java index 4772e61..0aa33c5 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java @@ -98,8 +98,8 @@ public class MavenCache { cache.clear(); -try (final BufferedReader reader = new BufferedReader(new FileReader( -config.getCacheFile().toFile( { +try (final BufferedReader reader = new BufferedReader( +new FileReader(config.getCacheFile().toFile( { String line = reader.readLine(); if (!PortageParser.CACHE_VERSION.equals(line)) { diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java index 6b0ae3c..d504b2c 100644 --- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java @@ -174,7 +174,8 @@ public class PortageParser { */ private void parseEbuild(final File ebuild) { final String filename = ebuild.getName().replaceAll("\\.ebuild$", ""); -final String category = ebuild.getParentFile().getParentFile().getName(); +final String category += ebuild.getParentFile().getParentFile().getName(); final String pkg = ebuild.getParentFile().getName(); final String version = filename.substring(pkg.length() + 1); final Map variables = new HashMap<>(20); @@ -206,8 +207,8 @@ public class PortageParser { final Matcher matcher = PATTERN_VARIABLE.matcher(line); if (matcher.matches()) { -variables.put(matcher.group(1), matcher.group(2). -replaceAll("(^\"|\"$)", "")); +variables.put(matcher.group(1), +matcher.group(2).replaceAll("(^\"|\"$)", "")); } if (line.startsWith("inherit ")) { @@ -336,8 +337,8 @@ public class PortageParser { } if (result.indexOf('$') != -1) { -final Matcher matcher = PATTERN_SLOT_VERSION_COMPOPONENT_RANGE. -matcher(result); +final Matcher matcher += PATTERN_SLOT_VERSION_COMPOPONENT_RANGE.matcher(result); if (matcher.matches()) { final int start = Integer.parseInt(matcher.group(1), 10);
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/
commit: 54cf529486ad0702ba76e9269552c53a817075fa Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 19:26:01 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 19:26:01 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=54cf5294 added fix to avoid parsing directories that are not package directories Signed-off-by: Miroslav Šulc gentoo.org> src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java | 4 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java index 12422c2..6b0ae3c 100644 --- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java @@ -292,6 +292,10 @@ public class PortageParser { (final File pathname) -> pathname.isFile() && pathname.getName().endsWith(".ebuild")); +if (ebuilds == null) { +return; +} + for (final File ebuild : ebuilds) { parseEbuild(ebuild); processedEbuilds++;
[gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/
commit: 8c19e7d41c3c5dcf150b00faa617253c816c96eb Author: Ben Kohler gentoo org> AuthorDate: Wed Oct 30 17:51:25 2019 + Commit: Ben Kohler gentoo org> CommitDate: Wed Oct 30 17:51:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c19e7d4 net-wireless/iwd: revbump for missed ell version update Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> net-wireless/iwd/iwd-1.0-r1.ebuild | 144 + 1 file changed, 144 insertions(+) diff --git a/net-wireless/iwd/iwd-1.0-r1.ebuild b/net-wireless/iwd/iwd-1.0-r1.ebuild new file mode 100644 index 000..353d6500a01 --- /dev/null +++ b/net-wireless/iwd/iwd-1.0-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools flag-o-matic linux-info systemd + +if [[ ${PV} == ** ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git; + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86" +fi + +DESCRIPTION="Wireless daemon for linux" +HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/; + +LICENSE="GPL-2" +SLOT="0" +IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3" + +COMMON_DEPEND=">=dev-libs/ell-0.26 + sys-apps/dbus + client? ( sys-libs/readline:0= )" + +RDEPEND="${COMMON_DEPEND} + net-wireless/wireless-regdb + crda? ( net-wireless/crda )" + +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +[[ ${PV} == ** ]] && DEPEND+=" dev-python/docutils" + +pkg_pretend() { + CONFIG_CHECK=" + ~ASYMMETRIC_KEY_TYPE + ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE + ~CFG80211 + ~CRYPTO_AES + ~CRYPTO_ARC4 + ~CRYPTO_CBC + ~CRYPTO_CMAC + ~CRYPTO_DES + ~CRYPTO_ECB + ~CRYPTO_HMAC + ~CRYPTO_MD4 + ~CRYPTO_MD5 + ~CRYPTO_RSA + ~CRYPTO_SHA1 + ~CRYPTO_SHA256 + ~CRYPTO_SHA512 + ~CRYPTO_USER_API_HASH + ~CRYPTO_USER_API_SKCIPHER + ~KEY_DH_OPERATIONS + ~PKCS7_MESSAGE_PARSER + ~X509_CERTIFICATE_PARSER + " + if use crda;then + CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT" + WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support" + fi + + if use amd64;then + CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64" + WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance" + WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance" + fi + + if use cpu_flags_x86_aes;then + CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL" + WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance" + fi + + if use cpu_flags_x86_ssse3 && use amd64; then + CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3" + WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance" + WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance" + WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance" + fi + + if use kernel_linux && kernel_is -ge 4 20; then + CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER" + fi + + check_extra_config + + if ! use crda; then + if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \ + && [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]] + then + ewarn "" + ewarn "REGULATORY DOMAIN PROBLEM:" + ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from" + ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m" + ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE." + ewarn "" + fi + fi +} + +src_unpack() { + if [[ ${PV} == ** ]] ; then + git-r3_src_unpack + git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell + else + default + fi +} + +src_prepare() { + default + eautoreconf +} +
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/, ...
commit: 93acbb64ecbc2d5da73c96033d047209b3f74963 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 17:42:12 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 17:43:31 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=93acbb64 reformatted and improved style Signed-off-by: Miroslav Šulc gentoo.org> .../gentoo/java/ebuilder/maven/MavenParser.java| 5 +++-- .../gentoo/java/ebuilder/portage/MavenVersion.java | 22 ++ .../java/ebuilder/portage/PortageParser.java | 12 ++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java index 4ab15e9..2e81541 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java @@ -529,8 +529,9 @@ public class MavenParser { scope = reader.getElementText(); break; case "version": -version = reader.getElementText().replace("-SNAPSHOT", -""); +version = reader.getElementText().replace( +"-SNAPSHOT", ""); + /* crazy version from * org.khronos:opengl-api:gl1.1-android-2.1_r1 */ // TODO: this should go to a file mapping crazy versions diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java index e2bf46f..657d3c4 100644 --- a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java +++ b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java @@ -18,7 +18,8 @@ public class MavenVersion implements Comparable { /** * Pattern for parsing maven version range. */ -private static final Pattern p_VERSION_RANGE = Pattern.compile("\\[.*, ?(.*?)\\]"); +private static final Pattern PATTERN_VERSION_RANGE += Pattern.compile("\\[.*, ?(.*?)\\]"); /** * Incremental version number. */ @@ -41,16 +42,21 @@ public class MavenVersion implements Comparable { * * @param version version string */ -public MavenVersion(String version) { - Matcher m_RANGE = p_VERSION_RANGE.matcher(version); -if (m_RANGE.matches()) { -version = m_RANGE.group(1); +public MavenVersion(final String version) { +final Matcher matcherRange = PATTERN_VERSION_RANGE.matcher(version); +final String useVersion; + +if (matcherRange.matches()) { +useVersion = matcherRange.group(1); +} else { +useVersion = version; } -final Matcher matcher = PATTERN_VERSION.matcher(version); + +final Matcher matcher = PATTERN_VERSION.matcher(useVersion); if (!matcher.matches()) { -throw new RuntimeException("Maven version " + version -+ " is not valid."); +throw new RuntimeException( +"Maven version " + useVersion + " is not valid."); } majorVersion = Integer.parseInt(matcher.group(1), 10); diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java index aa8a14b..095e001 100644 --- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java @@ -29,6 +29,10 @@ public class PortageParser { * Cache version. */ public static final String CACHE_VERSION = "1.0"; +/** + * Current ant utilities eclass name. + */ +private static final String ECLASS_ANT_TASKS = "ant-tasks"; /** * Current java package eclass name. */ @@ -45,10 +49,6 @@ public class PortageParser { * Current java utilities eclass name. */ private static final String ECLASS_JAVA_UTILS = "java-utils-2"; -/** - * Current ant utilities eclass name. - */ -private static final String ECLASS_ANT_TASKS = "ant-tasks"; /** * Pattern for parsing SLOT with bash substring. */ @@ -130,8 +130,8 @@ public class PortageParser { return ECLASS_JAVA_PKG_SIMPLE; } else if (inheritLine.contains(ECLASS_JAVA_UTILS)) { return ECLASS_JAVA_UTILS; - } else if (inheritLine.contains(ECLASS_ANT_TASKS)) { - return ECLASS_ANT_TASKS; +} else if (inheritLine.contains(ECLASS_ANT_TASKS)) { +return ECLASS_ANT_TASKS; } else { return null; }
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/
commit: 26b77b6db177bb7f47ff93de1739c49272d28b22 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 17:37:51 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 17:37:51 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=26b77b6d removed unused import Signed-off-by: Miroslav Šulc gentoo.org> src/main/java/org/gentoo/java/ebuilder/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/Main.java b/src/main/java/org/gentoo/java/ebuilder/Main.java index 0a69442..5921ea1 100644 --- a/src/main/java/org/gentoo/java/ebuilder/Main.java +++ b/src/main/java/org/gentoo/java/ebuilder/Main.java @@ -7,7 +7,6 @@ import java.io.InputStreamReader; import java.io.PrintWriter; import java.net.URI; import java.net.URISyntaxException; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import org.gentoo.java.ebuilder.maven.MavenCache;
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/
commit: fbe55dc306855e8743631402df4fc58bdc19a956 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 17:41:47 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 17:43:16 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=fbe55dc3 added todos Signed-off-by: Miroslav Šulc gentoo.org> src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java index 6e6435e..4ab15e9 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java @@ -515,8 +515,12 @@ public class MavenParser { switch (reader.getLocalName()) { case "artifactId": artifactId = reader.getElementText(); + /* jsch.agentproxy is an empty artifact. */ - if (artifactId.equals("jsch.agentproxy")) return; +// TODO: this should go to a config file to ignore some artifacts + if (artifactId.equals("jsch.agentproxy")) { +return; +} break; case "groupId": groupId = reader.getElementText(); @@ -529,6 +533,7 @@ public class MavenParser { ""); /* crazy version from * org.khronos:opengl-api:gl1.1-android-2.1_r1 */ +// TODO: this should go to a file mapping crazy versions if (version.equals("gl1.1-android-2.1_r1")) { version = "2.1.1"; }
[gentoo-commits] proj/java-ebuilder:master commit in: /
commit: 7e9b7fc445f1e95fc3aafde210571eb4af132bd2 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 17:36:35 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 30 17:37:02 2019 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=7e9b7fc4 updated pom.xml Signed-off-by: Miroslav Šulc gentoo.org> pom.xml | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 346a968..d0f6d2e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,8 @@ -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.gentoo java-ebuilder @@ -17,7 +20,7 @@ org.apache.maven.plugins maven-jar-plugin -2.6 +3.1.2
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: 147f237a57b7eea135c53f842d53c51a120d4d8c Author: Benda Xu gentoo org> AuthorDate: Mon Jan 9 11:21:27 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 9 12:43:29 2017 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=147f237a tree.sh: remove both beta and p in _beta1_p1.2.0. scripts/tree.sh | 48 +++- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/scripts/tree.sh b/scripts/tree.sh index 3b44481..c44c127 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -6,24 +6,8 @@ source /etc/java-ebuilder.conf mkdir -p "${POMDIR}" -gebd() { -case ${MA} in -weld-osgi-bundle) -# 1.1.0.Final no longer exist -[[ ${MV} = 1.1.0.Final ]] && MV=1.1.33.Final -;; -esac - -local WORKDIR=${PG//./\/}/${MA} MID -local MID=${PG}:${MA}:${MV} -local PV=${MV} PA SLOT - -case ${MA} in -opengl-api) -[[ ${MV} = 2.1.1 ]] && MV=gl1.1-android-2.1_r1 -;; -esac - +sver() { +PV=$1 # com.github.lindenb:jbwa:1.0.0_ppc64 PV=${PV/_/.} # plexus-container-default 1.0-alpha-9-stable-1 @@ -49,14 +33,36 @@ gebd() { PV=${PV%.[a-zA-Z]*} # com.google.cloud.genomics:google-genomics-dataflow:v1beta2-0.15 -> 1.2.0.15 # plexus-container-default 1.0-alpha-9-stable-1 -> 1.0.9.1 -PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV}) +while [[ ${PV} != ${PV0} ]]; do + PV0=${PV} + PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV0}) +done # remove all non-numeric charactors before _ # org.scalamacros:quasiquotes_2.10:2.0.0-M8 if [[ ${PV} = *_* ]]; then - PV=$(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/} + echo $(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/} else - PV=$(sed 's/[^.0-9]//g' <<< ${PV}) + sed 's/[^.0-9]//g' <<< ${PV} fi +} + +gebd() { +case ${MA} in +weld-osgi-bundle) +# 1.1.0.Final no longer exist +[[ ${MV} = 1.1.0.Final ]] && MV=1.1.33.Final +;; +esac + +local WORKDIR=${PG//./\/}/${MA} MID +local MID=${PG}:${MA}:${MV} +local PV=$(sver ${MV}) PA SLOT + +case ${MA} in +opengl-api) +[[ ${MV} = 2.1.1 ]] && MV=gl1.1-android-2.1_r1 +;; +esac # spark-launcher_2.11 for scala 2.11 eval $(sed -nr 's,([^_]*)(_(.*))?,PA=\1 SLOT=\3,p' <<< ${MA})
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/
commit: 304e54ebfcd4e20ca3e54aaf6add7e02a9f15210 Author: Benda Xu gentoo org> AuthorDate: Mon Jan 9 11:48:48 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 9 12:43:30 2017 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=304e54eb MavenVersion.java: _rc3 should not be stripped. >=cat/pkg-1.0 does not match cat/pkg-1.0_rc3 src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java index 1295856..9d91528 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java @@ -163,13 +163,13 @@ public class MavenCache { } /** - * Strips all -r* and _* segments from the version string. + * Strips all -r* from the version string. * * @param version version string * * @return stripped version string */ private String stripExtraFromVersion(final String version) { -return version.replaceAll("-r\\d+", "").replaceAll("_.*", ""); +return version.replaceAll("-r\\d+", ""); } }
[gentoo-commits] proj/java-ebuilder:master commit in: /
commit: f7e06cbacd74e8d361756e0fd80f0f95075f8239 Author: Benda Xu gentoo org> AuthorDate: Sun Oct 9 01:24:49 2016 + Commit: Michał Górny gentoo org> CommitDate: Sun Oct 9 01:24:49 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=f7e06cba Document how to install it in Gentoo. README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index febc04d..8b46302 100644 --- a/README +++ b/README @@ -1,5 +1,8 @@ Java team tool for semi-automatic creation of ebuilds from pom.xml. +0. Java-ebuilder is available in gentoo as app-portage/java-ebuilder. + `emerge app-portage/java-ebuilder` + 1. Edit /etc/java-ebuilder.conf to add the artifact you want to MAVEN_ARTS, separated by space. 2. Run `movl build`
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: 0195ce4168ad8cc4560cdb1a5b64f022a2703c10 Author: Benda Xu gentoo org> AuthorDate: Mon Jan 9 04:08:21 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 9 04:08:21 2017 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=0195ce41 tree.sh: more maven version compatibility tricks. scripts/meta.sh | 5 + scripts/tree.sh | 31 ++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/scripts/meta.sh b/scripts/meta.sh index 42a45a2..82d3dc1 100755 --- a/scripts/meta.sh +++ b/scripts/meta.sh @@ -69,6 +69,11 @@ case ${spkg} in echo $1:org.ow2.asm:${spkg}-all:${sver%%-*} echo $1:org.ow2.asm:${spkg}-debug-all:${sver%%-*} exit 0 + ;; +cofoja) + echo $1:org.huoc:${spkg}:${sver%%-*} + exit 0 + ;; esac touch bebd bpom diff --git a/scripts/tree.sh b/scripts/tree.sh index 8de9045..3b44481 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -16,8 +16,7 @@ gebd() { local WORKDIR=${PG//./\/}/${MA} MID local MID=${PG}:${MA}:${MV} -# .Final .GA .v20121024 means nothing -local PV=${MV%.[a-zA-Z]*} PA SLOT +local PV=${MV} PA SLOT case ${MA} in opengl-api) @@ -25,17 +24,39 @@ gebd() { ;; esac +# com.github.lindenb:jbwa:1.0.0_ppc64 +PV=${PV/_/.} # plexus-container-default 1.0-alpha-9-stable-1 -PV=${PV/-stable-*/} -PV=${PV/-alpha-/_alpha} +PV=${PV/-stable-/.} +PV=$(sed -r 's/[.-]?alpha[-.]?/_alpha/' <<< ${PV}) # wagon-provider-api 1.0-beta-7 -PV=${PV/-beta-/_beta} +# com.google.cloud.datastore:datastore-v1beta3-proto-client:1.0.0-beta.2 +# com.google.cloud.datastore:datastore-v1beta3-protos:1.0.0-beta +PV=$(sed -r 's/[.-]?beta[-.]?/_beta/' <<< ${PV}) # aopalliance-repackaged 2.5.0-b16 PV=${PV/-b/_beta} +# com.google.auto.service:auto-service:1.0-rc2 +PV=${PV/-rc/_rc} # cdi-api 1.0-SP4 PV=${PV/-SP/_p} +# org.seqdoop:cofoja:1.1-r150 +PV=${PV/-rev/_p} +PV=${PV/-r/_p} +PV=${PV/.v/_p} # javax.xml.stream:stax-api:1.0-2 PV=${PV//-/.} +# .Final .GA -incubating means nothing +PV=${PV%.[a-zA-Z]*} +# com.google.cloud.genomics:google-genomics-dataflow:v1beta2-0.15 -> 1.2.0.15 +# plexus-container-default 1.0-alpha-9-stable-1 -> 1.0.9.1 +PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV}) +# remove all non-numeric charactors before _ +# org.scalamacros:quasiquotes_2.10:2.0.0-M8 +if [[ ${PV} = *_* ]]; then + PV=$(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/} +else + PV=$(sed 's/[^.0-9]//g' <<< ${PV}) +fi # spark-launcher_2.11 for scala 2.11 eval $(sed -nr 's,([^_]*)(_(.*))?,PA=\1 SLOT=\3,p' <<< ${MA})
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/
commit: a8b7bf3afb383ba515d32e921dd4412b5991bd8e Author: Benda Xu gentoo org> AuthorDate: Mon Jan 9 10:59:42 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 9 11:09:39 2017 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=a8b7bf3a MavenVersion.java: parse version range. http://maven.apache.org/components/enforcer/enforcer-rules/versionRanges.html https://docs.oracle.com/middleware/1212/core/MAVEN/maven_version.htm .../java/org/gentoo/java/ebuilder/portage/MavenVersion.java| 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java index 5192abc..e2bf46f 100644 --- a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java +++ b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java @@ -15,6 +15,10 @@ public class MavenVersion implements Comparable { */ private static final Pattern PATTERN_VERSION = Pattern.compile( "^v?(\\d+)(?:\\.(\\d+))?(?:(?:\\.|b|beta)(\\d+))?(?:[\\.-](.*))?$"); +/** + * Pattern for parsing maven version range. + */ +private static final Pattern p_VERSION_RANGE = Pattern.compile("\\[.*, ?(.*?)\\]"); /** * Incremental version number. */ @@ -37,7 +41,11 @@ public class MavenVersion implements Comparable { * * @param version version string */ -public MavenVersion(final String version) { +public MavenVersion(String version) { + Matcher m_RANGE = p_VERSION_RANGE.matcher(version); +if (m_RANGE.matches()) { +version = m_RANGE.group(1); +} final Matcher matcher = PATTERN_VERSION.matcher(version); if (!matcher.matches()) {
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/, /, src/main/java/org/gentoo/java/ebuilder/maven/, ...
commit: 96d9679d0a19f3bbaf404005465b924eb3018e08 Author: heroxbd gmail com> AuthorDate: Wed Oct 5 15:31:59 2016 + Commit: Michał Górny gentoo org> CommitDate: Wed Oct 5 15:31:59 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=96d9679d Major updates to resolve dependency (#8) * MavenEbuilder: mavenProject targetversion is not an array. * MavenVersion: expand regex. 1. match 3.1.4.GA (org.jboss.logging:jboss-logging) 2. match 2.0b6 (org.apache-extras.beanshell:bsh) * MavenCache: artifactId may not be identical to gentoo package. * MavenCache: give explicit error messages as place holders when dependency is missing. * script/meta.sh: auxiliary script to relate gentoo repo to maven repo metadata. * Specify the default jre version. * tree.sh: recursively call java-ebuilder. * meta.sh: use maven to enumerate child modules. * meta.sh: add more exceptions. * MavenEbuilder.java: handle SLOT dependency according to ebuild styles. If SLOT=0, no SLOT is used in CLASSPATH. * MavenEbuilder.java: remove JAVA_SRC_DIR. Not needed. The default is enough. Because we have one ebuild per child module. * MavenParser.java: mvn timeout to 10minutes. When something cannot be downloaded, maven could use several minutes to finish. * MavenParser.java: let scope default to "compile". It is interpreted as common dependencies. Some poms does not specify scopes of their dependencies. * MavenParser.java: remove maven build instructions. They are not used at all. Parsing them can cause error in some poms. The side effect is that testdependencies are not triggered. * MavenProject.java: remove system dependencies. They are deprecated: https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#System_Dependencies They are satisfied by virtual/jdk. * MavenProject.java: source encoding default to UTF-8. * PortageParser.java: consider dev-java/ant-* ebuilds. * MavenParser.java: parse opengl-api version from pom. README | 23 + scripts/meta.sh| 101 +++ scripts/tree.sh| 111 + .../org/gentoo/java/ebuilder/maven/MavenCache.java | 6 +- .../gentoo/java/ebuilder/maven/MavenEbuilder.java | 23 +++-- .../gentoo/java/ebuilder/maven/MavenParser.java| 14 +-- .../gentoo/java/ebuilder/maven/MavenProject.java | 6 +- .../gentoo/java/ebuilder/portage/MavenVersion.java | 2 +- .../java/ebuilder/portage/PortageParser.java | 6 ++ 9 files changed, 269 insertions(+), 23 deletions(-) diff --git a/README b/README new file mode 100644 index 000..e74f482 --- /dev/null +++ b/README @@ -0,0 +1,23 @@ +Java team tool for semi-automatic creation of ebuilds from pom.xml. + +Use example: + +1. Generate cache of java related packages from portage tree. +java-ebuilder --refresh-cache -t /usr/portage + +2. Find corresponding maven groupId, artifactId and version in the cache. +cd $HOME/.java-ebuilder +mv cache cache.raw0 +( echo 1.0; tail -n +2 cache.raw0 | parallel -j -2 scripts/meta.sh; ) > cache.0 + +3. Generate cache of java related packages from java overaly. +java-ebuilder --refresh-cache -t /var/lib/layman/java + +4. Find corresponding maven groupId, artifactId and version in the cache. +cd $HOME/.java-ebuilder +mv cache cache.raw1 +( echo 1.0; tail -n +2 cache.raw1 | parallel -j -2 scripts/meta.sh; ) > cache.1 + +5. Create ebuild recursively. +script/tree.sh org.apache.spark:spark-core_2.11:2.0.0 + diff --git a/scripts/meta.sh b/scripts/meta.sh new file mode 100755 index 000..0a142c8 --- /dev/null +++ b/scripts/meta.sh @@ -0,0 +1,101 @@ +#!/usr/bin/env bash +# read in cache from java-ebuilder and find out the groupId, +# artifactId and version. + +# cache is by default at $HOME/.java-ebuilder/cache +# example: +# ( echo 1.0; tail -n +2 cache | parallel -j -2 meta.sh; ) > cache.1 + +pkg=$(awk -F ":" '{print $1"/"$2"-"$3}' <<< $1) +spkg=$(cut -d: -f2 <<< $1) +sver=$(cut -d: -f3 <<< $1) +case ${spkg} in +guava) +echo $1:com.google.guava:${spkg}:${sver%%-*} +exit 0 +;; +json) +echo $1:org.json:${spkg}:${sver%%-*} +exit 0 +;; +xerces) +echo $1:xerces:${spkg}:${sver%%-*} +echo $1:xerces:xercesImpl:${sver%%-*} +echo $1:xerces:xmlParserAPIs:${sver%%-*} +exit 0 +;; +commons-*|classworlds|jdom) +echo $1:${spkg}:${spkg}:${sver%%-*} +exit 0 +;; +velocity) +echo $1:org.apache.${spkg}:${spkg}:${sver%%-*} +exit 0 +;; +jtidy) +echo $1:net.sf.${spkg}:${spkg}:${sver%%-*} +exit 0 +;; +saxpath) +echo $1:${spkg}:${spkg}:${sver%%-*}-FCS # maven version +echo $1:org.jdom:${spkg}:${sver%%-*}-FCS +exit 0 +;; +ant*) +[[ ${spkg}
[gentoo-commits] proj/java-ebuilder: New tag: 0.1
commit: Commit: Michał Górny gentoo org> CommitDate: Wed Oct 30 17:35:17 2019 + New tag: 0.1
[gentoo-commits] proj/java-ebuilder:master commit in: /, scripts/
commit: d9582a1af26803b8984c38d8f9a7482a9c110270 Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 07:56:18 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 10:13:32 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=d9582a1a movl, meta.sh: query portage related variables at runtime. java-ebuilder.conf | 2 -- scripts/meta.sh| 1 + scripts/movl | 6 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/java-ebuilder.conf b/java-ebuilder.conf index 1bf7e33..f391484 100644 --- a/java-ebuilder.conf +++ b/java-ebuilder.conf @@ -1,5 +1,3 @@ -PORTDIR=/usr/portage -PORTAGE_TMPDIR=/var/tmp # JAVA_OVERLAY_DIR=/var/lib/layman/java POMDIR=/var/lib/java-ebuilder/poms MAVEN_OVERLAY_DIR=/var/lib/java-ebuilder/maven diff --git a/scripts/meta.sh b/scripts/meta.sh index 10c317f..935330f 100755 --- a/scripts/meta.sh +++ b/scripts/meta.sh @@ -5,6 +5,7 @@ # example: # ( echo 1.0; tail -n +2 cache | parallel -j -2 meta.sh; ) > cache.1 source /etc/java-ebuilder.conf +: ${PORTAGE_TMPDIR:=$(portageq envvar PORTAGE_TMPDIR)} pkg=$(awk -F ":" '{print $1"/"$2"-"$3}' <<< $1) spkg=$(cut -d: -f2 <<< $1) diff --git a/scripts/movl b/scripts/movl index 10ecfcc..a4d1bac 100755 --- a/scripts/movl +++ b/scripts/movl @@ -22,6 +22,10 @@ clean() { } build() { +: ${PORTDIR:=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)} +: ${PORTAGE_TMPDIR:=$(portageq envvar PORTAGE_TMPDIR)} +export PORTAGE_TMPDIR + if [[ ! -f "${CACHEDIR}"/cache.0 ]]; then # 1. Generate cache of java related packages from portage tree. [[ -f "${CACHEDIR}"/cache.raw0 ]] || \ @@ -39,7 +43,7 @@ build() { [[ -f "${CACHEDIR}"/cache.raw1 ]] || \ java-ebuilder --refresh-cache -t "${JAVA_OVERLAY_DIR}" --cache-file "${CACHEDIR}"/cache.raw1 pushd "${CACHEDIR}" > /dev/null -tail -n +2 cache.raw1 | parallel -j -1 scripts/meta.sh > cache.1 +tail -n +2 cache.raw1 | parallel -j -1 /usr/lib/java-ebuilder/meta.sh > cache.1 popd > /dev/null else touch "${CACHEDIR}"/cache.1
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: 5c141afa3b1f12e06d3851bf87fbe435506d82bd Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 05:35:16 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 05:35:16 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=5c141afa movl: add digest. tree.sh: generate cache before ebuild generation. scripts/movl| 2 ++ scripts/tree.sh | 18 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/movl b/scripts/movl index c2f7c0d..10ecfcc 100755 --- a/scripts/movl +++ b/scripts/movl @@ -49,6 +49,8 @@ build() { for M in ${MAVEN_ARTS}; do /usr/lib/java-ebuilder/tree.sh ${M} done + +ls -1 "${MAVEN_OVERLAY_DIR}"/app-maven/*/*.ebuild | parallel ebuild {} digest } if [[ $# -gt 0 ]]; then diff --git a/scripts/tree.sh b/scripts/tree.sh index 3e7b828..bf387a8 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -70,9 +70,17 @@ gebd() { local P=${PA}-${PV} local ebd="${MAVEN_OVERLAY_DIR}"/app-maven/${PA}/${P}.ebuild +line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID} +if ! grep -q ${line} "${CACHEDIR}"/maven-cache 2>/dev/null ; then +pushd "${CACHEDIR}" > /dev/null +echo ${line} >> maven-cache +cat cache.{0,1} maven-cache > cache +popd > /dev/null +fi + if [[ ! -f "${ebd}" ]]; then mkdir -p $(dirname ${ebd}) -java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ +java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ --cache-file "${CACHEDIR}"/cache @@ -83,14 +91,6 @@ gebd() { -i "${ebd}" fi -line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID} -if ! grep -q ${line} "${CACHEDIR}"/maven-cache ; then -pushd "${CACHEDIR}" > /dev/null -echo ${line} >> maven-cache -cat cache.{0,1} maven-cache > cache -popd > /dev/null -fi - if [[ -z "${MAVEN_NODEP}" ]] && mfill "${ebd}"; then java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \
[gentoo-commits] proj/java-ebuilder:master commit in: /
commit: 16d93d8b393bf8b515815b4b2706d4ae39ea4309 Author: William L. Thomson Jr o-sinc com> AuthorDate: Thu Sep 8 17:40:07 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Sep 8 17:40:07 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=16d93d8b COPYING: Added MIT license for project COPYING | 22 ++ 1 file changed, 22 insertions(+) diff --git a/COPYING b/COPYING new file mode 100644 index 000..5a4ca3b --- /dev/null +++ b/COPYING @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) 2016 Gentoo Linux + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[gentoo-commits] proj/java-ebuilder:master commit in: maven/metadata/, maven/eclass/, maven/profiles/
commit: f6a3f0f3268b9bd11cdeac02b7121ab9742a1727 Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 03:02:18 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 03:03:54 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=f6a3f0f3 maven/: maven overlay skeleton. maven/eclass/java-pkg-binjar.eclass | 30 ++ maven/metadata/layout.conf | 2 ++ maven/profiles/category | 1 + maven/profiles/repo_name| 1 + 4 files changed, 34 insertions(+) diff --git a/maven/eclass/java-pkg-binjar.eclass b/maven/eclass/java-pkg-binjar.eclass new file mode 100644 index 000..79947e7 --- /dev/null +++ b/maven/eclass/java-pkg-binjar.eclass @@ -0,0 +1,30 @@ +# Copyright 2004-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# @ECLASS: java-pkg-binjar.eclass +# @MAINTAINER: +# j...@gentoo.org +# @AUTHOR: +# Java maintainers (j...@gentoo.org) +# @BLURB: Eclass for packaging binary jar. +# @DESCRIPTION: +# This class is a short cut to install binary jar directly. Binary jar +# is copied to the standard place together with a environment file. + +inherit java-pkg-simple + +EXPORT_FUNCTIONS src_unpack src_compile + +# @FUNCTION: java-pkg-binjar_src_unpack +# @DESCRIPTION: +# Copy the binary jar into the expected place of java-pkg-simple. Do +# not extract files from archive. +java-pkg-binjar_src_unpack() { + cp "${DISTDIR}"/${A} "${S}"/${PN}.jar || die "cp failed" +} + +# @FUNCTION: java-pkg-simple_src_compile +# @DESCRIPTION: +# Do nothing as we are doing binary install. +java-pkg-binjar_src_compile() { :; } diff --git a/maven/metadata/layout.conf b/maven/metadata/layout.conf new file mode 100644 index 000..78053de --- /dev/null +++ b/maven/metadata/layout.conf @@ -0,0 +1,2 @@ +repo_name = maven +masters = gentoo diff --git a/maven/profiles/category b/maven/profiles/category new file mode 100644 index 000..7765958 --- /dev/null +++ b/maven/profiles/category @@ -0,0 +1 @@ +app-maven diff --git a/maven/profiles/repo_name b/maven/profiles/repo_name new file mode 100644 index 000..927333d --- /dev/null +++ b/maven/profiles/repo_name @@ -0,0 +1 @@ +maven
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/
commit: f5b6cd58d567592d8b919b1d1b10b173c23276b0 Author: William L. Thomson Jr o-sinc com> AuthorDate: Wed Oct 5 15:38:48 2016 + Commit: Michał Górny gentoo org> CommitDate: Wed Oct 5 15:38:48 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=f5b6cd58 src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java: Minor change 1. Relocated doc source, and though not used test IUSE variables from IUSE with rest of ebuild variables to above inherit using JAVA_PKG_IUSE. Left test there in case default test case is added to java eclasses, but at this time has no usage in JAVA_PKG_IUSE. .../gentoo/java/ebuilder/maven/MavenEbuilder.java | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java index 067ea80..50c5992 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java @@ -38,11 +38,11 @@ public class MavenEbuilder { writeHeader(writer); writeCommand(config, writer); writeEAPI(writer); -writeInherit(writer); +MavenProject mp = mavenProjects.get(mavenProjects.size() - 1); +writeInherit(mp, writer); // write the info from the last project as it is probably the one // that depends on the rest -writePackageInfo(config, -mavenProjects.get(mavenProjects.size() - 1), writer); +writePackageInfo(config, mp, writer); writeDependencies(config, mavenProjects, writer); writeSourceDir(writer); @@ -481,7 +481,14 @@ public class MavenEbuilder { * * @param writer ebuild writer */ -private void writeInherit(final PrintWriter writer) { +private void writeInherit(final MavenProject mavenProject, + final PrintWriter writer) { +writer.println(); +writer.print("IUSE=\"doc source"); +if (mavenProject.hasTests()) { +writer.print(" test"); +} +writer.println('"'); writer.println(); writer.println("inherit java-pkg-2 java-pkg-simple"); } @@ -562,11 +569,7 @@ public class MavenEbuilder { writer.print(config.getKeywords()); writer.println('"'); -writer.print("IUSE=\"doc source"); - -if (mavenProject.hasTests()) { -writer.print(" test"); -} +writer.print("IUSE=\""); writer.println('"');
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/
commit: 84942a498822697f13a6a34e9e0ee46d79310004 Author: heroxbd gmail com> AuthorDate: Fri Sep 9 06:40:22 2016 + Commit: Michał Górny gentoo org> CommitDate: Fri Sep 9 06:40:22 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=84942a49 org/gentoo/java/ebuilder/maven/MavenParser.java: fix result list 1. Parsed objects should be added the returning result ArrayList. 2. Some pom.xml has 'projects' tag enclosing 'project', ignore it if found. src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java | 5 + 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java index d8e4b48..52449dc 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java @@ -49,6 +49,8 @@ public class MavenParser { "junit", "junit", "4.11", "test", mavenCache.getDependency("junit", "junit", "4.11"))); } + + result.add(mavenProject); }); return result; @@ -347,6 +349,9 @@ public class MavenParser { if (reader.isStartElement()) { switch (reader.getLocalName()) { +case "projects": +/* no-op */ +break; case "project": parseProject(mavenProject, mavenCache, reader); break;
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/
commit: b7d04de03053294019446924ba66f6f3bb45f833 Author: Benda Xu gentoo org> AuthorDate: Mon Jan 9 04:10:39 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 9 04:10:39 2017 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=b7d04de0 MavenVersion.java: maven verion tricks. src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java index e603943..5192abc 100644 --- a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java +++ b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java @@ -14,7 +14,7 @@ public class MavenVersion implements Comparable { * Pattern for parsing maven version number. */ private static final Pattern PATTERN_VERSION = Pattern.compile( -"^(\\d+)(?:\\.(\\d+))?(?:[\\.b](\\d+))?(?:[\\.-](.*))?$"); + "^v?(\\d+)(?:\\.(\\d+))?(?:(?:\\.|b|beta)(\\d+))?(?:[\\.-](.*))?$"); /** * Incremental version number. */
[gentoo-commits] proj/java-ebuilder:master commit in: /
commit: 75e56237a8b3e7dfb1e27ece49eb6db5556a0eaf Author: William L. Thomson Jr o-sinc com> AuthorDate: Wed Oct 5 15:45:39 2016 + Commit: Michał Górny gentoo org> CommitDate: Wed Oct 5 15:45:39 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=75e56237 .travis.yml: Initial travis.yml file for Travis CI. Can it be used? .travis.yml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..4fca48c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: java +jdk: + - oraclejdk8 +sudo: false +script: + - mvn compile +
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: 61bb1d8c568187e0393bc32d78d5972f8245cae9 Author: Benda Xu gentoo org> AuthorDate: Mon Jan 9 11:19:16 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 9 12:43:29 2017 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=61bb1d8c movl: refresh ebuilds and only digest 1 ebuild. scripts/movl | 34 +- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/scripts/movl b/scripts/movl index 231ab5d..efc31c7 100755 --- a/scripts/movl +++ b/scripts/movl @@ -1,5 +1,6 @@ #!/bin/bash -source /etc/java-ebuilder.conf +source "/etc/java-ebuilder.conf" +tsh="/usr/lib/java-ebuilder/tree.sh" clean-maven() { rm -f "${CACHEDIR}"/maven-cache @@ -21,6 +22,27 @@ clean() { clean-maven } +rrdep() { +# regenerate reverse dependencies +for rdep in $(egrep -l "$1.*->" -r "${MAVEN_OVERLAY_DIR}"/app-maven); do + [[ ${rdep} = *.ebuild ]] && "${tsh}" ${rdep} +done +} + +refresh() { +if [[ $1=*:* ]]; then + rrdep $1 +else + # input: package name + for ebd in "${MAVEN_OVERLAY_DIR}"/app-maven/$1/*.ebuild; do + mid=$(sed -nr 's,^MAVEN_ID="(.*)",\1,p' "${ebd}") + rm "${ebd}"; "${tsh}" ${mid} + sed "/${mid}/d" -i "${CACHEDIR}"/maven-cache + rrdep ${mid} + done +fi +} + build() { : ${PORTDIR:=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)} : ${PORTAGE_TMPDIR:=$(portageq envvar PORTAGE_TMPDIR)} @@ -51,18 +73,20 @@ build() { fi for M in ${MAVEN_ARTS}; do -/usr/lib/java-ebuilder/tree.sh ${M} +"${tsh}" ${M} done -ls -1 "${MAVEN_OVERLAY_DIR}"/app-maven/*/*.ebuild | parallel ebuild {} digest +cd "${MAVEN_OVERLAY_DIR}"/app-maven +parallel ebuild '$(echo {}/*.ebuild | cut -d\ -f1)' digest ::: * } if [[ $# -gt 0 ]]; then -funcs=$@ +funcs=$1 +shift 1 else funcs=build fi for func in ${funcs}; do -${func} +${func} $@ done
[gentoo-commits] proj/java-ebuilder:master commit in: /, scripts/
commit: 1b456bef3c706d1cc9e26bc237a5bbba365e2907 Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 04:29:20 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 04:47:19 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1b456bef meta.sh also use configuration file, create movl wrapper script. README | 22 +++ java-ebuilder.conf | 7 ++ maven.conf | 2 ++ scripts/meta.sh| 11 +- scripts/movl | 62 ++ 5 files changed, 80 insertions(+), 24 deletions(-) diff --git a/README b/README index e74f482..febc04d 100644 --- a/README +++ b/README @@ -1,23 +1,7 @@ Java team tool for semi-automatic creation of ebuilds from pom.xml. -Use example: +1. Edit /etc/java-ebuilder.conf to add the artifact you want to MAVEN_ARTS, separated by space. -1. Generate cache of java related packages from portage tree. -java-ebuilder --refresh-cache -t /usr/portage - -2. Find corresponding maven groupId, artifactId and version in the cache. -cd $HOME/.java-ebuilder -mv cache cache.raw0 -( echo 1.0; tail -n +2 cache.raw0 | parallel -j -2 scripts/meta.sh; ) > cache.0 - -3. Generate cache of java related packages from java overaly. -java-ebuilder --refresh-cache -t /var/lib/layman/java - -4. Find corresponding maven groupId, artifactId and version in the cache. -cd $HOME/.java-ebuilder -mv cache cache.raw1 -( echo 1.0; tail -n +2 cache.raw1 | parallel -j -2 scripts/meta.sh; ) > cache.1 - -5. Create ebuild recursively. -script/tree.sh org.apache.spark:spark-core_2.11:2.0.0 +2. Run `movl build` +To start over, run `movl clean` first. diff --git a/java-ebuilder.conf b/java-ebuilder.conf new file mode 100644 index 000..1bf7e33 --- /dev/null +++ b/java-ebuilder.conf @@ -0,0 +1,7 @@ +PORTDIR=/usr/portage +PORTAGE_TMPDIR=/var/tmp +# JAVA_OVERLAY_DIR=/var/lib/layman/java +POMDIR=/var/lib/java-ebuilder/poms +MAVEN_OVERLAY_DIR=/var/lib/java-ebuilder/maven +CACHEDIR=/var/lib/java-ebuilder/cache +# MAVEN_ARTS="org.apache.spark:spark-core_2.11:2.0.0" diff --git a/maven.conf b/maven.conf new file mode 100644 index 000..7621417 --- /dev/null +++ b/maven.conf @@ -0,0 +1,2 @@ +[maven] +location = /var/lib/java-ebuilder/maven diff --git a/scripts/meta.sh b/scripts/meta.sh index 4917098..10c317f 100755 --- a/scripts/meta.sh +++ b/scripts/meta.sh @@ -2,15 +2,15 @@ # read in cache from java-ebuilder and find out the groupId, # artifactId and version. -# cache is by default at $HOME/.java-ebuilder/cache # example: # ( echo 1.0; tail -n +2 cache | parallel -j -2 meta.sh; ) > cache.1 +source /etc/java-ebuilder.conf pkg=$(awk -F ":" '{print $1"/"$2"-"$3}' <<< $1) spkg=$(cut -d: -f2 <<< $1) sver=$(cut -d: -f3 <<< $1) case ${spkg} in -guava) +guava) echo $1:com.google.guava:${spkg}:${sver%%-*} exit 0 ;; @@ -70,6 +70,7 @@ case ${spkg} in exit 0 esac +touch bebd bpom grep -q ${pkg} /dev/null) @@ -81,13 +82,13 @@ fi # java-utils-2.eclass:java-pkg_needs-vm() export JAVA_PKG_NV_DEPEND="nothing" -if ! ebuild ${ebd} unpack >/dev/null 2>&1; then +if ! ebuild "${ebd}" unpack >/dev/null 2>&1; then echo $1:${pkg} >> bebd exit 0 fi bad_pom="yes" -for subd in /dev/shm/portage/${pkg}/work/*; do +for subd in "${PORTAGE_TMPDIR}"/portage/${pkg}/work/*; do [[ -f ${subd}/pom.xml ]] || continue bad_pom="" pushd ${subd} > /dev/null @@ -107,4 +108,4 @@ if [[ -n "${bad_pom}" ]]; then echo $1:${pkg} >> bpom fi -ebuild ${ebd} clean >/dev/null 2>&1 +ebuild "${ebd}" clean >/dev/null 2>&1 diff --git a/scripts/movl b/scripts/movl new file mode 100755 index 000..c2f7c0d --- /dev/null +++ b/scripts/movl @@ -0,0 +1,62 @@ +#!/usr/bin/env bash +source /etc/java-ebuilder.conf + +clean-maven() { +rm -f "${CACHEDIR}"/maven-cache +rm -rf "${MAVEN_OVERLAY_DIR}"/app-maven +} + +clean-pom() { +rm -f "${POMDIR}"/*.pom +} + +clean-cache() { +rm -f "${CACHEDIR}"/cache.{raw,}{0,1} +rm -f "${CACHEDIR}"/b{ebd,pom} +} + +clean() { +clean-cache +clean-pom +clean-maven +} + +build() { +if [[ ! -f "${CACHEDIR}"/cache.0 ]]; then +# 1. Generate cache of java related packages from portage tree. +[[ -f "${CACHEDIR}"/cache.raw0 ]] || \ +java-ebuilder --refresh-cache -t "${PORTDIR}" --cache-file "${CACHEDIR}"/cache.raw0 + +# 2. Find corresponding maven groupId, artifactId and version in the cache. +pushd "${CACHEDIR}" > /dev/null +( echo 1.0; tail -n +2 cache.raw0 | parallel -j -1 /usr/lib/java-ebuilder/meta.sh; ) > cache.0 +popd > /dev/null +fi + +# do the same to java overlay +if [[ ! -f "${CACHEDIR}"/cache.1 ]]; then +if [[ -n "${JAVA_OVERLAY_DIR}" ]]; then +[[ -f "${CACHEDIR}"/cache.raw1 ]] || \ +java-ebuilder --refresh-cache -t "${JAVA_OVERLAY_DIR}" --cache-file
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/
commit: 5efa2cb1e7912a64fca08378ba6426eb88c36766 Author: Miroslav Šulc fordfrog com> AuthorDate: Fri Sep 9 07:10:40 2016 + Commit: Michał Górny gentoo org> CommitDate: Fri Sep 9 07:10:40 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=5efa2cb1 added some comments useful for generation of ebuild from multiple projects .../org/gentoo/java/ebuilder/maven/MavenEbuilder.java| 16 1 file changed, 16 insertions(+) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java index f717d9b..c6e18bd 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java @@ -489,6 +489,22 @@ public class MavenEbuilder { final List mavenProjects, final PrintWriter writer) { // TODO: implement multiple-project script throw new UnsupportedOperationException("Not implemented yet."); + +// Global: +// JAVA_GENTOO_CLASSPATH +// JAVA_CLASSPATH_EXTRA +// JAVA_GENTOO_TEST_CLASSPATH +// JAVA_ENCODING (unless it differs in projects) +// Compile (jars, doc): +// JAVA_SRC_DIR +// JAVA_RESOURCE_DIRS +// JAVA_ENCODING (in case project encodings are different) +// Test: +// JAVA_TESTING_FRAMEWORK +// JAVA_TEST_SRC_DIR +// JAVA_TEST_RESOURCE_DIRS +// Install (jars, doc, sources): +// JAVA_MAIN_CLASS } /**
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: 9a02fdacc7449eb3a4f541c7ad8730648ff752a8 Author: Benda Xu gentoo org> AuthorDate: Mon Jan 9 12:50:41 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 9 12:50:41 2017 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=9a02fdac meta.sh: add scala. scripts/meta.sh | 4 1 file changed, 4 insertions(+) diff --git a/scripts/meta.sh b/scripts/meta.sh index 82d3dc1..4bd16ba 100755 --- a/scripts/meta.sh +++ b/scripts/meta.sh @@ -74,6 +74,10 @@ case ${spkg} in echo $1:org.huoc:${spkg}:${sver%%-*} exit 0 ;; +scala) + echo $1:org.scala-lang:${spkg}-compiler:${sver%%-*} + exit 0 + ;; esac touch bebd bpom
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: 0e037f385db26b5ce17ee796ecf2e8a7af0d18b3 Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 03:29:26 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 03:29:26 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=0e037f38 tree.sh: use dirs from conf file. scripts/tree.sh | 36 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/scripts/tree.sh b/scripts/tree.sh index acabb0a..3e7b828 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -2,7 +2,9 @@ # start from the root of a maven artifact and recursively resolve its # dependencies. -mkdir -p ../poms +source /etc/java-ebuilder.conf + +mkdir -p "${POMDIR}" gebd() { case ${MA} in @@ -45,8 +47,8 @@ gebd() { local M=${MA}-${MV} local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar; -if [[ ! -f ../poms/${M}.pom ]]; then -pushd ../poms +if [[ ! -f "${POMDIR}"/${M}.pom ]]; then +pushd "${POMDIR}" wget ${SRC_URI/-sources.jar/.pom} # 3rd party plugin not needed here @@ -66,40 +68,42 @@ gebd() { PA=${PA}-bin fi local P=${PA}-${PV} -local ebd=app-maven/${PA}/${P}.ebuild +local ebd="${MAVEN_OVERLAY_DIR}"/app-maven/${PA}/${P}.ebuild -if [[ ! -f app-maven/${PA}/${P}.ebuild ]]; then -mkdir -p app-maven/${PA} -java-ebuilder -p ../poms/${M}.pom -e ${ebd} -g --workdir . \ - -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 +if [[ ! -f "${ebd}" ]]; then +mkdir -p $(dirname ${ebd}) +java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ + -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ + --cache-file "${CACHEDIR}"/cache # empty parent artifacts # FIXME, this should be removed in poms sed -e '/app-maven\/jsch-agentproxy-bin/d' \ -e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \ --i ${ebd} +-i "${ebd}" fi line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID} -if ! grep -q ${line} ${HOME}/.java-ebuilder/maven-cache ; then -pushd ${HOME}/.java-ebuilder > /dev/null +if ! grep -q ${line} "${CACHEDIR}"/maven-cache ; then +pushd "${CACHEDIR}" > /dev/null echo ${line} >> maven-cache cat cache.{0,1} maven-cache > cache popd > /dev/null fi -if [[ -z "${MAVEN_NODEP}" ]] && mfill ${ebd}; then -java-ebuilder -p ../poms/${M}.pom -e ${ebd} -g --workdir . \ - -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 +if [[ -z "${MAVEN_NODEP}" ]] && mfill "${ebd}"; then +java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ + -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ + --cache-file "${CACHEDIR}"/cache # empty parent artifacts # FIXME, this should be removed in poms sed -e '/app-maven\/jsch-agentproxy-bin-[0-9]/d' \ -e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \ --i ${ebd} +-i "${ebd}" fi -[[ ${SRC_URI} = *-sources.jar ]] || sed -i "/inherit/s/java-pkg-simple/java-pkg-binjar/" ${ebd} +[[ ${SRC_URI} = *-sources.jar ]] || sed -i "/inherit/s/java-pkg-simple/java-pkg-binjar/" "${ebd}" } mfill() {
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: a09d6abdc71554d3678a05fc1052fca5bb266730 Author: Benda Xu gentoo org> AuthorDate: Sat Oct 8 01:22:02 2016 + Commit: Michał Górny gentoo org> CommitDate: Sat Oct 8 01:22:02 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=a09d6abd tree.sh: silent pushd notice. scripts/tree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tree.sh b/scripts/tree.sh index 8fef39d..8de9045 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -48,7 +48,7 @@ gebd() { local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar; if [[ ! -f "${POMDIR}"/${M}.pom ]]; then -pushd "${POMDIR}" +pushd "${POMDIR}" > /dev/null wget ${SRC_URI/-sources.jar/.pom} # 3rd party plugin not needed here
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: be327f018fba69ae853729d309c62fe3adc9b94e Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 10:19:28 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 10:19:28 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=be327f01 change script shebangs to /bin/bash. Because /usr/bin/env gets prefixified anyway. scripts/meta.sh | 2 +- scripts/movl| 2 +- scripts/tree.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/meta.sh b/scripts/meta.sh index 935330f..42a45a2 100755 --- a/scripts/meta.sh +++ b/scripts/meta.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # read in cache from java-ebuilder and find out the groupId, # artifactId and version. diff --git a/scripts/movl b/scripts/movl index a4d1bac..231ab5d 100755 --- a/scripts/movl +++ b/scripts/movl @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash source /etc/java-ebuilder.conf clean-maven() { diff --git a/scripts/tree.sh b/scripts/tree.sh index bf387a8..7df27dc 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # start from the root of a maven artifact and recursively resolve its # dependencies.
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, scripts/
commit: 10127d8936bec4f6e162d9d8a59ebc7bf10c9662 Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 11:17:08 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 11:17:08 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=10127d89 Move the jsch-agentproxy into java. Ugly hack, but better than removing lines from ebuilds. Should put this into some configuration file. scripts/tree.sh | 12 .../java/org/gentoo/java/ebuilder/maven/MavenParser.java | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/scripts/tree.sh b/scripts/tree.sh index 7df27dc..8fef39d 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -83,24 +83,12 @@ gebd() { java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ --cache-file "${CACHEDIR}"/cache - -# empty parent artifacts -# FIXME, this should be removed in poms -sed -e '/app-maven\/jsch-agentproxy-bin/d' \ --e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \ --i "${ebd}" fi if [[ -z "${MAVEN_NODEP}" ]] && mfill "${ebd}"; then java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ --cache-file "${CACHEDIR}"/cache - -# empty parent artifacts -# FIXME, this should be removed in poms -sed -e '/app-maven\/jsch-agentproxy-bin-[0-9]/d' \ --e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \ --i "${ebd}" fi [[ ${SRC_URI} = *-sources.jar ]] || sed -i "/inherit/s/java-pkg-simple/java-pkg-binjar/" "${ebd}" diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java index ba876f2..6e6435e 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java @@ -515,6 +515,8 @@ public class MavenParser { switch (reader.getLocalName()) { case "artifactId": artifactId = reader.getElementText(); + /* jsch.agentproxy is an empty artifact. */ + if (artifactId.equals("jsch.agentproxy")) return; break; case "groupId": groupId = reader.getElementText();
[gentoo-commits] proj/java-ebuilder:master commit in: scripts/
commit: df9639000ca69afc2be4f03a3bb41f5f1ea73f92 Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 01:51:14 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 01:51:14 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=df963900 meta.sh: add more jmock, hamcrest, tec. tree.sh: restructure to reuse code. scripts/meta.sh | 15 --- scripts/tree.sh | 37 ++--- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/scripts/meta.sh b/scripts/meta.sh index 0a142c8..4917098 100755 --- a/scripts/meta.sh +++ b/scripts/meta.sh @@ -14,8 +14,12 @@ case ${spkg} in echo $1:com.google.guava:${spkg}:${sver%%-*} exit 0 ;; -json) -echo $1:org.json:${spkg}:${sver%%-*} +json|jmock) +echo $1:org.${spkg}:${spkg}:${sver%%-*} +exit 0 +;; +hamcrest-*) +echo $1:org.${spkg%%-*}:${spkg}:${sver%%-*} exit 0 ;; xerces) @@ -24,7 +28,12 @@ case ${spkg} in echo $1:xerces:xmlParserAPIs:${sver%%-*} exit 0 ;; -commons-*|classworlds|jdom) +commons-*|classworlds|jdom|xalan*) +echo $1:${spkg}:${spkg}:${sver%%-*} +exit 0 +;; +javax-inject) +spkg=${spkg/-/.} echo $1:${spkg}:${spkg}:${sver%%-*} exit 0 ;; diff --git a/scripts/tree.sh b/scripts/tree.sh index 5482a0b..acabb0a 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -30,20 +30,20 @@ gebd() { PV=${PV/-beta-/_beta} # aopalliance-repackaged 2.5.0-b16 PV=${PV/-b/_beta} +# cdi-api 1.0-SP4 +PV=${PV/-SP/_p} # javax.xml.stream:stax-api:1.0-2 PV=${PV//-/.} -local M=${MA}-${MV} -local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar; - # spark-launcher_2.11 for scala 2.11 eval $(sed -nr 's,([^_]*)(_(.*))?,PA=\1 SLOT=\3,p' <<< ${MA}) [[ -z "${SLOT}" ]] && eval $(sed -nr 's,(.*)-(([0-9]+\.)?[0-9]+),PA=\1 SLOT=\2,p' <<< ${MA}) [[ -z "${SLOT}" ]] && PA=${MA} PA=${PA//./-} PA=${PA//_/-} -local P=${PA}-${PV} -local ebd=app-maven/${PA}/${P}.ebuild + +local M=${MA}-${MV} +local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar; if [[ ! -f ../poms/${M}.pom ]]; then pushd ../poms @@ -61,7 +61,12 @@ gebd() { popd fi -wget -q --spider ${SRC_URI} || SRC_URI=${SRC_URI/-sources.jar/.jar} +if ! wget -q --spider ${SRC_URI}; then +SRC_URI=${SRC_URI/-sources.jar/.jar} +PA=${PA}-bin +fi +local P=${PA}-${PV} +local ebd=app-maven/${PA}/${P}.ebuild if [[ ! -f app-maven/${PA}/${P}.ebuild ]]; then mkdir -p app-maven/${PA} @@ -70,7 +75,9 @@ gebd() { # empty parent artifacts # FIXME, this should be removed in poms -sed -i '/app-maven\/jsch-agentproxy-[0-9]/d' ${ebd} +sed -e '/app-maven\/jsch-agentproxy-bin/d' \ +-e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \ +-i ${ebd} fi line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID} @@ -81,9 +88,15 @@ gebd() { popd > /dev/null fi -if [[ -z "${MAVEN_NODEP}" ]] && mfill app-maven/${PA}/${P}.ebuild; then +if [[ -z "${MAVEN_NODEP}" ]] && mfill ${ebd}; then java-ebuilder -p ../poms/${M}.pom -e ${ebd} -g --workdir . \ -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 + +# empty parent artifacts +# FIXME, this should be removed in poms +sed -e '/app-maven\/jsch-agentproxy-bin-[0-9]/d' \ +-e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \ +-i ${ebd} fi [[ ${SRC_URI} = *-sources.jar ]] || sed -i "/inherit/s/java-pkg-simple/java-pkg-binjar/" ${ebd} @@ -104,8 +117,10 @@ mfill() { } if [[ $1 == *.ebuild ]]; then -mfill $1 +eval $(grep MAVEN_ID $1) +rm -f $1 else -eval $(awk -F":" '{print "PG="$1, "MA="$2, "MV="$3}' <<< $1) -gebd +MAVEN_ID=$1 fi +eval $(awk -F":" '{print "PG="$1, "MA="$2, "MV="$3}' <<< ${MAVEN_ID}) +gebd
[gentoo-commits] proj/java-ebuilder:master commit in: src/main/resources/, src/main/java/org/gentoo/java/ebuilder/
commit: b4b960aa7c929ff7884195dd077698b965605e99 Author: Benda Xu gentoo org> AuthorDate: Thu Oct 6 03:01:27 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 03:03:54 2016 + URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=b4b960aa add an option --cache-file to specify cache file. src/main/java/org/gentoo/java/ebuilder/Config.java | 11 ++- src/main/java/org/gentoo/java/ebuilder/Main.java | 7 ++- src/main/resources/usage.txt | 3 ++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/Config.java b/src/main/java/org/gentoo/java/ebuilder/Config.java index 557117a..4127266 100644 --- a/src/main/java/org/gentoo/java/ebuilder/Config.java +++ b/src/main/java/org/gentoo/java/ebuilder/Config.java @@ -18,7 +18,7 @@ public class Config { /** * Path to portage ebuild cache. */ -private final Path cacheFile = Paths.get(System.getProperty("user.home"), +private Path cacheFile = Paths.get(System.getProperty("user.home"), ".java-ebuilder/cache"); /** * URI that goes to SRC_URI. @@ -99,6 +99,15 @@ public class Config { return cacheFile; } +/** + * Setter for {@link #cacheFile}. + * + * @param cacheFile {@link #cacheFile} + */ +public void setCacheFile(final Path cacheFile) { +this.cacheFile = cacheFile; +} + /** * Getter for {@link #downloadUri}. * diff --git a/src/main/java/org/gentoo/java/ebuilder/Main.java b/src/main/java/org/gentoo/java/ebuilder/Main.java index 5bf1490..0a69442 100644 --- a/src/main/java/org/gentoo/java/ebuilder/Main.java +++ b/src/main/java/org/gentoo/java/ebuilder/Main.java @@ -220,12 +220,17 @@ public class Main { i++; config.addPomFile(Paths.get(args[i])); break; -case "-portage-tree": +case "--portage-tree": case "-t": i++; config.setPortageTree(Paths.get(args[i]).toAbsolutePath(). normalize()); break; +case "--cache-file": +i++; +config.setCacheFile(Paths.get(args[i]).toAbsolutePath(). +normalize()); +break; case "--refresh-cache": case "-c": config.setRefreshCache(true); diff --git a/src/main/resources/usage.txt b/src/main/resources/usage.txt index a728607..40e1914 100644 --- a/src/main/resources/usage.txt +++ b/src/main/resources/usage.txt @@ -9,6 +9,7 @@ Usage: jar times) --portage-tree|-t path to portage tree that should be parsed when refreshing cache (default is /usr/portage) +--cache-file location of output cache file (default is ~/.java-ebuilder/cache) --refresh-cache|-c refreshes java ebuild cache --slot|-s SLOT number ---workdir|-w path to workdir (default is current directory) \ No newline at end of file +--workdir|-w path to workdir (default is current directory)
[gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/
commit: ec18cabcfaab53715b92997b9c9d3e4a21991ddc Author: Ben Kohler gentoo org> AuthorDate: Wed Oct 30 16:49:59 2019 + Commit: Ben Kohler gentoo org> CommitDate: Wed Oct 30 16:50:46 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec18cabc net-wireless/iwd: fix build w/o systemd Explicitly set --with-systemd-networkdir since the default is to get the value from systemd.pc which only comes from systemd Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> net-wireless/iwd/iwd-1.0.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-wireless/iwd/iwd-1.0.ebuild b/net-wireless/iwd/iwd-1.0.ebuild index e8302612e25..ba253b60989 100644 --- a/net-wireless/iwd/iwd-1.0.ebuild +++ b/net-wireless/iwd/iwd-1.0.ebuild @@ -123,7 +123,8 @@ src_configure() { --enable-external-ell \ --enable-systemd-service \ --with-systemd-unitdir="$(systemd_get_systemunitdir)" \ - --with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d) + --with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d) \ + --with-systemd-networkdir="$(systemd_get_utildir)/network" } src_install() {
[gentoo-commits] repo/gentoo:master commit in: www-client/opera/
commit: b248efebf7e5f68e20355fc50531a319aea46171 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Oct 30 16:45:18 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Oct 30 16:47:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b248efeb www-client/opera: Version 64.0.3417.83 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Jeroen Roovers gentoo.org> www-client/opera/Manifest | 1 + www-client/opera/opera-64.0.3417.83.ebuild | 111 + 2 files changed, 112 insertions(+) diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index 2e46e6ee7eb..a47300af5d6 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -1,2 +1,3 @@ DIST opera-stable_64.0.3417.61_amd64.deb 66139492 BLAKE2B bdb6c8d622418a11bea98149c502145b9d39425f044d81885cc03fee395ed6dfe756c4817cf68d84bd97fdc7f79eb99ff47a2fa8395036519961a1e4cb526517 SHA512 443862bbf74769d7242350e974bba298ab2a39d05a169dbf9e5dbf8f9e75da2b57fa5595d29499010b3a05ffd111f6753a598ae5c05c1a374935c484b969eb24 DIST opera-stable_64.0.3417.73_amd64.deb 65876834 BLAKE2B d6251d0d7b825fb2a71d95d76cca99c9ada0c27d7b1ac6ea60d1e1b5e9647469751bb4ebcc7ba7d300e848896f785215f414367be9a6ab5b06b0e72776b5ddd4 SHA512 7e2730c50c7d5ba7614ae2a6a014d60c5f9f63cae6ecf3c03d6ad01341d6e4a954c3c99c5d29dd46a56a1552d3b16ed9822935533df8c760a275dde06e361336 +DIST opera-stable_64.0.3417.83_amd64.deb 66537522 BLAKE2B 1061ddce5aa122753192be7296eb99e4897f1109da3ae2f76484f84bb5c78689635f6f4d95edd7ff7a4210269148b430a8c29a1733b7629103d8916e06aecd79 SHA512 0af7f1413c670a685797304766cf1c0f8b7fa7e56a6f9fa148662ac52be70665b8b8f6704d598683c6dc8f7dd388efc1bcbd3e4cf6182e3e8f4c67b25c7044e8 diff --git a/www-client/opera/opera-64.0.3417.83.ebuild b/www-client/opera/opera-64.0.3417.83.ebuild new file mode 100644 index 000..eec568e74cf --- /dev/null +++ b/www-client/opera/opera-64.0.3417.83.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +CHROMIUM_LANGS=" + be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id + it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi + zh-CN zh-TW + +" +inherit chromium-2 multilib unpacker xdg-utils + +DESCRIPTION="A fast and secure web browser" +HOMEPAGE="https://www.opera.com/; +LICENSE="OPERA-2014" +SLOT="0" +SRC_URI_BASE=" + https://download1.operacdn.com/pub/ + https://download2.operacdn.com/pub/ + https://download3.operacdn.com/pub/ + https://download4.operacdn.com/pub/ +" +for uri in ${SRC_URI_BASE}; do +SRC_URI+=" + "${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" +" +done +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + net-misc/curl + net-print/cups + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libnotify + x11-libs/pango[X] +" + +QA_PREBUILT="*" +S=${WORKDIR} + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + default + + OPERA_HOME="usr/$(get_libdir)/${PN}" + + case ${ARCH} in + amd64) + mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die + rm -r usr/lib || die + ;; + esac + + rm usr/bin/${PN} || die + + rm usr/share/doc/${PN}-stable/copyright || die + mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die + gunzip usr/share/doc/${PF}/changelog.gz || die + + pushd "${OPERA_HOME}"/localization > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + sed -i \ + -e 's|^TargetEnvironment|X-&|g' \ + usr/share/applications/${PN}.desktop || die +} + +src_install() { + rm "${OPERA_HOME}"/${PN}_autoupdate || die + mv * "${D}" || die + dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN} + fperms 4711 /"${OPERA_HOME}"/opera_sandbox +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +}
[gentoo-commits] repo/gentoo:master commit in: www-client/opera-beta/
commit: 98086f297a4890ba647a3160ed0e7749c4136063 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Oct 30 16:45:47 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Oct 30 16:47:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98086f29 www-client/opera-beta: Version 65.0.3467.24 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Jeroen Roovers gentoo.org> www-client/opera-beta/Manifest | 1 + .../opera-beta/opera-beta-65.0.3467.24.ebuild | 115 + 2 files changed, 116 insertions(+) diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest index f245bfde24c..8d74c47caf3 100644 --- a/www-client/opera-beta/Manifest +++ b/www-client/opera-beta/Manifest @@ -1,2 +1,3 @@ DIST opera-beta_65.0.3467.16_amd64.deb 67605832 BLAKE2B 7eb0c5a98c56631b3cd1eaa0d9ac3c24ca7fe0c2bf88125a7015c818d1848e0d075f85e97ff340e3fbf12cfb428e5ab49716d36dc41cc5e06b769545079ba45f SHA512 c35a873ba39f745058b8a0698dfaa9111c97416d28a9fb97a495eec21893323f5a249a6882a6bacad3e74d3be23c8ec90a90a8073986c379075efc36b1bd0fcb +DIST opera-beta_65.0.3467.24_amd64.deb 67613890 BLAKE2B 54e8886bf04176decb8e9b50aed0eb829e01178574f4894fc3c6b7f7fa390d35fa162a07e75a28750ed51c5c19cb3278dc178acdd8757c6a2babe17681bd72a4 SHA512 c40a8c5dec4b9889b517807f5320470a504455934e747b627055c843621a54b51689448cd25c3a9681ff1300b411c3e10cc459bd24633652166cf4eb1e953f3f DIST opera-beta_65.0.3467.7_amd64.deb 67026974 BLAKE2B 4065cb2fb8d7ce16b2de66b39a38c8a8e8ac1eb3a2e82e642c902833c456580dc5d8cc45271d1633942c8513460f49a1ca9377c61b8fd0e21ef8ab8b77c17edc SHA512 c30f294ce576b4faba82b64f4fee99b3ea9d318e99034d41110d34f15a7db919b781054b70e5cca66f5102a9ff57ecf9c58c86e1c96f4f4fcdc2f6915061c85c diff --git a/www-client/opera-beta/opera-beta-65.0.3467.24.ebuild b/www-client/opera-beta/opera-beta-65.0.3467.24.ebuild new file mode 100644 index 000..59a8587ec4b --- /dev/null +++ b/www-client/opera-beta/opera-beta-65.0.3467.24.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +CHROMIUM_LANGS=" + be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it + ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi + zh-CN zh-TW +" +inherit chromium-2 multilib unpacker xdg-utils + +DESCRIPTION="A fast and secure web browser" +HOMEPAGE="https://www.opera.com/; +LICENSE="OPERA-2014" +SLOT="0" +SRC_URI_BASE=" + https://download1.operacdn.com/pub/ + https://download2.operacdn.com/pub/ + https://download3.operacdn.com/pub/ + https://download4.operacdn.com/pub/ +" +SRC_URI="amd64? (" +for uri in ${SRC_URI_BASE}; do +SRC_URI+=" + "${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" +" +done +SRC_URI+=")" +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + net-misc/curl + net-print/cups + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libnotify + x11-libs/pango[X] +" + +QA_PREBUILT="*" +S=${WORKDIR} + +pkg_setup() { + OPERA_HOME="usr/$(get_libdir)/${PN}" +} + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + default + + case ${ARCH} in + amd64) + mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die + rm -r usr/lib || die + ;; + x86) + mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die + ;; + esac + + mv usr/share/doc/${PN} usr/share/doc/${PF} || die + gunzip usr/share/doc/${PF}/changelog.gz || die + + rm usr/bin/${PN} || die + + pushd "${OPERA_HOME}/localization" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + sed -i \ + -e 's|^TargetEnvironment|X-&|g' \ + usr/share/applications/${PN}.desktop || die +} + +src_install() { + mv * "${D}" || die + dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN} + fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +}
[gentoo-commits] repo/gentoo:master commit in: www-client/opera-beta/
commit: b21b8cf1db410cd8343101edc91abe98d2a12e64 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Oct 30 16:46:40 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Oct 30 16:47:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21b8cf1 www-client/opera-beta: Old Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Jeroen Roovers gentoo.org> www-client/opera-beta/Manifest | 1 - .../opera-beta/opera-beta-65.0.3467.7.ebuild | 115 - 2 files changed, 116 deletions(-) diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest index 8d74c47caf3..4f0eac82861 100644 --- a/www-client/opera-beta/Manifest +++ b/www-client/opera-beta/Manifest @@ -1,3 +1,2 @@ DIST opera-beta_65.0.3467.16_amd64.deb 67605832 BLAKE2B 7eb0c5a98c56631b3cd1eaa0d9ac3c24ca7fe0c2bf88125a7015c818d1848e0d075f85e97ff340e3fbf12cfb428e5ab49716d36dc41cc5e06b769545079ba45f SHA512 c35a873ba39f745058b8a0698dfaa9111c97416d28a9fb97a495eec21893323f5a249a6882a6bacad3e74d3be23c8ec90a90a8073986c379075efc36b1bd0fcb DIST opera-beta_65.0.3467.24_amd64.deb 67613890 BLAKE2B 54e8886bf04176decb8e9b50aed0eb829e01178574f4894fc3c6b7f7fa390d35fa162a07e75a28750ed51c5c19cb3278dc178acdd8757c6a2babe17681bd72a4 SHA512 c40a8c5dec4b9889b517807f5320470a504455934e747b627055c843621a54b51689448cd25c3a9681ff1300b411c3e10cc459bd24633652166cf4eb1e953f3f -DIST opera-beta_65.0.3467.7_amd64.deb 67026974 BLAKE2B 4065cb2fb8d7ce16b2de66b39a38c8a8e8ac1eb3a2e82e642c902833c456580dc5d8cc45271d1633942c8513460f49a1ca9377c61b8fd0e21ef8ab8b77c17edc SHA512 c30f294ce576b4faba82b64f4fee99b3ea9d318e99034d41110d34f15a7db919b781054b70e5cca66f5102a9ff57ecf9c58c86e1c96f4f4fcdc2f6915061c85c diff --git a/www-client/opera-beta/opera-beta-65.0.3467.7.ebuild b/www-client/opera-beta/opera-beta-65.0.3467.7.ebuild deleted file mode 100644 index 59a8587ec4b..000 --- a/www-client/opera-beta/opera-beta-65.0.3467.7.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CHROMIUM_LANGS=" - be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it - ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi - zh-CN zh-TW -" -inherit chromium-2 multilib unpacker xdg-utils - -DESCRIPTION="A fast and secure web browser" -HOMEPAGE="https://www.opera.com/; -LICENSE="OPERA-2014" -SLOT="0" -SRC_URI_BASE=" - https://download1.operacdn.com/pub/ - https://download2.operacdn.com/pub/ - https://download3.operacdn.com/pub/ - https://download4.operacdn.com/pub/ -" -SRC_URI="amd64? (" -for uri in ${SRC_URI_BASE}; do -SRC_URI+=" - "${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" -" -done -SRC_URI+=")" -KEYWORDS="~amd64" - -RDEPEND=" - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - gnome-base/gconf:2 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype - net-misc/curl - net-print/cups - sys-apps/dbus - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libnotify - x11-libs/pango[X] -" - -QA_PREBUILT="*" -S=${WORKDIR} - -pkg_setup() { - OPERA_HOME="usr/$(get_libdir)/${PN}" -} - -src_unpack() { - unpack_deb ${A} -} - -src_prepare() { - default - - case ${ARCH} in - amd64) - mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die - rm -r usr/lib || die - ;; - x86) - mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die - ;; - esac - - mv usr/share/doc/${PN} usr/share/doc/${PF} || die - gunzip usr/share/doc/${PF}/changelog.gz || die - - rm usr/bin/${PN} || die - - pushd "${OPERA_HOME}/localization" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - sed -i \ - -e 's|^TargetEnvironment|X-&|g' \ - usr/share/applications/${PN}.desktop || die -} - -src_install() { - mv * "${D}" || die - dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN} - fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -}
[gentoo-commits] repo/gentoo:master commit in: app-portage/gverify/
commit: 6b2f88fb03a37c48fc50d9fa008f2e3085831916 Author: Michał Górny gentoo org> AuthorDate: Wed Oct 30 16:32:29 2019 + Commit: Michał Górny gentoo org> CommitDate: Wed Oct 30 16:34:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b2f88fb app-portage/gverify: Bump to v2 v2 switches to using Authority Keys and therefore stops failing due to obsolete gkeys seeds. Signed-off-by: Michał Górny gentoo.org> app-portage/gverify/Manifest | 1 + app-portage/gverify/gverify-2.ebuild | 32 2 files changed, 33 insertions(+) diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest index 7534034172c..c2c1a1925d4 100644 --- a/app-portage/gverify/Manifest +++ b/app-portage/gverify/Manifest @@ -1 +1,2 @@ DIST gverify-1.tar.gz 4558 BLAKE2B 193fb63dd3816b4577314199e4f8606a20f60d883f22f36636f1dba4c3fe4a701e89fd352b33ee3ce5bfb10b39e351f971aa55c8cd6eef493fc492e2c4c5d17e SHA512 f666306973bf173683edd845499ea1b244ffc9254ed0d816660022f871e7cec480d452fd962db5417b23d3101496b80a49caece29cbddf3058e2a21ec945a268 +DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957 diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild new file mode 100644 index 000..18068b633e4 --- /dev/null +++ b/app-portage/gverify/gverify-2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +inherit python-single-r1 + +DESCRIPTION="gentoo.git signature verification tool" +HOMEPAGE="https://github.com/mgorny/gverify; +SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +RDEPEND="${PYTHON_DEPS} + app-crypt/gnupg + app-crypt/openpgp-keys-gentoo-auth + dev-vcs/git" +DEPEND="${PYTHON_DEPS}" + +src_compile() { + emake PREFIX="${EPREFIX}"/usr +} + +src_install() { + emake install DESTDIR="${D}" PREFIX=/usr + dodoc README +}
[gentoo-commits] repo/gentoo:master commit in: app-crypt/openpgp-keys-gentoo-auth/
commit: 17ed702b3d2c72557fe6c5182254b8f26b8be976 Author: Michał Górny gentoo org> AuthorDate: Wed Oct 30 15:45:38 2019 + Commit: Michał Górny gentoo org> CommitDate: Wed Oct 30 16:34:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ed702b app-crypt/openpgp-keys-gentoo-auth: Package the Authority Keys Signed-off-by: Michał Górny gentoo.org> app-crypt/openpgp-keys-gentoo-auth/Manifest| 1 + app-crypt/openpgp-keys-gentoo-auth/metadata.xml| 8 .../openpgp-keys-gentoo-auth-20191030.ebuild | 22 ++ 3 files changed, 31 insertions(+) diff --git a/app-crypt/openpgp-keys-gentoo-auth/Manifest b/app-crypt/openpgp-keys-gentoo-auth/Manifest new file mode 100644 index 000..0f11222da88 --- /dev/null +++ b/app-crypt/openpgp-keys-gentoo-auth/Manifest @@ -0,0 +1 @@ +DIST gentoo-auth.asc.20191030.gz 6556 BLAKE2B 233df81a8c01ead6524fdded0c64aba7d930d0f9e6214c403e43aa97bc87502a4e1d68c6c415505db5f618d9309d5ba1279d1e9b9e068289002ad30896a500c9 SHA512 c752dc4b5d75937290e469e722ccd48a592413438a7d1c5bc5d4e07114077ae3dfb5fc3cbe6b96d672e4149737cd7db6dc8298e670e63745bdff7426e98fc03b diff --git a/app-crypt/openpgp-keys-gentoo-auth/metadata.xml b/app-crypt/openpgp-keys-gentoo-auth/metadata.xml new file mode 100644 index 000..0319eec4c8b --- /dev/null +++ b/app-crypt/openpgp-keys-gentoo-auth/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + mgo...@gentoo.org + Michał Górny + + diff --git a/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild new file mode 100644 index 000..a6f1305ee95 --- /dev/null +++ b/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Gentoo Authority Keys (GLEP 79)" +HOMEPAGE="https://www.gentoo.org/downloads/signatures/; +SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-auth.asc.${PV}.gz; + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + +S=${WORKDIR} + +src_install() { + insinto /usr/share/openpgp-keys + newins "gentoo-auth.asc.${PV}" gentoo-auth.asc + newins - gentoo-auth-ownertrust.txt <<-EOF + ABD00913019D6354BA1D9A132839FE0D796198B1:6: + EOF +}
[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/, net-fs/nfs-utils/
commit: 151c446a8906e7489de10ae2e66642a142e5509c Author: Lars Wendler gentoo org> AuthorDate: Wed Oct 30 16:17:50 2019 + Commit: Lars Wendler gentoo org> CommitDate: Wed Oct 30 16:18:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151c446a net-fs/nfs-utils: Revbump to fix issue with old kernels and statx Bumped straight to stable as this seems to affect many users. Thanks-to: Andreas Steinmetz domdv.de> Tested-by: Lars Langhans gmx.de> Tested-by: Brian Evans gentoo.org> Bug: https://bugs.gentoo.org/688644 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch | 31 ++ ...s-2.4.1-r2.ebuild => nfs-utils-2.4.1-r3.ebuild} | 1 + 2 files changed, 32 insertions(+) diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch new file mode 100644 index 000..7515a819915 --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch @@ -0,0 +1,31 @@ +From c8953944c5d34095d42f604f911022fbe144918c Mon Sep 17 00:00:00 2001 +From: Andreas Steinmetz +Date: Wed, 30 Oct 2019 16:57:00 +0100 +Subject: [PATCH] Old kernels don't know statx calls and return EINVAL + +On a system with glibc-2.29 and kernel 4.9.128 nfs v3 mount fails as +statx() with mask=STATX_BASIC_STATS returns EINVAL, probably from +glibc, as strace of rpc.mountd shows no system call. + +Fixes: https://bugs.gentoo.org/688644 +Signed-off-by: Lars Wendler +--- + support/misc/xstat.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/support/misc/xstat.c b/support/misc/xstat.c +index fa047880..6aca6e29 100644 +--- a/support/misc/xstat.c b/support/misc/xstat.c +@@ -47,6 +47,8 @@ statx_do_stat(int fd, const char *pathname, struct stat *statbuf, int flags) + statx_copy(statbuf, ); + return 0; + } ++ if (errno == EINVAL) ++ errno = ENOSYS; + if (errno == ENOSYS) + statx_supported = 0; + } else +-- +2.24.0.rc1 + diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r3.ebuild similarity index 99% rename from net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild rename to net-fs/nfs-utils/nfs-utils-2.4.1-r3.ebuild index 26c3bbb3348..24e426f2374 100644 --- a/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r3.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.3.4-no-werror.patch "${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch "${FILESDIR}"/${P}-Fix-include-order-between-config.h-and-stat.h.patch + "${FILESDIR}"/${PN}-2.4.1-statx.patch #688644 ) pkg_setup() {
[gentoo-commits] data/api:master commit in: files/
commit: 5729fca411076fe0272bc682d99ac3c20e896e92 Author: Joonas Niilola gentoo org> AuthorDate: Wed Oct 30 16:05:12 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 30 16:05:12 2019 + URL:https://gitweb.gentoo.org/data/api.git/commit/?id=5729fca4 uid-gid.txt: update gvm provider Signed-off-by: Joonas Niilola gentoo.org> files/uid-gid.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/uid-gid.txt b/files/uid-gid.txt index 474ff23..bd1d23a 100644 --- a/files/uid-gid.txt +++ b/files/uid-gid.txt @@ -216,7 +216,7 @@ steamcmd489 489 acct minecraft 490 490 acct fhem 491 491 acct unrealircd 494 494 acct -gvm495 495 requested +gvm495 495 acct strelaysrv 496 496 acct stdiscosrv 497 497 acct burp 498 498 acct
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/pf-sources/
commit: 5f6a456881dcd8b3834585cb6761000d6418527c Author: Joonas Niilola gentoo org> AuthorDate: Wed Oct 30 16:00:52 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 30 16:00:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f6a4568 sys-kernel/pf-sources: bump to 5.3-pf5 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Joonas Niilola gentoo.org> sys-kernel/pf-sources/Manifest | 1 + sys-kernel/pf-sources/pf-sources-5.3_p5.ebuild | 74 ++ 2 files changed, 75 insertions(+) diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest index c1b3d9a3881..bd9514b0d98 100644 --- a/sys-kernel/pf-sources/Manifest +++ b/sys-kernel/pf-sources/Manifest @@ -13,3 +13,4 @@ DIST pf-sources-5.3_p1.patch 253654 BLAKE2B f1d4cd4a1d2ad78a918a540c79ec2a7c15c3 DIST pf-sources-5.3_p2.patch 317339 BLAKE2B 7e5f8c3a2cd7f2fae4b038c8178c1d0943b1224fd4898aab6a546fadf7b091177c6d3ce99ffe6bcf298405d9354064aca78695f608c6d695bbb287752e8e9f4b SHA512 8c0c4dabb6925ab6fa1a9379035fcbac9587737be938e13bf0059fa5e55f79ef7f8800f1568dd1192e63e377e832ad628127b239ffc96b06699ee413d7a884f8 DIST pf-sources-5.3_p3.patch 980797 BLAKE2B 96bd53791737fcb1d1503b719a8654a90bd9045ab678289fb457992725b40c6ddd86d4970dc462a3b707de7fc38ecd55b95f0191941fc79777f2b17ba22a9cc8 SHA512 d3bb38efa4174494a6669b77805207d6af1d6b00ff1d887f8f4d3b0f4682548e347ce96e0c1841d4a4f81f0721327b4f2c8d7b169f3b0850a895f1dac2b3d4c3 DIST pf-sources-5.3_p4.patch 1340441 BLAKE2B fe979e8511d6bfa481749e50d8f4f2edc8016477de4edc644cd57015b0568c9948e7643871642ce67a5a9250294e3981951b87a3f60161ceec6232c206031349 SHA512 879991193cd6fd77f17f5fafbfd6172528837c57014a6d220d37cc57cd9bd51ebae9d7687762eb972cea16c37f7e48d440d9d55e7f4532ec09f218cf7a2cac4c +DIST pf-sources-5.3_p5.patch 1596810 BLAKE2B ba0229daedb6e883192fc3de569601bc2284dfdb012c4a46b7367772aec07570b826e9fb23725b68deac2a35613c44c83ae587dfb2d4787ef5bba39b995535b5 SHA512 7524528d02f4d593eae506c055c414f28875ee3f32334cf420ad4357e41fb8dbd0b3801d98676ca624566351145fde032c1ff8a25f762aa058c9558ffdf014cd diff --git a/sys-kernel/pf-sources/pf-sources-5.3_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.3_p5.ebuild new file mode 100644 index 000..82d79915f60 --- /dev/null +++ b/sys-kernel/pf-sources/pf-sources-5.3_p5.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +ETYPE="sources" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/wikis/README + https://dev.gentoo.org/~mpagano/genpatches/; + +IUSE="" + +# No 'experimental' USE flag provided, but we still want to use genpatches +K_EXP_GENPATCHES_NOUSE="1" + +# No reason to bump this number unless something new gets included in genpatches, +# in that case we can manually remove the linux kernel patches from genpatches. +K_GENPATCHES_VER="1" + +K_NOSETEXTRAVERSION="1" + +# Not supported by the Gentoo security crew +K_SECURITY_UNSUPPORTED="1" + +K_USEPV="yes" + +# We want the very basic patches from gentoo-sources, experimental patch +# is already included in pf-sources +K_WANT_GENPATCHES="base extras" + +UNIPATCH_STRICTORDER="yes" + +inherit eutils kernel-2 +detect_version + +DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches" + +PF_URI="https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch" +SRC_URI=" + ${KERNEL_URI} + ${PF_URI} + https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz + https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz +" + +KV_FULL="${PVR}-pf" +S="${WORKDIR}/linux-${KV_FULL}" + +PATCHES=( + "${DISTDIR}/${P}.patch" +) + +K_EXTRAEINFO="For more info on pf-sources and details on how to report problems, +see: ${HOMEPAGE}." + +pkg_setup(){ + ewarn + ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way." + ewarn "If you need support, please contact the pf developers directly." + ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with" + ewarn "the ebuilds. Thank you." + ewarn + kernel-2_pkg_setup +} + +src_prepare() { + default + kernel-2_src_prepare +} + +pkg_postinst() { + kernel-2_pkg_postinst + optfeature "Userspace KSM helper" sys-process/uksmd +}
[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/
commit: 2bf18d824c3dc4f35efbc9089ccbaf45e7ce7440 Author: Ralph Seichter seichter de> AuthorDate: Mon Oct 28 23:56:59 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 30 15:56:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf18d82 www-servers/nginx-unit: Remove obsolete ebuild Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Ralph Seichter seichter.de> Closes: https://github.com/gentoo/gentoo/pull/13481 Signed-off-by: Joonas Niilola gentoo.org> www-servers/nginx-unit/Manifest | 1 - www-servers/nginx-unit/nginx-unit-1.11.0.ebuild | 68 - 2 files changed, 69 deletions(-) diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest index afac6bf6f51..1d0e3a28f48 100644 --- a/www-servers/nginx-unit/Manifest +++ b/www-servers/nginx-unit/Manifest @@ -1,3 +1,2 @@ -DIST nginx-unit-1.11.0.tar.gz 681333 BLAKE2B 4e727f1b0bd5a593ea360b4125173bc6b3694b953fa2c775ce4f7112bd9f2df131d4bfd4e01cb653c08a9cdacc560a6961b8926c797ea2ce7d6c32a7e4f7f7e2 SHA512 894093385137bc188c50b86540182007bac1740a063359f494c1984687352eccb879f7d6b7b6623d5702cce3c793f12c60a2dfab94bcf9cb817b80a1577409d9 DIST nginx-unit-1.12.0.tar.gz 681661 BLAKE2B 1e497172a37fdcd33d0ced5b97675bff42f4cadab2f9363316e667c90c8b4dc4b43f4b8d5cff9f547daa7e92d532550434907515134a5c958586f1822beea749 SHA512 a55a084ed6e1cd3f784bd81571772ca29ca9a0d19089c9bb74c88258d2e1ef872978219c47b6dc2610711ae1aa95ef68ddb77f45747a2eacdd9d92c6f8fee28b DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413 diff --git a/www-servers/nginx-unit/nginx-unit-1.11.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.11.0.ebuild deleted file mode 100644 index 72e543d8953..000 --- a/www-servers/nginx-unit/nginx-unit-1.11.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python2_7 python3_{5,6,7}) - -inherit python-single-r1 - -MY_P="unit-${PV}" -DESCRIPTION="A dynamic web and application server" -HOMEPAGE="https://unit.nginx.org; -SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -MY_USE="perl python ruby" -MY_USE_PHP="php5-6 php7-1 php7-2 php7-3" -IUSE="${MY_USE} ${MY_USE_PHP}" -REQUIRED_USE="|| ( ${IUSE} ) - python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="perl? ( dev-lang/perl:= ) - php5-6? ( dev-lang/php:5.6[embed] ) - php7-1? ( dev-lang/php:7.1[embed] ) - php7-2? ( dev-lang/php:7.2[embed] ) - php7-3? ( dev-lang/php:7.3[embed] ) - python? ( ${PYTHON_DEPS} ) - ruby? ( dev-lang/ruby:= )" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - ./configure \ - --control=unix:/run/${PN}.sock \ - --ld-opt="${LDFLAGS}" \ - --log=/var/log/${PN} \ - --modules=$(get_libdir)/${PN} \ - --pid=/run/${PN}.pid \ - --prefix=/usr \ - --state=/var/lib/${PN} || die "Core configuration failed" - for flag in ${MY_USE} ; do - if use ${flag} ; then - ./configure ${flag} || die "Module configuration failed: ${flag}" - fi - done - for flag in ${MY_USE_PHP} ; do - if use ${flag} ; then - local php_slot="/usr/$(get_libdir)/${flag/-/.}" - ./configure php \ - --module=${flag} \ - --config=${php_slot}/bin/php-config \ - --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}" - fi - done -} - -src_install() { - default - diropts -m 0770 - keepdir /var/lib/${PN} - newinitd "${FILESDIR}/${PN}.initd" ${PN} -}
[gentoo-commits] repo/gentoo:master commit in: acct-user/gvm/
commit: 63681a994b77ef6d31f9441b5515f98f4f541814 Author: Hasan ÇALIŞIR psauxit com> AuthorDate: Tue Oct 29 12:59:38 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 30 15:51:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63681a99 acct-user/gvm: Add 'gvm' user (UID 495) Signed-off-by: Hasan ÇALIŞIR psauxit.com> Closes: https://github.com/gentoo/gentoo/pull/13485 Signed-off-by: Joonas Niilola gentoo.org> acct-user/gvm/gvm-0.ebuild | 13 + acct-user/gvm/metadata.xml | 12 2 files changed, 25 insertions(+) diff --git a/acct-user/gvm/gvm-0.ebuild b/acct-user/gvm/gvm-0.ebuild new file mode 100644 index 000..28f62544324 --- /dev/null +++ b/acct-user/gvm/gvm-0.ebuild @@ -0,0 +1,13 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="Greenbone vulnerability management program user" +ACCT_USER_ID=495 +ACCT_USER_HOME=/var/lib/gvm +ACCT_USER_GROUPS=( gvm ) + +acct-user_add_deps diff --git a/acct-user/gvm/metadata.xml b/acct-user/gvm/metadata.xml new file mode 100644 index 000..b011cd5d77f --- /dev/null +++ b/acct-user/gvm/metadata.xml @@ -0,0 +1,12 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +hasan.cali...@psauxit.com +Hasan ÇALIŞIR + + +proxy-ma...@gentoo.org +Proxy Maintainers + +
[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/
commit: 8075ead5b2ce8dd6fa31381667643d91755a2311 Author: Ralph Seichter seichter de> AuthorDate: Mon Oct 28 23:39:04 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 30 15:56:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8075ead5 www-servers/nginx-unit: Address CFLAGS issues The upstream build adds compiler flags like '-pipe' and '-g'. This updated ebuild prevents that from happening. Closes: https://bugs.gentoo.org/696966 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Ralph Seichter seichter.de> Signed-off-by: Joonas Niilola gentoo.org> www-servers/nginx-unit/nginx-unit-1.12.0-r2.ebuild | 78 ++ 1 file changed, 78 insertions(+) diff --git a/www-servers/nginx-unit/nginx-unit-1.12.0-r2.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0-r2.ebuild new file mode 100644 index 000..3627ea90fa4 --- /dev/null +++ b/www-servers/nginx-unit/nginx-unit-1.12.0-r2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python2_7 python3_{5,6,7}) + +inherit flag-o-matic python-single-r1 + +MY_P="unit-${PV}" +DESCRIPTION="Dynamic web and application server" +HOMEPAGE="https://unit.nginx.org; +SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +MY_USE="perl python ruby" +MY_USE_PHP="php5-6 php7-1 php7-2 php7-3" +IUSE="${MY_USE} ${MY_USE_PHP} ssl" +REQUIRED_USE="|| ( ${IUSE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="perl? ( dev-lang/perl:= ) + php5-6? ( dev-lang/php:5.6[embed] ) + php7-1? ( dev-lang/php:7.1[embed] ) + php7-2? ( dev-lang/php:7.2[embed] ) + php7-3? ( dev-lang/php:7.3[embed] ) + python? ( ${PYTHON_DEPS} ) + ruby? ( dev-lang/ruby:* ) + ssl? ( dev-libs/openssl:0 )" +RDEPEND="${DEPEND}" +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + eapply_user + sed -i '/^CFLAGS/d' auto/make || die +} + +src_configure() { + local opt=( + --control=unix:/run/${PN}.sock + --log=/var/log/${PN} + --modules=$(get_libdir)/${PN} + --pid=/run/${PN}.pid + --prefix=/usr + --state=/var/lib/${PN} + ) + use ssl && opt+=( --openssl ) + ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed" + # Modules require position-independent code + append-cflags $(test-flags-CC -fPIC) + for flag in ${MY_USE} ; do + if use ${flag} ; then + ./configure ${flag} || die "Module configuration failed: ${flag}" + fi + done + for flag in ${MY_USE_PHP} ; do + if use ${flag} ; then + local php_slot="/usr/$(get_libdir)/${flag/-/.}" + ./configure php \ + --module=${flag} \ + --config=${php_slot}/bin/php-config \ + --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}" + fi + done +} + +src_install() { + default + diropts -m 0770 + keepdir /var/lib/${PN} + newinitd "${FILESDIR}/${PN}.initd" ${PN} +}
[gentoo-commits] repo/gentoo:master commit in: acct-group/gvm/
commit: 0214ac6045dd8d92fbc2b337ffbf361a97224ad2 Author: Hasan ÇALIŞIR psauxit com> AuthorDate: Tue Oct 29 12:51:36 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 30 15:51:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0214ac60 acct-group/gvm: Add 'gvm' group (GID 495) Signed-off-by: Hasan ÇALIŞIR psauxit.com> Signed-off-by: Joonas Niilola gentoo.org> acct-group/gvm/gvm-0.ebuild | 9 + acct-group/gvm/metadata.xml | 12 2 files changed, 21 insertions(+) diff --git a/acct-group/gvm/gvm-0.ebuild b/acct-group/gvm/gvm-0.ebuild new file mode 100644 index 000..96f4b6e3875 --- /dev/null +++ b/acct-group/gvm/gvm-0.ebuild @@ -0,0 +1,9 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +DESCRIPTION="Greenbone vulnerability management program group" +ACCT_GROUP_ID=495 diff --git a/acct-group/gvm/metadata.xml b/acct-group/gvm/metadata.xml new file mode 100644 index 000..c1c5013745e --- /dev/null +++ b/acct-group/gvm/metadata.xml @@ -0,0 +1,12 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + hasan.cali...@psauxit.com + Hasan ÇALIŞIR + + + proxy-ma...@gentoo.org + Proxy Maintainers + +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ell/
commit: 4ac1b378208c4fbd08e2635e4f23ea17f90d43de Author: Ben Kohler gentoo org> AuthorDate: Wed Oct 30 14:46:28 2019 + Commit: Ben Kohler gentoo org> CommitDate: Wed Oct 30 15:09:23 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac1b378 dev-libs/ell: bump to 0.26 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> dev-libs/ell/Manifest| 1 + dev-libs/ell/ell-0.26.ebuild | 46 2 files changed, 47 insertions(+) diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index 5d5fd3496d5..7745370dfd4 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -4,4 +4,5 @@ DIST ell-0.22.tar.xz 452692 BLAKE2B 6e8add0e439bfae287be5522ccdb0b9a7f1cc0c378f0 DIST ell-0.23.tar.xz 453040 BLAKE2B 027adbaf786bd83070acfcbb1435c36adb70e6d798c6664cdb4d6f9ea0b7aaee2b45b2738210889125c565da06360fe1337b3847913195533be2f87ef1f9d48b SHA512 0a55316816f44482e6958c9745ebf2beca64b8a0d81db9367dfdeb05e36012a14d7b645f3077eab01ea743df129ab8dad0b8d72f21e8ccb2741863eb5f4bc948 DIST ell-0.24.tar.xz 473332 BLAKE2B 97b5f5de1a4680f5b8da5db8d151df56d2eadb511c5440a780959cb832f9414030040abf91072a751b19028713cc8527f5dbb24450b07c69dcebcc9d8f62366b SHA512 14e9b31ab0f08761c7672798a23ee91b7d2fe8fd509df35c40e413e26b90f86a192f48283b3798402d9d23acdf1fbcd1d506e5fa9331a32279f03f4cf462205b DIST ell-0.25.tar.xz 473392 BLAKE2B cefb71c0bd1c30a1c2e85baf19097f9028b3d2d1e8df14beb231f3c52f39e2ec98fbafdfbba4c05e94328c0c5747eb49111e1c76b3cb02fe22c09b51a5016f17 SHA512 7f12e2dfae16a38750166787ede7e3bf6def1e15a8bcb33bdba80ff84c2930d1857437f4ab871c408a52b18fec2212856ae9190ddf5eb542e90ebc76edd1f693 +DIST ell-0.26.tar.xz 473512 BLAKE2B bad1545b65caad7263e03156740ef5dfc401536fc063f34bdac5346a9edca8b7b16fd175abb264a6163e9dca87d1469f388984a95962dcc695e3e98549ff2a0a SHA512 b7a841f6e3c50077b60c210549744344ee70b5116bc9ee0f44dfea896f68fe6ab89a6fa38fcfe04e259648de978162aa5592f2e07accf13825584b40d57ef6cb DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3 diff --git a/dev-libs/ell/ell-0.26.ebuild b/dev-libs/ell/ell-0.26.ebuild new file mode 100644 index 000..cafd42ed2ce --- /dev/null +++ b/dev-libs/ell/ell-0.26.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic multilib-minimal + +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" +HOMEPAGE="https://01.org/ell; +if [[ "${PV}" == * ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git; +else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +fi +LICENSE="LGPL-2.1" +SLOT="0" + +IUSE="glib pie" + +RDEPEND=" + glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + [[ "${PV}" == * ]] && eautoreconf +} + +multilib_src_configure() { + append-cflags "-fsigned-char" #662694 + local myeconfargs=( + $(use_enable glib) + $(use_enable pie) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + local DOCS=( ChangeLog README ) + einstalldocs + + find "${ED}" -name "*.la" -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/
commit: 95f20b1f7bd360cfa66a623d5248e0948e8315e1 Author: Ben Kohler gentoo org> AuthorDate: Wed Oct 30 15:08:55 2019 + Commit: Ben Kohler gentoo org> CommitDate: Wed Oct 30 15:09:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f20b1f net-wireless/iwd: bump to 1.0 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> net-wireless/iwd/Manifest | 1 + net-wireless/iwd/iwd-1.0.ebuild | 143 2 files changed, 144 insertions(+) diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest index dc50bc34907..ced8e7630ad 100644 --- a/net-wireless/iwd/Manifest +++ b/net-wireless/iwd/Manifest @@ -1,3 +1,4 @@ DIST iwd-0.21.tar.xz 793432 BLAKE2B d82b90dbc83a2953d9de82e5e3a031f4db21f4e707d630cf2762475d34ed97fe78c4cc16bb6fed6ec7343af6bbf89672c37c76a06ed7181b57c657607859f4ab SHA512 eca8847cb68bc52f33a2f50ce4cba9ee4cbd37ad989292a21d613afd3307b0dc974da56df49dc97aa65c9647e3497849d696d5a9fdc5c0d0443a141a0887b324 DIST iwd-0.22.tar.xz 813324 BLAKE2B 690ac6edbcd07be3b84318c77b8be5bef570951d02a7a6be1cd70ff0a475077253dd8e6f3b5c8a0177e6294b6cb12042e302b6752e2631ddd7cebe829c0c9f9f SHA512 4fa9f8688a33663aad754a371e9c1c71161f394fc0d7c4a32ce3afe7e00efdca8f55f378a71ab32002bbe73538b1a092bc0f24c19912672d70d6b02fcc824fe0 DIST iwd-0.23.tar.xz 817764 BLAKE2B 2eaf13778658558529d9395ce42d0cd87ff1ae17f7ccd57011ef5e5a7bd68a1b25a0b5b40c5cec10e5cc2304cb49e65b1031f12608feb0d1c30fda2fa9f706cb SHA512 e1ee8c2ca34836f8a971eb10ec79c02c2c3a683a183599839979aeb79e152ad0ef2a37520aeef05a3011c584f009bece158dbcd07841d1ab95138c743c7d11cc +DIST iwd-1.0.tar.xz 819608 BLAKE2B 8e4187fe92efc3fd686d28cab49a39bcdbc6cbe311d0ef517539e1094d3251e2c92879df24576b0aa100ff0be4bc2496e4ba6a22bc73f1c945ef3bf2a18331a2 SHA512 ef1f840019e5d954e4e8fbedc0f91ca14a981f3e73345daa6f55ad458c048172b510ebec22f8d3b658f84c8d0383b8861ac03f06f16adbcd73d45062e48c11b8 diff --git a/net-wireless/iwd/iwd-1.0.ebuild b/net-wireless/iwd/iwd-1.0.ebuild new file mode 100644 index 000..e8302612e25 --- /dev/null +++ b/net-wireless/iwd/iwd-1.0.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools flag-o-matic linux-info systemd + +if [[ ${PV} == ** ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git; + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86" +fi + +DESCRIPTION="Wireless daemon for linux" +HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/; + +LICENSE="GPL-2" +SLOT="0" +IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3" + +COMMON_DEPEND=">=dev-libs/ell-0.25 + sys-apps/dbus + client? ( sys-libs/readline:0= )" + +RDEPEND="${COMMON_DEPEND} + net-wireless/wireless-regdb + crda? ( net-wireless/crda )" + +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +[[ ${PV} == ** ]] && DEPEND+=" dev-python/docutils" + +pkg_pretend() { + CONFIG_CHECK=" + ~ASYMMETRIC_KEY_TYPE + ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE + ~CFG80211 + ~CRYPTO_AES + ~CRYPTO_ARC4 + ~CRYPTO_CBC + ~CRYPTO_CMAC + ~CRYPTO_DES + ~CRYPTO_ECB + ~CRYPTO_HMAC + ~CRYPTO_MD4 + ~CRYPTO_MD5 + ~CRYPTO_RSA + ~CRYPTO_SHA1 + ~CRYPTO_SHA256 + ~CRYPTO_SHA512 + ~CRYPTO_USER_API_HASH + ~CRYPTO_USER_API_SKCIPHER + ~KEY_DH_OPERATIONS + ~PKCS7_MESSAGE_PARSER + ~X509_CERTIFICATE_PARSER + " + if use crda;then + CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT" + WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support" + fi + + if use amd64;then + CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64" + WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance" + WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance" + fi + + if use cpu_flags_x86_aes;then + CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL" + WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance" + fi + + if use cpu_flags_x86_ssse3 && use amd64; then + CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3" + WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance" +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/diskimage-builder/
commit: a137f4733ab32516a59f1826a6d491630b1db363 Author: Matthew Thode gentoo org> AuthorDate: Wed Oct 30 14:55:20 2019 + Commit: Matthew Thode gentoo org> CommitDate: Wed Oct 30 14:56:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a137f473 app-emulation/diskimage-builder: 2.29.1 bump Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Matthew Thode gentoo.org> app-emulation/diskimage-builder/Manifest | 1 + .../diskimage-builder-2.29.1.ebuild| 42 ++ 2 files changed, 43 insertions(+) diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index a3aca93a45a..14c857e127b 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,3 +1,4 @@ DIST diskimage-builder-2.27.2.tar.gz 421433 BLAKE2B 089e68b07c6f79e54b8fb30e7a9328a6c55d1abb5f77b6592cc0b29b30a44a83803bdde93631e95e39d7fc82d9b5ff3fb425a7b94821b96f56421cbde9f8b078 SHA512 e2cc6f24d5bbfdf741d6b6e7e216d0e9631d6394cf3f3f4d34ce8a78ba2ba2ddbcb0b1434121f7ab1bd3600194777a5538651d9039c3bca06bb8cc621f06f037 DIST diskimage-builder-2.28.0.tar.gz 425808 BLAKE2B f3cceec35f019b248df8aaa94f70231dc51a9fed06cf93b16366536cfcf45b4477b7aa09371bb3cffe95f51c74d0abf9065285b7b74c5d805604c2b00df8f38f SHA512 6eddef513e8550fb6f90e917a504bac1166ef4355791bd9b0c10addebb8f84b783bf4e53dd472e6ed9acb5d3dcd951e675f4e9983ec4170c31afdb257b84e24d DIST diskimage-builder-2.28.2.tar.gz 424565 BLAKE2B 77bad24f857de7fb17cb727f7f5168f86434e4cfeecef286da5b3351e9fdfeb0d1dc2472f800024a35adb40aa04155bb7cfa3a0772ed8186a21b31b582809312 SHA512 0bdce552a896834c97f2a982865a93f39f62d0ee68d001c60d320e831c25456a392b4510ed94d7123851dad262e5ccb38a541d0dda5d620f91cf9ab54776efaa +DIST diskimage-builder-2.29.1.tar.gz 426780 BLAKE2B cd5b9c2cce5c289ef7f76ad41bf4b51ba6319c782be91b97a82d828c177912696ce6f94774d7294aca0d4af401d4d4e0ddd5fdd6d799e4e560ab03f971498b03 SHA512 cb083024739486c7651ce97ab36a30461754aae226af23b2ce757eca7c71e0fec42af07b8973f9c8344012238c4ae9d6252189ce6288d6451e020302f2dc35bf diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild new file mode 100644 index 000..86d3bb124b3 --- /dev/null +++ b/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_6 python3_7 ) + +inherit distutils-r1 + +DESCRIPTION="Golden Disk Image builder." +HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/; +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git; +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] + !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" +DEPEND="${CDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${CDEPEND} + >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] + !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] + >=dev-python/networkx-1.10[${PYTHON_USEDEP}] + =dev-python/pyyaml-3.12[${PYTHON_USEDEP}] + >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}] + =dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] + app-emulation/qemu + sys-block/parted + sys-fs/multipath-tools + sys-fs/dosfstools + sys-apps/gptfdisk + !dev-python/dib-utils[${PYTHON_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: app-admin/helm/
commit: 0e84d70eaed065ee78e48ebcbf750a4416603699 Author: Manuel Rüger gentoo org> AuthorDate: Wed Oct 30 13:41:08 2019 + Commit: Manuel Rüger gentoo org> CommitDate: Wed Oct 30 13:41:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e84d70e app-admin/helm: Version bump to 2.15.2 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Manuel Rüger gentoo.org> app-admin/helm/Manifest | 1 + app-admin/helm/helm-2.15.2.ebuild | 163 ++ 2 files changed, 164 insertions(+) diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest index 0495b166077..341377309fc 100644 --- a/app-admin/helm/Manifest +++ b/app-admin/helm/Manifest @@ -134,3 +134,4 @@ DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.ta DIST helm-2.14.3.tar.gz 1242779 BLAKE2B 8c16da15b54974b837397784734fa8bcf53240d075261a7dceecc6fb6cd172d72ba0d060d55001a87b5910b1b715646729b10e689ee6a1602aa26a4bf56013a7 SHA512 80f6c437235ca0d0c8f330135d689d2d5a9414d166717f72d8c3e2952c35f33fe621579e221078e65e2c5cc648e44ef037356b7ac18bce985daf642493ec4297 DIST helm-2.15.0.tar.gz 1274187 BLAKE2B dca585f964373abbc4e650d9cb986b987176bfc4d2d9b9aeb84ad9a853542cf6738764da3f79dd62455b478266d3f441206ec98f70894218d4c8c26cdcc5019e SHA512 0bb340a5f295ffdcca75e2f890b43c58968d807f6029e4a56963d9ca0dcc2f6ffb207e03d7447d9b50c3fa7940b49568c8f20daa21765a679b58d28df24a29e6 DIST helm-2.15.1.tar.gz 1274091 BLAKE2B 028bf422e4d74153ad41353a4f49b7fe8642e766c50a2ae0b08fc60694d595d8f247bfc4d04430848a5342fc96df4c6a2dca044ed17b3ca9a12e5a623b8e1ac0 SHA512 ad4a4523e8aa57f939672a1ed9b19966e04bb6c557ec69ee5b363d0e4f0e4295798e4fe1f448878ffe8f13a6a5c56fd3b49795872b4b1fe45f2779331db9f9ed +DIST helm-2.15.2.tar.gz 1276291 BLAKE2B 8dc01d20f179e2c78a833f3c2b5e7633fdf87713b68f3b1a1ec91ce0129031730b913b4b6a4e5339f9d450b77f304eee4f7bc11fc9b74e457e23413b7b9d237f SHA512 f25d5dd55444d5e8b2821600e0419be71e4dc39c4cbf73c203cdadeb33721ba2925481eb9504e33f52eb8f0ec03ae1e05ef8bee4b29e305d092bac1246ff50f3 diff --git a/app-admin/helm/helm-2.15.2.ebuild b/app-admin/helm/helm-2.15.2.ebuild new file mode 100644 index 000..5bc8a3b1f1e --- /dev/null +++ b/app-admin/helm/helm-2.15.2.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="k8s.io/helm" + +MY_PV=${PV/_rc/-rc.} + +EGO_VENDOR=( +"cloud.google.com/go 0ebda48a7f143b1cce9eb37a8c1106ac762a3430 github.com/GoogleCloudPlatform/gcloud-golang" +"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b" +"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109" +"github.com/Azure/go-autorest 1ffcc8896ef6dfe022d90a4317d866f925cf0f9e" +"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" +"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005" +"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723" +"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90" +"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd" +"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73" +"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20" +"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" +"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127" +"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1" +"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528" +"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46" +"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135" +"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5" +"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540" +"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577" +"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb" +"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004" +"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3" +"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e" +"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c" +"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438" +"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02" +"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed" +"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433" +"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5" +"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017" +"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b" +"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1" +"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4" +"github.com/googleapis/gnostic
[gentoo-commits] repo/gentoo:master commit in: app-admin/helm/
commit: 7257ab1c65f8182b1882afc3baa501d21e59e7d9 Author: Manuel Rüger gentoo org> AuthorDate: Wed Oct 30 13:41:22 2019 + Commit: Manuel Rüger gentoo org> CommitDate: Wed Oct 30 13:41:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7257ab1c app-admin/helm: Remove old Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Manuel Rüger gentoo.org> app-admin/helm/Manifest | 1 - app-admin/helm/helm-2.15.0.ebuild | 163 -- 2 files changed, 164 deletions(-) diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest index 341377309fc..610788b72d0 100644 --- a/app-admin/helm/Manifest +++ b/app-admin/helm/Manifest @@ -132,6 +132,5 @@ DIST github.com-spf13-pflag-e8f29969b682c41a730f8f08b76033b120498464.tar.gz 5100 DIST github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz 289746 BLAKE2B cff786ac7a6c39829ffd4d7b7f0fac3893b7c469ca35f008558ca3a7dbfc376fd0166c8ed7becc73d0f8d67b456ca00104f08c8841ff156a9c1f9a6d68d3b25f SHA512 fac5e8d32f93f252b2e64d60f2e4da65a11e9408ac4db0afdb3f2357a814cb3992ade307bc8bec8799703c0cb63d05f7d4eaa19e13bab6402b50c1cd246bc50e DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613 DIST helm-2.14.3.tar.gz 1242779 BLAKE2B 8c16da15b54974b837397784734fa8bcf53240d075261a7dceecc6fb6cd172d72ba0d060d55001a87b5910b1b715646729b10e689ee6a1602aa26a4bf56013a7 SHA512 80f6c437235ca0d0c8f330135d689d2d5a9414d166717f72d8c3e2952c35f33fe621579e221078e65e2c5cc648e44ef037356b7ac18bce985daf642493ec4297 -DIST helm-2.15.0.tar.gz 1274187 BLAKE2B dca585f964373abbc4e650d9cb986b987176bfc4d2d9b9aeb84ad9a853542cf6738764da3f79dd62455b478266d3f441206ec98f70894218d4c8c26cdcc5019e SHA512 0bb340a5f295ffdcca75e2f890b43c58968d807f6029e4a56963d9ca0dcc2f6ffb207e03d7447d9b50c3fa7940b49568c8f20daa21765a679b58d28df24a29e6 DIST helm-2.15.1.tar.gz 1274091 BLAKE2B 028bf422e4d74153ad41353a4f49b7fe8642e766c50a2ae0b08fc60694d595d8f247bfc4d04430848a5342fc96df4c6a2dca044ed17b3ca9a12e5a623b8e1ac0 SHA512 ad4a4523e8aa57f939672a1ed9b19966e04bb6c557ec69ee5b363d0e4f0e4295798e4fe1f448878ffe8f13a6a5c56fd3b49795872b4b1fe45f2779331db9f9ed DIST helm-2.15.2.tar.gz 1276291 BLAKE2B 8dc01d20f179e2c78a833f3c2b5e7633fdf87713b68f3b1a1ec91ce0129031730b913b4b6a4e5339f9d450b77f304eee4f7bc11fc9b74e457e23413b7b9d237f SHA512 f25d5dd55444d5e8b2821600e0419be71e4dc39c4cbf73c203cdadeb33721ba2925481eb9504e33f52eb8f0ec03ae1e05ef8bee4b29e305d092bac1246ff50f3 diff --git a/app-admin/helm/helm-2.15.0.ebuild b/app-admin/helm/helm-2.15.0.ebuild deleted file mode 100644 index b5850389603..000 --- a/app-admin/helm/helm-2.15.0.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="k8s.io/helm" - -MY_PV=${PV/_rc/-rc.} - -EGO_VENDOR=( -"cloud.google.com/go 0ebda48a7f143b1cce9eb37a8c1106ac762a3430 github.com/GoogleCloudPlatform/gcloud-golang" -"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b" -"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109" -"github.com/Azure/go-autorest 1ffcc8896ef6dfe022d90a4317d866f925cf0f9e" -"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" -"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005" -"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723" -"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90" -"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd" -"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73" -"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20" -"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" -"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127" -"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1" -"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528" -"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46" -"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135" -"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5" -"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540" -"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577" -"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb" -"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004" -"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3" -"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/crun/
commit: b818341b329017a792f721ff7b9576f843856945 Author: Dan Molik danmolik com> AuthorDate: Fri Oct 25 10:15:53 2019 + Commit: Manuel Rüger gentoo org> CommitDate: Wed Oct 30 13:34:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b818341b app-emulation/crun: new package ( 0.10.3 ) Crun is a container-runtime similar to runc except written in C, and roughly 50% faster. Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Dan Molik danmolik.com> Tested-by: Dan Molik danmolik.com> Signed-off-by: Manuel Rüger gentoo.org> app-emulation/crun/Manifest | 1 + app-emulation/crun/crun-0.10.3.ebuild | 61 +++ app-emulation/crun/metadata.xml | 31 ++ 3 files changed, 93 insertions(+) diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest new file mode 100644 index 000..f666033e3b5 --- /dev/null +++ b/app-emulation/crun/Manifest @@ -0,0 +1 @@ +DIST crun-0.10.3.tar.gz 1235071 BLAKE2B 98d3cc82c48d288b10ac7716bf0f8a8ce7757cc5cebb2ed10ea6272d46eb434a5fee32791dd5e8ae3bee040a9e48bd411e95494e70609117ec5dbbc2ea24bd8f SHA512 df39e911b0f3b80861c1820806ce9cd0f9772711f7caf246fb4824beb19ddc6e6a593881a239a0e27ecd3bae7d823dde6893930618b43cd84623b5bcd510e8ae diff --git a/app-emulation/crun/crun-0.10.3.ebuild b/app-emulation/crun/crun-0.10.3.ebuild new file mode 100644 index 000..af85b6beb34 --- /dev/null +++ b/app-emulation/crun/crun-0.10.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils + +DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" +HOMEPAGE="https://github.com/containers/crun; +SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="bpf +caps doc seccomp systemd static-libs" + +DEPEND=" + dev-libs/yajl + sys-libs/libseccomp + caps? ( sys-libs/libcap ) + seccomp? ( sys-libs/libseccomp ) + systemd? ( sys-apps/systemd ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + >=dev-lang/python-3.5.0 + doc? ( dev-go/go-md2man ) +" + +DOCS=( README.md ) + +src_configure() { + econf \ + $(use_enable bpf) \ + $(use_enable caps) \ + $(use_enable seccomp) \ + $(use_enable systemd) \ + $(usex static-libs '--enabled-shared --enabled-static' '--enable-shared --disable-static' '' '') +} + +src_compile() { + pushd libocispec || die + emake + popd + emake crun + if use doc ; then + emake crun.1 + fi +} + +src_install() { + pushd libocispec || die + emake "DESTDIR=$D" install-exec + popd + emake "DESTDIR=$D" install-exec + if use doc ; then + emake "DESTDIR=$D" install-man + fi + + einstalldocs +} diff --git a/app-emulation/crun/metadata.xml b/app-emulation/crun/metadata.xml new file mode 100644 index 000..2e0bd20b39d --- /dev/null +++ b/app-emulation/crun/metadata.xml @@ -0,0 +1,31 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + d...@danmolik.com + Dan Molik + + + proxy-ma...@gentoo.org + Proxy Maintainers + + + While most of the tools used in the Linux containers ecosystem are written in + Go, I believe C is a better fit for a lower level tool like a container + runtime. runc, the most used implementation of the OCI runtime specs written + in Go, re-execs itself and use a module written in C for setting up the + environment before the container process starts. + + crun aims to be also usable as a library that can be easily included in + programs without requiring an external process for managing OCI containers. + + + https://github.com/containers/crun/releases + containers/crun + + + Enable in Kernel, eBPF (enhanced Berkley Packet Filter) + support for managing device controllers. + + +
[gentoo-commits] repo/gentoo:master commit in: dev-util/kubebuilder/
commit: 07682880a3fb09d1cc77592167dd32be51bc7fe9 Author: Dan Molik danmolik com> AuthorDate: Tue Oct 29 12:09:04 2019 + Commit: Manuel Rüger gentoo org> CommitDate: Wed Oct 30 13:34:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07682880 dev-util/kubebuilder: bump version to 2.1.0 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Dan Molik danmolik.com> Tested-by: Dan Molik danmolik.com> Signed-off-by: Manuel Rüger gentoo.org> dev-util/kubebuilder/Manifest | 1 + dev-util/kubebuilder/kubebuilder-2.1.0.ebuild | 43 +++ 2 files changed, 44 insertions(+) diff --git a/dev-util/kubebuilder/Manifest b/dev-util/kubebuilder/Manifest index aba671a591e..9e301e9a46d 100644 --- a/dev-util/kubebuilder/Manifest +++ b/dev-util/kubebuilder/Manifest @@ -11,3 +11,4 @@ DIST github.com-spf13-afero-v1.2.2.tar.gz 46157 BLAKE2B c9cfe5ce721a9992b775f825 DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7 DIST kubebuilder-2.0.1.tar.gz 1371557 BLAKE2B fcefc068a9aa3e84d9fc394bb0cb1e99bc535c3a0b627de52f3cfe482f4ea209ca2a5e318520560ef297b95e4b4cccb1b8cb2eba008f1febfc97516f0e12313a SHA512 9a031971edb8df2c498e55e5282cdb4feef130f1be767222ee643e8beb601314255e93b312403846b1bbb84a841b6f027e633371f5ce5615aeda75564d1404f7 +DIST kubebuilder-2.1.0.tar.gz 1394454 BLAKE2B 0a1a1cb3531eb1346b629813a1d44cbe7346c9d8b2945b2c7d9e4a3381b843591c3db54407ef64590affa88d9427718c85983dbc9fead44fd724b2ba78af8ca9 SHA512 1fff1adf91e9b660937b3c2ba69c3bff534af50a363730a3ae9ddfb50325f343d239398db9f7ad15976c2a1f8d5abaed01136332ba21c0766966f1fb12551442 diff --git a/dev-util/kubebuilder/kubebuilder-2.1.0.ebuild b/dev-util/kubebuilder/kubebuilder-2.1.0.ebuild new file mode 100644 index 000..14af483330b --- /dev/null +++ b/dev-util/kubebuilder/kubebuilder-2.1.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit go-module + +DESCRIPTION="SDK for building Kubernetes APIs using CRDs" +HOMEPAGE="https://book.kubebuilder.io; + +EGO_VENDOR=( + "github.com/gobuffalo/flect v0.1.5" + "github.com/golang/protobuf v1.3.1" + "github.com/onsi/ginkgo v1.8.0" + "github.com/onsi/gomega v1.5.0" + "github.com/spf13/afero v1.2.2" + "github.com/spf13/cobra v0.0.3" + "github.com/spf13/pflag v1.0.3" + "golang.org/x/net 3b0461eec859c4b73bb64fdc8285971fd33e3938 github.com/golang/net" + "golang.org/x/sys d432491b91382bba9c2a91776aa47c9430183a6f github.com/golang/sys" + "golang.org/x/text v0.3.2 github.com/golang/text" + "golang.org/x/tools 58d531046acdc757f177387bc1725bfa79895d69 github.com/golang/tools" + "gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml" +) + +SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + $(go-module_vendor_uris)" + +LICENSE="Apache-2.0 BSD-4 ECL-2.0 JSON MIT" +SLOT="0" +KEYWORDS="~amd64" + +DOCS=( {DESIGN,README}.md ) + +src_compile() { + GOCACHE="${T}/go-cache" go build \ + -o "bin/${PN}" ./cmd || die +} + +src_install() { + dobin bin/kubebuilder + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-hdaps/
commit: 67bcbb21f42e1184de333d54b67037d34225ef85 Author: Michael Orlitzky gentoo org> AuthorDate: Wed Oct 30 12:41:01 2019 + Commit: Michael Orlitzky gentoo org> CommitDate: Wed Oct 30 12:43:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67bcbb21 xfce-extra/xfce4-hdaps: new gtk+-3.x version. New upstream version, new license, new dependencies, new EAPI, new eclasses, etc. I'm no longer bothering to check for a "recent" 2.6 kernel. But overall, everything should work pretty much the same. Closes: https://bugs.gentoo.org/698104 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Michael Orlitzky gentoo.org> xfce-extra/xfce4-hdaps/Manifest | 1 + xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild | 39 + 2 files changed, 40 insertions(+) diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest index 2796270a335..fc4f01072aa 100644 --- a/xfce-extra/xfce4-hdaps/Manifest +++ b/xfce-extra/xfce4-hdaps/Manifest @@ -1 +1,2 @@ DIST xfce4-hdaps-0.0.9.tar.bz2 304851 BLAKE2B 1f1318bb27628eb1ff72a1642737271ab37e722a18a6c3c6d40c7a05f56e36813bc7a570d5bc51d169dfcc89467cb6173d61c2f0cc2c90a90a795ba63ef1e07d SHA512 7ee963dacd3e1096fb205fa78c05202925977a4fc88aaa96ba779dc08e32937602fdc83a27457386b2b89847487c5dcc75385f2763201b1613f30eee8124e740 +DIST xfce4-hdaps-1.0.0.tar.xz 350888 BLAKE2B bc34321f42b0f51a10ef65429cdcf5e3d63f20914aa0c593c004c830932c8a63f194a25b602784527f5da0f74302142ccbcb3ecfc2a677b004b71e5bad4e5ee5 SHA512 0efdedbccfe578304e61cccb86936b4d62e9e3de6cb9c3cf7b288983b93bd8388e1b227565ebe354aadbd58fc493b67e5c3fea02bf9dbc1b37b5d2ec419a5d7b diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild new file mode 100644 index 000..a680a7fb669 --- /dev/null +++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit xdg-utils + +DESCRIPTION="Show the status of the IBM Hard Drive Active Protection System" +HOMEPAGE="http://michael.orlitzky.com/code/xfce4-hdaps.xhtml; +SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz; + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" +DEPEND=">=x11-libs/gtk+-3.20:3 + x11-libs/libX11 + >=xfce-base/libxfce4ui-4.14 + >=xfce-base/libxfce4util-4.14 + >=xfce-base/xfce4-panel-4.14:=" +RDEPEND="${DEPEND} + app-laptop/hdapsd + app-laptop/tp_smapi" + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +}
[gentoo-commits] proj/gentoo-ecosystem: New branch: master
commit: Commit: Michał Górny gentoo org> CommitDate: Wed Oct 30 12:43:44 2019 + New branch: master
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/
commit: 876ef282ca1632e12390fc757a21bc07d9a16cd3 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 30 12:26:09 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 30 12:26:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876ef282 dev-java/openjdk-jre-bin: amd64 stable wrt bug #698808 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild index 0b15e6a49cc..4daca60480d 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild @@ -21,7 +21,7 @@ SRC_URI=" " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
[gentoo-commits] repo/gentoo:master commit in: dev-java/maven-bin/
commit: 22f676ac092676cd206b229aa06a9d7287ff31e7 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 30 12:26:33 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 30 12:26:33 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f676ac dev-java/maven-bin: amd64 stable wrt bug #698908 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/maven-bin/maven-bin-3.6.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/maven-bin/maven-bin-3.6.2.ebuild b/dev-java/maven-bin/maven-bin-3.6.2.ebuild index 32ededf3fc7..45851d6fa2f 100644 --- a/dev-java/maven-bin/maven-bin-3.6.2.ebuild +++ b/dev-java/maven-bin/maven-bin-3.6.2.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/; LICENSE="Apache-2.0" SLOT="3.6" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND=" >=virtual/jdk-1.8
[gentoo-commits] repo/gentoo:master commit in: virtual/jdk/
commit: 059a044423cfda626d47300c18594f72947ebfcf Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 30 12:26:17 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 30 12:26:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059a0444 virtual/jdk: amd64 stable wrt bug #698808 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> virtual/jdk/jdk-1.8.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtual/jdk/jdk-1.8.0-r4.ebuild b/virtual/jdk/jdk-1.8.0-r4.ebuild index 589862862cb..44661251980 100644 --- a/virtual/jdk/jdk-1.8.0-r4.ebuild +++ b/virtual/jdk/jdk-1.8.0-r4.ebuild @@ -5,7 +5,7 @@ EAPI="6" DESCRIPTION="Virtual for Java Development Kit (JDK)" SLOT="1.8" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" RDEPEND="|| ( dev-java/icedtea-bin:8
[gentoo-commits] repo/gentoo:master commit in: virtual/jre/
commit: ec7314062bb412c425b71dcfacd9db8b9bf33704 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 30 12:26:24 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 30 12:26:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec731406 virtual/jre: amd64 stable wrt bug #698808 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> virtual/jre/jre-1.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtual/jre/jre-1.8.0-r2.ebuild b/virtual/jre/jre-1.8.0-r2.ebuild index 702beda46e4..4b0e1e98bd2 100644 --- a/virtual/jre/jre-1.8.0-r2.ebuild +++ b/virtual/jre/jre-1.8.0-r2.ebuild @@ -5,7 +5,7 @@ EAPI="6" DESCRIPTION="Virtual for Java Runtime Environment (JRE)" SLOT="1.8" -KEYWORDS="~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" RDEPEND="|| ( virtual/jdk:1.8
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/
commit: 7d665dd2becffbc38f0040f58bb7a927f78af5a0 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 30 12:26:00 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 30 12:26:00 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d665dd2 dev-java/openjdk-bin: amd64 stable wrt bug #698808 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild index ce13b2b6dea..7dbd4cdd6a8 100644 --- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild @@ -24,7 +24,7 @@ SRC_URI=" " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64" IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/
commit: bf9e310f183aaeb7f3179f31e85063b5fed2ddb3 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 30 12:25:50 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 30 12:25:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9e310f dev-java/openjdk: amd64 stable wrt bug #698808 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/openjdk/openjdk-8.222_p10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild index 2bb661e689e..263ac8f7d30 100644 --- a/dev-java/openjdk/openjdk-8.222_p10.ebuild +++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild @@ -24,7 +24,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart" COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: e52c71b09643d79bf9e358637645f519fb52722e Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Oct 30 12:06:13 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Oct 30 12:06:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52c71b0 package.mask: Add preparation Perl 5.30.1 mask Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 7f6bae5ce08..18a680ba158 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,6 +29,11 @@ #--- END OF EXAMPLES --- +# Andreas K. Hüttel (2019-10-30) +# In preparation... +=dev-lang/perl-5.30.1* +~virtual/perl-Module-CoreList-5.201.910.270 + # Hasan ÇALIŞIR (2019-10-28) # OpenVAS project name has been renamed in # Greenbone Vulnerability Management (GVM).
[gentoo-commits] repo/gentoo:master commit in: virtual/perl-Module-CoreList/
commit: e5443f68f0483b797400cb9821ed7315ea447801 Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Oct 30 12:06:54 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Oct 30 12:06:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5443f68 virtual/perl-Module-CoreList: Add Perl 5.30.1 version Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas K. Hüttel gentoo.org> .../perl-Module-CoreList-5.201.910.270.ebuild | 17 + 1 file changed, 17 insertions(+) diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.910.270.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.910.270.ebuild new file mode 100644 index 000..60f2fe52e8f --- /dev/null +++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.910.270.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList +# When bumping this package. +RDEPEND=" + || ( =dev-lang/perl-5.30.1* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/
commit: b47be713935ef624c54ba3c7bd6db4c46148093a Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Oct 30 11:50:23 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Oct 30 11:50:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b47be713 dev-lang/perl: Version bump 5.30.1_rc1 for testing, no keywords Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas K. Hüttel gentoo.org> dev-lang/perl/Manifest | 1 + dev-lang/perl/perl-5.30.1_rc1.ebuild | 655 +++ 2 files changed, 656 insertions(+) diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index cbb082827e5..2c6bf17d63e 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -8,6 +8,7 @@ DIST perl-5.28.2-patches-4.tar.xz 26268 BLAKE2B b32485a4ee0c23ab197641279915d1d2 DIST perl-5.28.2.tar.xz 12374448 BLAKE2B 82a49fcf3c29ff7241fae7ffaa1bf9f99d8cbfa6d00d5fd9ff7c3c23a461287322e12acba318c8de8507092e33b05549142bc5194bdb4b516994c9cdc0cb3f92 SHA512 0f2e4f7cb5d8cf6e00054b3842907e29b6c85902d97fb881d5bea65edbc875fef4e15e064561fac7c8db4939586576dd76a225026c7cca9624261c887b1fdb08 DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4 DIST perl-5.30.0.tar.xz 12419868 BLAKE2B dbf64d4cb1995475ca5a84e487ecc81a422f835180fe96d88b5095e9bc6eff62863b0789d98f0f3d1265c8683b812839bff1622cfb90470f02a1863b0f827c7e SHA512 68a295eccd64debd9d6a10f0d5577f872a19ad8c2d702798f6b0f45b8c3af6ab3230768056e2131e9e2e2506d1035b27cfd627c845e32263fe448649c4b98ae9 +DIST perl-5.30.1-RC1.tar.xz 12368352 BLAKE2B 6f202c213ead3c5c5b94c4b5752bfc3ae26f180e7000cf9d3c9c70889385849c081deae96c22aa78c3b61adb2aa55b2dda9188463eba745e05e14f5ccdab61e7 SHA512 8562afd568c3387bca0f08faba624aa6b490b9a290aa739dd93489cc50db3ce486d8408481bf7fff9766f03857121acfa436f561971b3bc679ef1e814e13d302 DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0 DIST perl-cross-1.1.9.tar.gz 102939 BLAKE2B 438ea75a14c4d60fdf3cb2f3671c736d229a83af210ba4fe6e79b989c6c4b45500d0221ec65bc71e1d43d234ec1daa20b3a19be6ceb01e638810900dbe3664a7 SHA512 002441012bd31f1ea71341707d91f89b76266c187c9d28f947ed5eddbcc6e3155e8dfd4b1814331561c3557764fea25bf6a938f08bcd4adfb5895361ad5a269a DIST perl-cross-1.2.3.tar.gz 106861 BLAKE2B 1fd23ecafd1450010c6703e43fb84da68f73a78d89309e2469fe2b07543002c27cfef463941f517cc0c690ce3a737781e9e2a8bf5ae8c6938e07be7bead2d704 SHA512 bd4fb3fa835b807c3ffb613a7fe935f92df5d89f603bf3f92fb3d249928f3ba69f078cdd46de5749d53e47bc437756f8e3530d7adc40b6eaa21265295af85616 diff --git a/dev-lang/perl/perl-5.30.1_rc1.ebuild b/dev-lang/perl/perl-5.30.1_rc1.ebuild new file mode 100644 index 000..42ca0b6d485 --- /dev/null +++ b/dev-lang/perl/perl-5.30.1_rc1.ebuild @@ -0,0 +1,655 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing + +PATCH_VER=1 +CROSS_VER=1.3 +PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}" +PATCH_DEV=dilfridge + +DIST_AUTHOR=SHAY + +# Greatest first, don't include yourself +# Devel point-releases are not ABI-intercompatible, but stable point releases are +# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions +PERL_BIN_OLDVERSEN="5.30.0" + +if [[ "${PV##*.}" == "" ]]; then + DIST_VERSION=5.30.0 +else + DIST_VERSION="${PV/_rc/-RC}" +fi +SHORT_PV="${DIST_VERSION%.*}" +# Even numbered major versions are ABI intercompatible +# Odd numbered major versions are not +if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then + SUBSLOT="${DIST_VERSION%-RC*}" +else + SUBSLOT="${DIST_VERSION%.*}" +fi +# Used only in tar paths +MY_P="perl-${DIST_VERSION}" +# Used in library paths +MY_PV="${DIST_VERSION%-RC*}" + +DESCRIPTION="Larry Wall's Practical Extraction and Report Language" + +SRC_URI=" + mirror://cpan/src/5.0/${MY_P}.tar.xz + mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz + https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz + mirror://gentoo/${PATCH_BASE}.tar.xz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz + https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz +" +HOMEPAGE="https://www.perl.org/; + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0/${SUBSLOT}" + +if [[ "${PV##*.}" !=
[gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/
commit: 48f54955b87768151c4a923b1a8f489523e0bee6 Author: Alexey Shvetsov gentoo org> AuthorDate: Wed Oct 30 11:36:47 2019 + Commit: Alexey Shvetsov gentoo org> CommitDate: Wed Oct 30 11:36:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f54955 x11-wm/xpra: fix pillow pillow not optional for 2.4.x Closes: https://bugs.gentoo.org/694806 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Alexey Shvetsov gentoo.org> x11-wm/xpra/xpra-2.4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-wm/xpra/xpra-2.4.3.ebuild b/x11-wm/xpra/xpra-2.4.3.ebuild index 3bdbf24c78e..246fbbf2f76 100644 --- a/x11-wm/xpra/xpra-2.4.3.ebuild +++ b/x11-wm/xpra/xpra-2.4.3.ebuild @@ -65,6 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS} RDEPEND="${COMMON_DEPEND} dev-python/netifaces[${PYTHON_USEDEP}] dev-python/rencode[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,${PYTHON_USEDEP}] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) @@ -74,7 +75,6 @@ RDEPEND="${COMMON_DEPEND} opengl? ( client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) ) - pillow? ( dev-python/pillow[${PYTHON_USEDEP}] ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void )
[gentoo-commits] repo/gentoo:master commit in: app-crypt/openpgp-keys-gentoo-release/
commit: 6a36ce3e863fbb411f22af3740334d4b7d27b4a6 Author: Michał Górny gentoo org> AuthorDate: Wed Oct 30 11:20:41 2019 + Commit: Michał Górny gentoo org> CommitDate: Wed Oct 30 11:22:31 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a36ce3e app-crypt/openpgp-keys-gentoo-release: Bump to 20191030 A fresh snapshot with prolonged keys. Signed-off-by: Michał Górny gentoo.org> app-crypt/openpgp-keys-gentoo-release/Manifest | 1 + .../openpgp-keys-gentoo-release-20191030.ebuild| 42 ++ 2 files changed, 43 insertions(+) diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest index 8125352b899..54158857bc7 100644 --- a/app-crypt/openpgp-keys-gentoo-release/Manifest +++ b/app-crypt/openpgp-keys-gentoo-release/Manifest @@ -1,2 +1,3 @@ DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6 DIST gentoo-release.asc.20190427.gz 59649 BLAKE2B 138c6bad0ec688c515888433256c95cea7d8ec1e76587e0e89d3c11078eb1b85931ba9f6630f60dc8bc168b8303204ebe05b9bad7abe946a74730123b1c36d89 SHA512 1491fb2bcf9c6a29adf8ff08cbf8cd40517ee3de7adc048be29a2300f460e78594548c3e47bd18da68585248c560d868815ded5584ed18929e4072c4933484f0 +DIST gentoo-release.asc.20191030.gz 23981 BLAKE2B 307ceab69e309a53c2db191cf9d7a484318e852af648d93d9ad4bb2422737ab8de9257b457e5f201d86d226b348447acfbe57d259ce436150f75ccfb9f6ed60e SHA512 f3fbe0198f80f37784613c2a390c29f55e5b6291c44ee64d676806a26745017f8a9168573e13f6fc2fe93910927846c584b9f5cd017c4eac1cc875d7ed30cb8c diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild new file mode 100644 index 000..ae331b09042 --- /dev/null +++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)" +HOMEPAGE="https://www.gentoo.org/downloads/signatures/; +SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz + test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( app-crypt/gnupg )" + +S=${WORKDIR} + +src_test() { + local old_umask=$(umask) + umask 077 + + local -x GNUPGHOME=${T}/.gnupg + mkdir "${GNUPGHOME}" || die + einfo "Importing keys ..." + gpg --import "gentoo-release.asc.${PV}" || die "Key import failed" + + local f + for f in gentoo-release-test-sigs*/*.asc; do + einfo "Testing ${f##*/} ..." + gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}" + done + + umask "${old_umask}" +} + +src_install() { + insinto /usr/share/openpgp-keys + newins "gentoo-release.asc.${PV}" gentoo-release.asc +}
[gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi-snapshot/
commit: 57dd92cee407b224e57e85950e4be4e531e78065 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Oct 30 10:10:16 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Oct 30 10:39:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57dd92ce www-client/vivaldi-snapshot: Version 2.9.1705.30_p1 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Jeroen Roovers gentoo.org> www-client/vivaldi-snapshot/Manifest | 3 + .../vivaldi-snapshot-2.9.1705.30_p1.ebuild | 114 + 2 files changed, 117 insertions(+) diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest index efa0d71e758..bd8b5f855bc 100644 --- a/www-client/vivaldi-snapshot/Manifest +++ b/www-client/vivaldi-snapshot/Manifest @@ -1,6 +1,9 @@ DIST vivaldi-snapshot-2.9.1705.27_p1-amd64.deb 65513160 BLAKE2B 6f7a36481fd677390adf3ad84872795fe63a637b3701b55a3918bd2a6cd6474227f15c8dda7e2ef259b130a6322a456df8c6459198deaf98997a6cdf669e1022 SHA512 735d742427e6382adc4e76654de106849806763bb63fbb861facc0772811518cb7940d9a453288f142e5546522ddf9de18488c666c59a8b87cef45f32814c88a DIST vivaldi-snapshot-2.9.1705.27_p1-arm64.deb 58694496 BLAKE2B 121fa90bc220b0f8f656eda93720c312110f0e3bddc7224f5d86b31ffdaae5f2435e533d39976fbf15af24763eb0b3be9e232a8d1541db3c722a71bc45b3b56d SHA512 bfd1597db58f378c618c2014d856377b65ba6c0e0d386f6975f5ca9002c49ed2482eac6a3381e207f527029e88cad153a68830fb60cb1729cd6d49a0942d536b DIST vivaldi-snapshot-2.9.1705.27_p1-i386.deb 63932828 BLAKE2B 7856330fa73440844d74d7500cab1db14a6fc38b27780bfefc5c67933f8f2d5bf018dcc49701b72968fad20cb07d7044c845b68867f6ca18abe0635f97a6fee5 SHA512 333e09499cb7d4b9b8c99b0c09cb887bc0e6304412a33037232f872fdc3383373de238847b5a7e25f00bc2f5ee35d1f8d52da54c5d47874b23c061b5353163fe +DIST vivaldi-snapshot-2.9.1705.30_p1-amd64.deb 65490100 BLAKE2B 8f6186f877fa38fd3970a4d8d52fdee55aa49c2c0cefa2185eb3d56477b6eeb7762d85ca4a8348c98fd948ff15f29aa078c30c8f179486dba7716a93952ca436 SHA512 7e88949d26fae577ccd750bb1605f9dc3e7e25cb6cd24cbb693c50268503aed135a4fd595bbf4f0b9c7de5a23b97806b83822adaf16b3e7fb142c09364d4130b +DIST vivaldi-snapshot-2.9.1705.30_p1-arm64.deb 58687380 BLAKE2B 1d71f508de50884f04c550265208db51c7c5d00f8a231ebaf03bc060027fc5aece183c47c9deff119b0486d5806058295727068ac0d14d415088ef48ac2dedbc SHA512 7da0c598d889ef355ef3f65c454300d514960217f05d60941cd26a5e199fdb1ca0f22285e3cc42135738b6e50e7bf4d88e9e37f10f7bf8e1448b424eaee7d418 +DIST vivaldi-snapshot-2.9.1705.30_p1-i386.deb 63923344 BLAKE2B e16ab92870c6b7deb24d1650060d0ff5ee14c676f83a1a8503662328f5a48d216d4f81de3f6141ebbf347f6a7246397f20863c58edf680a20503a93f0ec7ef56 SHA512 7152c3558821500c6086ef3296910edfbe1a1cdb8584ddca90a440f21ff900a58ef81777fb43556b093e2b65d124da7a52daf781fbb726d767da3d39d5b29efe DIST vivaldi-snapshot-2.9.1705.4_p1-amd64.deb 65531932 BLAKE2B 5d8209a04618dc530f60c0b8d16b178be1ad0591de569aa5c9e6c7c8486c17363e5ab9af2d11f5c802089ba3feb44dc0faabc984f4ae06ef098a09c86158223e SHA512 e25bf5cb22189c09ab4f7de3aa166af1de46b64c4b90ef713e29fec7e6d5677013ab0e1e45aecbd1e305ebe16f60f9123df95a64bf97c26718c9d09b3ebc0eab DIST vivaldi-snapshot-2.9.1705.4_p1-arm64.deb 58697120 BLAKE2B 147653fa08333d0c13a94e37744a3e9118e3d88b2cb64dca8ab7658a6e5c8aaadc99a342178ec18b4563ddfd06b1dc0680419c29a9bce69f756bc1637e82a679 SHA512 f40e66c49afbf18f8f233c7640e8d3ae39e2d83854a1125a36455135ec8ca424db27a6192cfe8dbbf6aba046ccbbb46107c339fd875470df3283d315faf89cf5 DIST vivaldi-snapshot-2.9.1705.4_p1-i386.deb 63916868 BLAKE2B 56125e2e3d774f1eb88e314d85f1caf2f8fe83e93fd2f1826b06894f60ad2741b2141426d447faed7c259072c30845e9f6c8c71fa156cd4383a43432faebeafc SHA512 7837b8cc87f5cd49a52ac7935c08ce41303eae5fb628fc458b8ca52df6a920706a623bee62e58d5c6d32a1a854b438f3f8182ca95e9772fb8c2e8b56c2954b9d diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.9.1705.30_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.9.1705.30_p1.ebuild new file mode 100644 index 000..6a73d0e8fe2 --- /dev/null +++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.9.1705.30_p1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +CHROMIUM_LANGS=" + af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu fa fi + fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml + mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi + zh-CN zh-TW +" +inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils + +VIVALDI_HOME="opt/${PN}" +DESCRIPTION="A browser for our friends" +HOMEPAGE="https://vivaldi.com/; +VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_; +SRC_URI=" + amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb ) + arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb ) + x86? ( ${VIVALDI_BASE_URI}i386.deb ->