[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/ - gentoo-commits

From:	Brian Dolbec <dolsen@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/
Date:	Sat, 30 Dec 2017 19:09:26
Message-Id:	`1514660951.49196e34b3d6123bb9fe080882084c2288afebd7.dolsen@gentoo`

1

commit:     49196e34b3d6123bb9fe080882084c2288afebd7

2

Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>

3

AuthorDate: Sat Dec 30 19:06:49 2017 +0000

4

Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>

5

CommitDate: Sat Dec 30 19:09:11 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49196e34

7

8

dev-util/catalyst: Version bump, re-adds x86-fbsd

9

10

Package-Manager: Portage-2.3.16, Repoman-2.3.6

11

12

 dev-util/catalyst/Manifest                                    |  1 +

13

 .../catalyst/{catalyst-9999.ebuild => catalyst-3.0.1.ebuild}  | 11 +++++------

14

 dev-util/catalyst/catalyst-9999.ebuild                        |  6 +++---

15

 3 files changed, 9 insertions(+), 9 deletions(-)

16

17

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest

18

index e3a9bb6ec35..14db1af23d3 100644

19

--- a/dev-util/catalyst/Manifest

20

+++ b/dev-util/catalyst/Manifest

21

@@ -1,2 +1,3 @@

22

 DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a

23

 DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f

24

+DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8

25

26

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild

27

similarity index 85%

28

copy from dev-util/catalyst/catalyst-9999.ebuild

29

copy to dev-util/catalyst/catalyst-3.0.1.ebuild

30

index ef20b4711c2..353a6e728bd 100644

31

--- a/dev-util/catalyst/catalyst-9999.ebuild

32

+++ b/dev-util/catalyst/catalyst-3.0.1.ebuild

33

@@ -13,10 +13,10 @@ else

34

 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2

35

 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2

36

 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"

37

-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"

38

+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"

39

fi

40

41

-PYTHON_COMPAT=( python{3_4,3_5,3_6} )

42

+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )

43

44

 inherit distutils-r1 multilib ${SRC_ECLASS}

45

46

@@ -32,12 +32,12 @@ DEPEND="

47

 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]

48

"

49

 RDEPEND="

50

-	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]

51

+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]

52

 	app-arch/lbzip2

53

 	app-crypt/shash

54

 	sys-fs/dosfstools

55

-	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )

56

-	x86-fbsd? ( app-arch/libarchive[xattr] )

57

+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )

58

+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )

59

 	virtual/cdrtools

60

 	amd64? ( >=sys-boot/syslinux-3.72 )

61

 	x86? ( >=sys-boot/syslinux-3.72 )

62

@@ -48,7 +48,6 @@ RDEPEND="

63

 python_prepare_all() {

64

 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version

65

 	VERSION="${PV}" "${PYTHON}" setup.py set_version

66

-	distutils-r1_python_prepare_all

67

}

68

69

 python_compile_all() {

70

71

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild

72

index ef20b4711c2..e7cb785d333 100644

73

--- a/dev-util/catalyst/catalyst-9999.ebuild

74

+++ b/dev-util/catalyst/catalyst-9999.ebuild

75

@@ -13,7 +13,7 @@ else

76

 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2

77

 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2

78

 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"

79

-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"

80

+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"

81

fi

82

83

 PYTHON_COMPAT=( python{3_4,3_5,3_6} )

84

@@ -36,8 +36,8 @@ RDEPEND="

85

 	app-arch/lbzip2

86

 	app-crypt/shash

87

 	sys-fs/dosfstools

88

-	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )

89

-	x86-fbsd? ( app-arch/libarchive[xattr] )

90

+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )

91

+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )

92

 	virtual/cdrtools

93

 	amd64? ( >=sys-boot/syslinux-3.72 )

94

 	x86? ( >=sys-boot/syslinux-3.72 )

1	commit: 49196e34b3d6123bb9fe080882084c2288afebd7
2	Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3	AuthorDate: Sat Dec 30 19:06:49 2017 +0000
4	Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5	CommitDate: Sat Dec 30 19:09:11 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49196e34
7
8	dev-util/catalyst: Version bump, re-adds x86-fbsd
9
10	Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12	dev-util/catalyst/Manifest \| 1 +
13	.../catalyst/{catalyst-9999.ebuild => catalyst-3.0.1.ebuild} \| 11 +++++------
14	dev-util/catalyst/catalyst-9999.ebuild \| 6 +++---
15	3 files changed, 9 insertions(+), 9 deletions(-)
16
17	diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
18	index e3a9bb6ec35..14db1af23d3 100644
19	--- a/dev-util/catalyst/Manifest
20	+++ b/dev-util/catalyst/Manifest
21	@@ -1,2 +1,3 @@
22	DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
23	DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
24	+DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
25
26	diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
27	similarity index 85%
28	copy from dev-util/catalyst/catalyst-9999.ebuild
29	copy to dev-util/catalyst/catalyst-3.0.1.ebuild
30	index ef20b4711c2..353a6e728bd 100644
31	--- a/dev-util/catalyst/catalyst-9999.ebuild
32	+++ b/dev-util/catalyst/catalyst-3.0.1.ebuild
33	@@ -13,10 +13,10 @@ else
34	https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
35	https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
36	https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
37	- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
38	+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
39	fi
40
41	-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
42	+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
43
44	inherit distutils-r1 multilib ${SRC_ECLASS}
45
46	@@ -32,12 +32,12 @@ DEPEND="
47	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
48	"
49	RDEPEND="
50	- =dev-python/pydecomp-9999[${PYTHON_USEDEP}]
51	+ >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
52	app-arch/lbzip2
53	app-crypt/shash
54	sys-fs/dosfstools
55	- !x86-fbsd? ( \|\| ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
56	- x86-fbsd? ( app-arch/libarchive[xattr] )
57	+ !kernel_FreeBSD? ( \|\| ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
58	+ kernel_FreeBSD? ( app-arch/libarchive[xattr] )
59	virtual/cdrtools
60	amd64? ( >=sys-boot/syslinux-3.72 )
61	x86? ( >=sys-boot/syslinux-3.72 )
62	@@ -48,7 +48,6 @@ RDEPEND="
63	python_prepare_all() {
64	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
65	VERSION="${PV}" "${PYTHON}" setup.py set_version
66	- distutils-r1_python_prepare_all
67	}
68
69	python_compile_all() {
70
71	diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
72	index ef20b4711c2..e7cb785d333 100644
73	--- a/dev-util/catalyst/catalyst-9999.ebuild
74	+++ b/dev-util/catalyst/catalyst-9999.ebuild
75	@@ -13,7 +13,7 @@ else
76	https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
77	https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
78	https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
79	- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
80	+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
81	fi
82
83	PYTHON_COMPAT=( python{3_4,3_5,3_6} )
84	@@ -36,8 +36,8 @@ RDEPEND="
85	app-arch/lbzip2
86	app-crypt/shash
87	sys-fs/dosfstools
88	- !x86-fbsd? ( \|\| ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
89	- x86-fbsd? ( app-arch/libarchive[xattr] )
90	+ !kernel_FreeBSD? ( \|\| ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
91	+ kernel_FreeBSD? ( app-arch/libarchive[xattr] )
92	virtual/cdrtools
93	amd64? ( >=sys-boot/syslinux-3.72 )
94	x86? ( >=sys-boot/syslinux-3.72 )

Gentoo Archives: gentoo-commits