[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/
Date:	Thu, 17 Sep 2020 16:56:29
Message-Id:	`1600361780.b0c1e014da4e68423a1bf2751c97d0e17ef50a48.mgorny@gentoo`

1

commit:     b0c1e014da4e68423a1bf2751c97d0e17ef50a48

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Thu Sep 17 14:23:52 2020 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Thu Sep 17 16:56:20 2020 +0000

6

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

7

8

dev-python/pypy3: Fix PYTHON path for byte-compiling modules

9

10

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

11

12

 dev-python/pypy3/{pypy3-7.3.1-r2.ebuild => pypy3-7.3.1-r3.ebuild}  | 7 ++++++-

13

 .../pypy3/{pypy3-7.3.2_rc2.ebuild => pypy3-7.3.2_rc2-r1.ebuild}    | 7 ++++++-

14

 .../{pypy3-7.3.2_rc2_p37.ebuild => pypy3-7.3.2_rc2_p37-r1.ebuild}  | 7 ++++++-

15

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

16

17

diff --git a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild

18

similarity index 96%

19

rename from dev-python/pypy3/pypy3-7.3.1-r2.ebuild

20

rename to dev-python/pypy3/pypy3-7.3.1-r3.ebuild

21

index 3388f868455..4f4f4bded68 100644

22

--- a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild

23

+++ b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild

24

@@ -204,7 +204,9 @@ src_install() {

25

fi

26

27

 	local -x EPYTHON=pypy3

28

-	local -x PYTHON=${ED}${dest}/pypy3-c

29

+	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}

30

+	# temporarily copy to build tree to facilitate module builds

31

+	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die

32

33

 	echo "EPYTHON='${EPYTHON}'" > epython.py || die

34

 	python_moduleinto /usr/lib/pypy3.6/site-packages

35

@@ -212,4 +214,7 @@ src_install() {

36

37

 	einfo "Byte-compiling Python standard library..."

38

 	python_optimize "${ED}${dest}"

39

+

40

+	# remove to avoid collisions

41

+	rm "${PYTHON}" || die

42

}

43

44

diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild

45

similarity index 96%

46

rename from dev-python/pypy3/pypy3-7.3.2_rc2.ebuild

47

rename to dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild

48

index 45d2ebfd217..acb328c4e72 100644

49

--- a/dev-python/pypy3/pypy3-7.3.2_rc2.ebuild

50

+++ b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild

51

@@ -191,7 +191,9 @@ src_install() {

52

fi

53

54

 	local -x EPYTHON=pypy3

55

-	local -x PYTHON=${ED}${dest}/pypy3-c

56

+	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}

57

+	# temporarily copy to build tree to facilitate module builds

58

+	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die

59

60

 	echo "EPYTHON='${EPYTHON}'" > epython.py || die

61

 	python_moduleinto /usr/lib/pypy3.6/site-packages

62

@@ -199,4 +201,7 @@ src_install() {

63

64

 	einfo "Byte-compiling Python standard library..."

65

 	python_optimize "${ED}${dest}"

66

+

67

+	# remove to avoid collisions

68

+	rm "${PYTHON}" || die

69

}

70

71

diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild

72

similarity index 95%

73

rename from dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild

74

rename to dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild

75

index 530c3ef5ceb..d750cf9c4b2 100644

76

--- a/dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild

77

+++ b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild

78

@@ -162,7 +162,9 @@ src_install() {

79

fi

80

81

 	local -x EPYTHON=pypy3

82

-	local -x PYTHON=${ED}${dest}/pypy3-c

83

+	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}

84

+	# temporarily copy to build tree to facilitate module builds

85

+	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die

86

87

 	echo "EPYTHON='${EPYTHON}'" > epython.py || die

88

 	python_moduleinto /usr/lib/pypy3.7/site-packages

89

@@ -170,4 +172,7 @@ src_install() {

90

91

 	einfo "Byte-compiling Python standard library..."

92

 	python_optimize "${ED}${dest}"

93

+

94

+	# remove to avoid collisions

95

+	rm "${PYTHON}" || die

96

}

1	commit: b0c1e014da4e68423a1bf2751c97d0e17ef50a48
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Thu Sep 17 14:23:52 2020 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Thu Sep 17 16:56:20 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c1e014
7
8	dev-python/pypy3: Fix PYTHON path for byte-compiling modules
9
10	Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12	dev-python/pypy3/{pypy3-7.3.1-r2.ebuild => pypy3-7.3.1-r3.ebuild} \| 7 ++++++-
13	.../pypy3/{pypy3-7.3.2_rc2.ebuild => pypy3-7.3.2_rc2-r1.ebuild} \| 7 ++++++-
14	.../{pypy3-7.3.2_rc2_p37.ebuild => pypy3-7.3.2_rc2_p37-r1.ebuild} \| 7 ++++++-
15	3 files changed, 18 insertions(+), 3 deletions(-)
16
17	diff --git a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild
18	similarity index 96%
19	rename from dev-python/pypy3/pypy3-7.3.1-r2.ebuild
20	rename to dev-python/pypy3/pypy3-7.3.1-r3.ebuild
21	index 3388f868455..4f4f4bded68 100644
22	--- a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
23	+++ b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild
24	@@ -204,7 +204,9 @@ src_install() {
25	fi
26
27	local -x EPYTHON=pypy3
28	- local -x PYTHON=${ED}${dest}/pypy3-c
29	+ local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
30	+ # temporarily copy to build tree to facilitate module builds
31	+ cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" \|\| die
32
33	echo "EPYTHON='${EPYTHON}'" > epython.py \|\| die
34	python_moduleinto /usr/lib/pypy3.6/site-packages
35	@@ -212,4 +214,7 @@ src_install() {
36
37	einfo "Byte-compiling Python standard library..."
38	python_optimize "${ED}${dest}"
39	+
40	+ # remove to avoid collisions
41	+ rm "${PYTHON}" \|\| die
42	}
43
44	diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
45	similarity index 96%
46	rename from dev-python/pypy3/pypy3-7.3.2_rc2.ebuild
47	rename to dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
48	index 45d2ebfd217..acb328c4e72 100644
49	--- a/dev-python/pypy3/pypy3-7.3.2_rc2.ebuild
50	+++ b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
51	@@ -191,7 +191,9 @@ src_install() {
52	fi
53
54	local -x EPYTHON=pypy3
55	- local -x PYTHON=${ED}${dest}/pypy3-c
56	+ local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
57	+ # temporarily copy to build tree to facilitate module builds
58	+ cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" \|\| die
59
60	echo "EPYTHON='${EPYTHON}'" > epython.py \|\| die
61	python_moduleinto /usr/lib/pypy3.6/site-packages
62	@@ -199,4 +201,7 @@ src_install() {
63
64	einfo "Byte-compiling Python standard library..."
65	python_optimize "${ED}${dest}"
66	+
67	+ # remove to avoid collisions
68	+ rm "${PYTHON}" \|\| die
69	}
70
71	diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
72	similarity index 95%
73	rename from dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild
74	rename to dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
75	index 530c3ef5ceb..d750cf9c4b2 100644
76	--- a/dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild
77	+++ b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
78	@@ -162,7 +162,9 @@ src_install() {
79	fi
80
81	local -x EPYTHON=pypy3
82	- local -x PYTHON=${ED}${dest}/pypy3-c
83	+ local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
84	+ # temporarily copy to build tree to facilitate module builds
85	+ cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" \|\| die
86
87	echo "EPYTHON='${EPYTHON}'" > epython.py \|\| die
88	python_moduleinto /usr/lib/pypy3.7/site-packages
89	@@ -170,4 +172,7 @@ src_install() {
90
91	einfo "Byte-compiling Python standard library..."
92	python_optimize "${ED}${dest}"
93	+
94	+ # remove to avoid collisions
95	+ rm "${PYTHON}" \|\| die
96	}

Gentoo Archives: gentoo-commits