Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-dev

From: Mike Frysinger <vapier@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 17/21] sys-libs/ncurses: switch to sep-usr eclass
Date: Thu, 31 Mar 2016 00:10:45
Message-Id: 1459382320-20672-18-git-send-email-vapier@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default by Mike Frysinger
1 ---
2 sys-libs/ncurses/ncurses-5.9-r101.ebuild | 4 ++--
3 sys-libs/ncurses/ncurses-5.9-r3.ebuild | 4 ++--
4 sys-libs/ncurses/ncurses-5.9-r4.ebuild | 4 ++--
5 sys-libs/ncurses/ncurses-5.9-r5.ebuild | 4 ++--
6 sys-libs/ncurses/ncurses-5.9-r99.ebuild | 4 ++--
7 sys-libs/ncurses/ncurses-6.0-r1.ebuild | 4 ++--
8 sys-libs/ncurses/ncurses-6.0.ebuild | 4 ++--
9 7 files changed, 14 insertions(+), 14 deletions(-)
10
11 diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
12 index 541bb16..69de05f 100644
13 --- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
14 +++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
15 @@ -6,7 +6,7 @@
16
17 EAPI="5"
18
19 -inherit eutils toolchain-funcs multilib-minimal multiprocessing
20 +inherit eutils toolchain-funcs multilib-minimal multiprocessing sep-usr
21
22 MY_PV=${PV:0:3}
23 MY_P=${PN}-${MY_PV}
24 @@ -20,7 +20,7 @@ SLOT="5/5"
25 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
26 IUSE="gpm tinfo unicode"
27
28 -DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
29 +DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP},sep-usr?] )"
30 # Block the ncurses-5 that installs the same lib. #557472
31 RDEPEND="${DEPEND}
32 !<sys-libs/ncurses-6:0"
33 diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
34 index 0f383d5..b62c334 100644
35 --- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
36 +++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
37 @@ -3,7 +3,7 @@
38 # $Id$
39
40 EAPI="4"
41 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal
42 +inherit eutils flag-o-matic toolchain-funcs multilib-minimal sep-usr
43
44 MY_PV=${PV:0:3}
45 PV_SNAP=${PV:4}
46 @@ -17,7 +17,7 @@ SLOT="0"
47 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
48 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
49
50 -DEPEND="gpm? ( sys-libs/gpm )"
51 +DEPEND="gpm? ( sys-libs/gpm[sep-usr?] )"
52 # berkdb? ( sys-libs/db )"
53 # Block the older ncurses that installed all files w/SLOT=5. #557472
54 RDEPEND="${DEPEND}
55 diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
56 index ea8dacf..de1e5b0 100644
57 --- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
58 +++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
59 @@ -3,7 +3,7 @@
60 # $Id$
61
62 EAPI="4"
63 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal
64 +inherit eutils flag-o-matic toolchain-funcs multilib-minimal sep-usr
65
66 MY_PV=${PV:0:3}
67 PV_SNAP=${PV:4}
68 @@ -17,7 +17,7 @@ SLOT="0"
69 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
70 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
71
72 -DEPEND="gpm? ( sys-libs/gpm )"
73 +DEPEND="gpm? ( sys-libs/gpm[sep-usr?] )"
74 # berkdb? ( sys-libs/db )"
75 # Block the older ncurses that installed all files w/SLOT=5. #557472
76 RDEPEND="${DEPEND}
77 diff --git a/sys-libs/ncurses/ncurses-5.9-r5.ebuild b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
78 index 698ed64..ce41a64 100644
79 --- a/sys-libs/ncurses/ncurses-5.9-r5.ebuild
80 +++ b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
81 @@ -4,7 +4,7 @@
82
83 EAPI="5"
84
85 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal
86 +inherit eutils flag-o-matic toolchain-funcs multilib-minimal sep-usr
87
88 MY_PV=${PV:0:3}
89 PV_SNAP=${PV:4}
90 @@ -19,7 +19,7 @@ SLOT="0/5"
91 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
92 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
93
94 -DEPEND="gpm? ( sys-libs/gpm )"
95 +DEPEND="gpm? ( sys-libs/gpm[sep-usr?] )"
96 # berkdb? ( sys-libs/db )"
97 # Block the older ncurses that installed all files w/SLOT=5. #557472
98 RDEPEND="${DEPEND}
99 diff --git a/sys-libs/ncurses/ncurses-5.9-r99.ebuild b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
100 index d8a8266..70b9797 100644
101 --- a/sys-libs/ncurses/ncurses-5.9-r99.ebuild
102 +++ b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
103 @@ -15,7 +15,7 @@ HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
104 LICENSE="metapackage"
105 SLOT="5/5"
106 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
107 -IUSE="ada +cxx gpm static-libs tinfo unicode"
108 +IUSE="ada +cxx gpm sep-usr static-libs tinfo unicode"
109
110 -DEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
111 +DEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,sep-usr?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
112 RDEPEND="${DEPEND}"
113 diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
114 index 029591b..ba51035 100644
115 --- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
116 +++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
117 @@ -4,7 +4,7 @@
118
119 EAPI="5"
120
121 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing
122 +inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing sep-usr
123
124 MY_PV=${PV:0:3}
125 PV_SNAP=${PV:4}
126 @@ -19,7 +19,7 @@ SLOT="0/6"
127 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
128 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
129
130 -DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
131 +DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP},sep-usr?] )"
132 # berkdb? ( sys-libs/db )"
133 # Block the older ncurses that installed all files w/SLOT=5. #557472
134 RDEPEND="${DEPEND}
135 diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild
136 index 3b85135..fd9c94d 100644
137 --- a/sys-libs/ncurses/ncurses-6.0.ebuild
138 +++ b/sys-libs/ncurses/ncurses-6.0.ebuild
139 @@ -15,7 +15,7 @@ HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
140 LICENSE="metapackage"
141 SLOT="5/6"
142 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
143 -IUSE="ada +cxx gpm static-libs tinfo unicode"
144 +IUSE="ada +cxx gpm sep-usr static-libs tinfo unicode"
145
146 -DEPEND="sys-libs/ncurses:0/6[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
147 +DEPEND="sys-libs/ncurses:0/6[ada?,cxx?,gpm?,sep-usr?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
148 RDEPEND="${DEPEND}"
149 --
150 2.7.4
Report Message
Find on MARC Find on Google Groups