[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/

2022-08-08 Thread Jakov Smolić 
commit: e2853ec7d3da7f0df24bdbff614a9d927dc31fe8
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Aug  8 19:53:31 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Aug  8 19:59:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2853ec7

Revert "app-portage/distpatch: ~riscv keywording"

This reverts commit 4bd28e3f4109b4a2a09b1af1caff07cfb350ac5f.

It's unclear how this package was tested, revert until it's proven to
work on RISC-V.

Signed-off-by: Jakov Smolić  gentoo.org>

 app-portage/distpatch/distpatch-0.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild 
b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index f1d2196dcddc..dbc1ab1b44d9 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )

[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/

2022-07-31 Thread Jakov Smolić 
commit: 4bd28e3f4109b4a2a09b1af1caff07cfb350ac5f
Author: Atharva  protonmail  com>
AuthorDate: Sun Jul 31 11:10:03 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Jul 31 16:08:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd28e3f

app-portage/distpatch: ~riscv keywording

Signed-off-by: Atharva  protonmail.com>
Signed-off-by: Jakov Smolić  gentoo.org>

 app-portage/distpatch/distpatch-0.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild 
b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index dbc1ab1b44d9..f1d2196dcddc 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )

[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/

2021-03-28 Thread Michał Górny 
commit: 96c0f4898ff80e9750f624d2e42cb181ee1dab6e
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Mar 28 07:13:22 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Mar 28 09:48:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c0f489

app-portage/distpatch: Remove py3.7 due to snakeoil dep

Signed-off-by: Michał Górny  gentoo.org>

 app-portage/distpatch/distpatch-0.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild 
b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index 782930fad49..dbc1ab1b44d 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"

[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/

2021-02-22 Thread Sam James 
commit: 25ba5abeadb4877a335d0b07674befcfd14ec906
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Feb 22 19:51:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 22 22:19:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ba5abe

app-portage/distpatch: Port to python 3.{8,9}

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Sam James  gentoo.org>

 app-portage/distpatch/distpatch-0.1.2-r2.ebuild | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild 
b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index 1db970970d7..782930fad49 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"
@@ -15,12 +13,10 @@ 
SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )
 
-DEPEND="
-   >=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]
-   dev-python/snakeoil[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-   >=dev-util/diffball-1.0.1"
+RDEPEND="
+   >=dev-util/diffball-1.0.1
+   dev-python/snakeoil[${PYTHON_USEDEP}]
+   >=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/

2021-02-22 Thread Sam James 
commit: b210f8309b3659c0580c27d6a3701b6f753ddab5
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Feb 22 19:52:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 22 22:19:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b210f830

app-portage/distpatch: Mark ALLARCHES

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Sam James  gentoo.org>

 app-portage/distpatch/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-portage/distpatch/metadata.xml 
b/app-portage/distpatch/metadata.xml
index 16241be40ac..23d2bc12f72 100644
--- a/app-portage/distpatch/metadata.xml
+++ b/app-portage/distpatch/metadata.xml
@@ -2,6 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
   
+  
   
 
   rafaelmart...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/files/, app-portage/distpatch/

2020-02-26 Thread Rafael Martins 
commit: 9dca59fef3c9605b7a3a419bdd53d8be11fc947c
Author: Rafael Martins  gentoo  org>
AuthorDate: Wed Feb 26 17:36:22 2020 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Wed Feb 26 17:37:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dca59fe

app-portage/distpatch: python3 support. drop python2. bug #694576

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Rafael Martins  gentoo.org>

 ...h-0.1.2-r1.ebuild => distpatch-0.1.2-r2.ebuild} |  13 +-
 .../files/distpatch-python3-support.patch  | 420 +
 2 files changed, 427 insertions(+), 6 deletions(-)

diff --git a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild 
b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
similarity index 73%
rename from app-portage/distpatch/distpatch-0.1.2-r1.ebuild
rename to app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index f54a6163105..1a7f003bbd1 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -16,10 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-CDEPEND="
+PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )
+
+DEPEND="
>=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]
dev-python/snakeoil[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
>=dev-util/diffball-1.0.1"

diff --git a/app-portage/distpatch/files/distpatch-python3-support.patch 
b/app-portage/distpatch/files/distpatch-python3-support.patch
new file mode 100644
index 000..eec335633d7
--- /dev/null
+++ b/app-portage/distpatch/files/distpatch-python3-support.patch
@@ -0,0 +1,420 @@
+From 0274956acf4479b7346ac441fe09f2e56d575c47 Mon Sep 17 00:00:00 2001
+From: "Rafael G. Martins" 
+Date: Wed, 26 Feb 2020 18:22:06 +0100
+Subject: [PATCH] python3 support
+
+---
+ distdiffer   | 46 ++--
+ distpatch/chksums.py | 12 ++--
+ distpatch/deltadb.py |  4 ++--
+ distpatch/diff.py| 12 ++--
+ distpatch/package.py |  6 +++---
+ distpatch/patch.py   |  4 ++--
+ distpatch/stats.py   |  6 +++---
+ distpatcher  | 32 +++---
+ distpatchq   | 28 +--
+ 9 files changed, 75 insertions(+), 75 deletions(-)
+
+diff --git a/distdiffer b/distdiffer
+index a2b933d..6975b5c 100755
+--- a/distdiffer
 b/distdiffer
+@@ -73,39 +73,39 @@ def main():
+ return
+ 
+ if args.verbose:
+-print '>>> Starting distdiffer ...\n'
++print('>>> Starting distdiffer ...\n')
+ 
+ for package in packages:
+ if args.verbose:
+-print '>>> Package: %s' % package
++print('>>> Package: %s' % package)
+ pkg = Package(db)
+ try:
+ pkg.diff(package)
+-except Exception, err:
+-print >> sys.stderr, str(err)
++except Exception as err:
++print(str(err), file=sys.stderr)
+ if args.verbose:
+-print '>>> Versions:'
++print('>>> Versions:')
+ for cpv in pkg.ebuilds:
+-print '%s' % cpv
+-print '>>> Deltas:'
++print('%s' % cpv)
++print('>>> Deltas:')
+ if len(pkg.diffs) == 0:
+-print 'None\n'
++print('None\n')
+ else:
+ for diff in pkg.diffs:
+-print '%s -> %s' % (diff.src.fname,
+-diff.dest.fname)
++print('%s -> %s' % (diff.src.fname,
++diff.dest.fname))
+ if len(pkg.diffs) == 0:
+ continue
+ if args.verbose:
+-print '>>> Fetching distfiles:'
++print('>>> Fetching distfiles:')
+ try:
+ pkg.fetch_distfiles()
+-except Exception, err:
+-print >> sys.stderr, str(err)
+-print
++except Exception as err:
++print(str(err), file=sys.stderr)
++print()
+ continue
+ if args.verbose:
+-print '>>> Generating deltas:'
++print('>>> Generating deltas:')
+ for diff in pkg.diffs:
+ if args.verbose:
+ sys.stdout.write('%s -> %s ... ' % (diff.src.fname,
+@@ -116,20 +116,20 @@ def main():
+   not args.no_compress, args.force)
+ except DiffExists:
+ if args.verbose:
+-

[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/

2018-03-21 Thread Michał Górny 
commit: 24ce9d367a03e1f710be0e8b81d16fb4ade1161b
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Mar 21 17:01:17 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Mar 21 18:12:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ce9d36

app-portage/distpatch: Add missing PYTHON_USEDEP

 app-portage/distpatch/distpatch-0.1.2-r1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild 
b/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
index 351cdc02b9c..5c369d66145 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
@@ -18,11 +18,11 @@ IUSE=""
 
 CDEPEND="
|| (
-   >=sys-apps/portage-2.1.8.3
-   sys-apps/portage-mgorny
+   >=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]
+   sys-apps/portage-mgorny[${PYTHON_USEDEP}]
)
-   dev-python/snakeoil"
+   dev-python/snakeoil[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
-   dev-python/setuptools"
+   dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
>=dev-util/diffball-1.0.1"

[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/

2016-12-03 Thread Rafael Martins 
commit: b5889b9c376598ce4c47e2c3ad81f7b006e5168c
Author: Wim Muskee  gmail  com>
AuthorDate: Sat Dec  3 07:20:34 2016 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Sat Dec  3 19:22:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5889b9c

app-portage/distpatch: update HOMEPAGE, #587168

 app-portage/distpatch/distpatch-0.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-portage/distpatch/distpatch-0.1.2.ebuild 
b/app-portage/distpatch/distpatch-0.1.2.ebuild
index bb3bc33..e0d4480 100644
--- a/app-portage/distpatch/distpatch-0.1.2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"
-HOMEPAGE="https://www.gentoo.org/proj/en/infrastructure/distpatch/;
+HOMEPAGE="https://github.com/rafaelmartins/distpatch;
 
SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.gz;
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: app-portage/distpatch/

2016-11-06 Thread Rafael Martins 
commit: ad3e4995c84af6432be00414f90e0653a70d8b9c
Author: Rafael Martins  gentoo  org>
AuthorDate: Sun Nov  6 22:13:50 2016 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Sun Nov  6 22:14:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3e4995

app-portage/distpatch: version bump. ported to distutils-r1

Package-Manager: portage-2.2.28

 app-portage/distpatch/Manifest   |  2 +-
 .../{distpatch-0.1.1.ebuild => distpatch-0.1.2.ebuild}   | 12 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
index 80225f0..9232af3 100644
--- a/app-portage/distpatch/Manifest
+++ b/app-portage/distpatch/Manifest
@@ -1 +1 @@
-DIST distpatch-0.1.1.tar.gz 19768 SHA256 
1a455b14ebef9a6654f08b5280617dcd291e882ff42cd2f28d12b53579594522 SHA512 
232a011a7acea42e163a127f640594dd6702aa6c162034be24804c04fc458eab43948c7c5028ee8c49b564ec589564fb80e83ffb9d97c142e3f1c138a25e2739
 WHIRLPOOL 
d6947424d1002b371201a24df6c277afdd81d4282bb91f88eff41777f0cf0a7e7f6ce6b53f688dc27f43bbf9fde8354af705351a119b2af71b8ff4a367e320da
+DIST distpatch-0.1.2.tar.gz 19998 SHA256 
97452cf226d390c0d4634d4b985040228cc7e22551322ea949ef6c72eb6771a2 SHA512 
f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed
 WHIRLPOOL 
4577cc6361212b52c4ff7a25a4d50b4b8bccbccb0d2081a61a3dbcfcb7bf0d4b09d8bfddcbc1c8607e30a4dca7d74336386a01d483697acbd7268bd7e454225d

diff --git a/app-portage/distpatch/distpatch-0.1.1.ebuild 
b/app-portage/distpatch/distpatch-0.1.2.ebuild
similarity index 67%
rename from app-portage/distpatch/distpatch-0.1.1.ebuild
rename to app-portage/distpatch/distpatch-0.1.2.ebuild
index b6ae885..bb3bc33 100644
--- a/app-portage/distpatch/distpatch-0.1.1.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=3
+EAPI=6
 
-PYTHON_DEPEND='*:2.6'
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"
 HOMEPAGE="https://www.gentoo.org/proj/en/infrastructure/distpatch/;
-SRC_URI="mirror://github/rafaelmartins/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"