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

From:	Zac Medico <zmedico@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-portage/repoman/
Date:	Mon, 27 Jun 2016 10:22:40
Message-Id:	`1467022944.db1a71a6d2c328d65160647e2a3132315a731660.zmedico@gentoo`

1

commit:     db1a71a6d2c328d65160647e2a3132315a731660

2

Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>

3

AuthorDate: Mon Jun 27 10:12:15 2016 +0000

4

Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>

5

CommitDate: Mon Jun 27 10:22:24 2016 +0000

6

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

7

8

app-portage/repoman: fix EPREFIX support

9

10

Package-Manager: portage-2.3.0

11

12

 app-portage/repoman/repoman-2.3.0.ebuild        | 10 ----------

13

 app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild | 10 ----------

14

 app-portage/repoman/repoman-9999.ebuild         | 10 ----------

15

 3 files changed, 30 deletions(-)

16

17

diff --git a/app-portage/repoman/repoman-2.3.0.ebuild b/app-portage/repoman/repoman-2.3.0.ebuild

18

index fda70fd..f14164a 100644

19

--- a/app-portage/repoman/repoman-2.3.0.ebuild

20

+++ b/app-portage/repoman/repoman-2.3.0.ebuild

21

@@ -48,16 +48,6 @@ python_prepare_all() {

22

 	distutils-r1_python_prepare_all

23

24

 	if [[ -n ${EPREFIX} ]] ; then

25

-		einfo "Setting portage.const.EPREFIX ..."

26

-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \

27

-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \

28

-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \

29

-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \

30

-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \

31

-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \

32

-			-i pym/portage/const.py || \

33

-			die "Failed to patch portage.const.EPREFIX"

34

-

35

 		einfo "Prefixing shebangs ..."

36

 		while read -r -d $'\0' ; do

37

 			local shebang=$(head -n1 "$REPLY")

38

39

diff --git a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild

40

index fda70fd..f14164a 100644

41

--- a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild

42

+++ b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild

43

@@ -48,16 +48,6 @@ python_prepare_all() {

44

 	distutils-r1_python_prepare_all

45

46

 	if [[ -n ${EPREFIX} ]] ; then

47

-		einfo "Setting portage.const.EPREFIX ..."

48

-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \

49

-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \

50

-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \

51

-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \

52

-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \

53

-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \

54

-			-i pym/portage/const.py || \

55

-			die "Failed to patch portage.const.EPREFIX"

56

-

57

 		einfo "Prefixing shebangs ..."

58

 		while read -r -d $'\0' ; do

59

 			local shebang=$(head -n1 "$REPLY")

60

61

diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild

62

index af02967..b790c81 100644

63

--- a/app-portage/repoman/repoman-9999.ebuild

64

+++ b/app-portage/repoman/repoman-9999.ebuild

65

@@ -54,16 +54,6 @@ python_prepare_all() {

66

 	distutils-r1_python_prepare_all

67

68

 	if [[ -n ${EPREFIX} ]] ; then

69

-		einfo "Setting portage.const.EPREFIX ..."

70

-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \

71

-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \

72

-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \

73

-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \

74

-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \

75

-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \

76

-			-i pym/portage/const.py || \

77

-			die "Failed to patch portage.const.EPREFIX"

78

-

79

 		einfo "Prefixing shebangs ..."

80

 		while read -r -d $'\0' ; do

81

 			local shebang=$(head -n1 "$REPLY")

1	commit: db1a71a6d2c328d65160647e2a3132315a731660
2	Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3	AuthorDate: Mon Jun 27 10:12:15 2016 +0000
4	Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5	CommitDate: Mon Jun 27 10:22:24 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db1a71a6
7
8	app-portage/repoman: fix EPREFIX support
9
10	Package-Manager: portage-2.3.0
11
12	app-portage/repoman/repoman-2.3.0.ebuild \| 10 ----------
13	app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild \| 10 ----------
14	app-portage/repoman/repoman-9999.ebuild \| 10 ----------
15	3 files changed, 30 deletions(-)
16
17	diff --git a/app-portage/repoman/repoman-2.3.0.ebuild b/app-portage/repoman/repoman-2.3.0.ebuild
18	index fda70fd..f14164a 100644
19	--- a/app-portage/repoman/repoman-2.3.0.ebuild
20	+++ b/app-portage/repoman/repoman-2.3.0.ebuild
21	@@ -48,16 +48,6 @@ python_prepare_all() {
22	distutils-r1_python_prepare_all
23
24	if [[ -n ${EPREFIX} ]] ; then
25	- einfo "Setting portage.const.EPREFIX ..."
26	- sed -e "s\|^\(SANDBOX_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/bin/sandbox\"\)\|\\1${EPREFIX}\\2\|" \
27	- -e "s\|^\(FAKEROOT_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/bin/fakeroot\"\)\|\\1${EPREFIX}\\2\|" \
28	- -e "s\|^\(BASH_BINARY[[:space:]]=[[:space:]]\"\)\(/bin/bash\"\)\|\\1${EPREFIX}\\2\|" \
29	- -e "s\|^\(MOVE_BINARY[[:space:]]=[[:space:]]\"\)\(/bin/mv\"\)\|\\1${EPREFIX}\\2\|" \
30	- -e "s\|^\(PRELINK_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/sbin/prelink\"\)\|\\1${EPREFIX}\\2\|" \
31	- -e "s\|^\(EPREFIX[[:space:]]=[[:space:]]\"\).*\|\\1${EPREFIX}\"\|" \
32	- -i pym/portage/const.py \|\| \
33	- die "Failed to patch portage.const.EPREFIX"
34	-
35	einfo "Prefixing shebangs ..."
36	while read -r -d $'\0' ; do
37	local shebang=$(head -n1 "$REPLY")
38
39	diff --git a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
40	index fda70fd..f14164a 100644
41	--- a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
42	+++ b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
43	@@ -48,16 +48,6 @@ python_prepare_all() {
44	distutils-r1_python_prepare_all
45
46	if [[ -n ${EPREFIX} ]] ; then
47	- einfo "Setting portage.const.EPREFIX ..."
48	- sed -e "s\|^\(SANDBOX_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/bin/sandbox\"\)\|\\1${EPREFIX}\\2\|" \
49	- -e "s\|^\(FAKEROOT_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/bin/fakeroot\"\)\|\\1${EPREFIX}\\2\|" \
50	- -e "s\|^\(BASH_BINARY[[:space:]]=[[:space:]]\"\)\(/bin/bash\"\)\|\\1${EPREFIX}\\2\|" \
51	- -e "s\|^\(MOVE_BINARY[[:space:]]=[[:space:]]\"\)\(/bin/mv\"\)\|\\1${EPREFIX}\\2\|" \
52	- -e "s\|^\(PRELINK_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/sbin/prelink\"\)\|\\1${EPREFIX}\\2\|" \
53	- -e "s\|^\(EPREFIX[[:space:]]=[[:space:]]\"\).*\|\\1${EPREFIX}\"\|" \
54	- -i pym/portage/const.py \|\| \
55	- die "Failed to patch portage.const.EPREFIX"
56	-
57	einfo "Prefixing shebangs ..."
58	while read -r -d $'\0' ; do
59	local shebang=$(head -n1 "$REPLY")
60
61	diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
62	index af02967..b790c81 100644
63	--- a/app-portage/repoman/repoman-9999.ebuild
64	+++ b/app-portage/repoman/repoman-9999.ebuild
65	@@ -54,16 +54,6 @@ python_prepare_all() {
66	distutils-r1_python_prepare_all
67
68	if [[ -n ${EPREFIX} ]] ; then
69	- einfo "Setting portage.const.EPREFIX ..."
70	- sed -e "s\|^\(SANDBOX_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/bin/sandbox\"\)\|\\1${EPREFIX}\\2\|" \
71	- -e "s\|^\(FAKEROOT_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/bin/fakeroot\"\)\|\\1${EPREFIX}\\2\|" \
72	- -e "s\|^\(BASH_BINARY[[:space:]]=[[:space:]]\"\)\(/bin/bash\"\)\|\\1${EPREFIX}\\2\|" \
73	- -e "s\|^\(MOVE_BINARY[[:space:]]=[[:space:]]\"\)\(/bin/mv\"\)\|\\1${EPREFIX}\\2\|" \
74	- -e "s\|^\(PRELINK_BINARY[[:space:]]=[[:space:]]\"\)\(/usr/sbin/prelink\"\)\|\\1${EPREFIX}\\2\|" \
75	- -e "s\|^\(EPREFIX[[:space:]]=[[:space:]]\"\).*\|\\1${EPREFIX}\"\|" \
76	- -i pym/portage/const.py \|\| \
77	- die "Failed to patch portage.const.EPREFIX"
78	-
79	einfo "Prefixing shebangs ..."
80	while read -r -d $'\0' ; do
81	local shebang=$(head -n1 "$REPLY")

Gentoo Archives: gentoo-commits