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

Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox: ChangeLog virtualbox-4.1.22.ebuild virtualbox-4.2.0-r1.ebuild
Date: Mon, 01 Oct 2012 09:25:49
Message-Id: 20121001092539.85C5D21600@flycatcher.gentoo.org
1 polynomial-c 12/10/01 09:25:39
2
3 Modified: ChangeLog virtualbox-4.1.22.ebuild
4 virtualbox-4.2.0-r1.ebuild
5 Log:
6 Moved all patches into separate tar archives. Added a patch to fix compilation with =dev-libs/libxslt-1.1.27 (bug #435994 and bug #436246)
7
8 (Portage version: 2.2.0_alpha134/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.133 app-emulation/virtualbox/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.133&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.133&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?r1=1.132&r2=1.133
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v
20 retrieving revision 1.132
21 retrieving revision 1.133
22 diff -u -r1.132 -r1.133
23 --- ChangeLog 18 Sep 2012 05:36:39 -0000 1.132
24 +++ ChangeLog 1 Oct 2012 09:25:39 -0000 1.133
25 @@ -1,6 +1,22 @@
26 # ChangeLog for app-emulation/virtualbox
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.132 2012/09/18 05:36:39 polynomial-c Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.133 2012/10/01 09:25:39 polynomial-c Exp $
30 +
31 + 01 Oct 2012; Lars Wendler <polynomial-c@g.o>
32 + -files/virtualbox-ose-3.2.8-mesa-check.patch,
33 + -files/virtualbox-4.0.2-restore_old_machines_dir.patch,
34 + -files/virtualbox-4.1.2-vboxpci-build.patch,
35 + -files/virtualbox-4.1.4-asneeded.patch,
36 + -files/virtualbox-4.1.6-yasm120-fix.patch,
37 + -files/virtualbox-4.1.8-nopie.patch,
38 + -files/virtualbox-4.1.10-libgsoapssl.patch,
39 + -files/virtualbox-4.1.20-nopie.patch, virtualbox-4.1.22.ebuild,
40 + virtualbox-4.2.0-r1.ebuild, -files/virtualbox-4.2.0-nopie.patch,
41 + -files/virtualbox-4-asneeded.patch, -files/virtualbox-4-makeself-check.patch,
42 + -files/virtualbox-4-mkisofs-check.patch:
43 + Moved all patches into separate tar archives. Added a patch to fix
44 + compilation with =dev-libs/libxslt-1.1.27 (bug #435994 and bug #436246).
45 + Thanks to Jouni Kosonen for providing a patch.
46
47 18 Sep 2012; Lars Wendler <polynomial-c@g.o>
48 -virtualbox-4.1.12.ebuild, -virtualbox-4.1.18.ebuild:
49
50
51
52 1.5 app-emulation/virtualbox/virtualbox-4.1.22.ebuild
53
54 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?rev=1.5&view=markup
55 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?rev=1.5&content-type=text/plain
56 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?r1=1.4&r2=1.5
57
58 Index: virtualbox-4.1.22.ebuild
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v
61 retrieving revision 1.4
62 retrieving revision 1.5
63 diff -u -r1.4 -r1.5
64 --- virtualbox-4.1.22.ebuild 17 Sep 2012 20:17:37 -0000 1.4
65 +++ virtualbox-4.1.22.ebuild 1 Oct 2012 09:25:39 -0000 1.5
66 @@ -1,6 +1,6 @@
67 # Copyright 1999-2012 Gentoo Foundation
68 # Distributed under the terms of the GNU General Public License v2
69 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.4 2012/09/17 20:17:37 nativemad Exp $
70 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.5 2012/10/01 09:25:39 polynomial-c Exp $
71
72 EAPI=4
73
74 @@ -18,6 +18,8 @@
75
76 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
77 HOMEPAGE="http://www.virtualbox.org/"
78 +SRC_URI="${SRC_URI}
79 + http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.1.22-patches-01.tar.xz"
80
81 LICENSE="GPL-2"
82 SLOT="0"
83 @@ -141,24 +143,10 @@
84 sed -e "s@MY_LIBDIR@$(get_libdir)@" \
85 "${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
86
87 - # unset useless/problematic checks in configure
88 - epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
89 - "${FILESDIR}/${PN}-4-makeself-check.patch" \
90 - "${FILESDIR}/${PN}-4-mkisofs-check.patch"
91 -
92 - # fix build with --as-needed (bug #249295 and bug #350907)
93 - epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
94 -
95 # Respect LDFLAGS
96 sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
97 -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
98
99 - # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
100 - epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
101 -
102 - # Don't build vboxpci.ko module (D'oh!)
103 - epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
104 -
105 # Use PAM only when pam USE flag is enbaled (bug #376531)
106 if ! use pam ; then
107 elog "Disabling PAM removes the possibility to use the VRDP features."
108 @@ -174,10 +162,13 @@
109 java-pkg-opt-2_src_prepare
110 fi
111
112 - # Fix compile error on hardened bug 339914 (disable PIE)
113 - if gcc-specs-pie ; then
114 - epatch "${FILESDIR}"/${PN}-4.1.20-nopie.patch
115 + if ! gcc-specs-pie ; then
116 + EPATCH_EXCLUDE="050_${PN}-4.1.20-nopie.patch"
117 fi
118 +
119 + EPATCH_SUFFIX="patch" \
120 + EPATCH_FORCE="yes" \
121 + epatch "${WORKDIR}"/patches
122 }
123
124 src_configure() {
125
126
127
128 1.3 app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild
129
130 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?rev=1.3&view=markup
131 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?rev=1.3&content-type=text/plain
132 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?r1=1.2&r2=1.3
133
134 Index: virtualbox-4.2.0-r1.ebuild
135 ===================================================================
136 RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v
137 retrieving revision 1.2
138 retrieving revision 1.3
139 diff -u -r1.2 -r1.3
140 --- virtualbox-4.2.0-r1.ebuild 14 Sep 2012 10:47:27 -0000 1.2
141 +++ virtualbox-4.2.0-r1.ebuild 1 Oct 2012 09:25:39 -0000 1.3
142 @@ -1,6 +1,6 @@
143 # Copyright 1999-2012 Gentoo Foundation
144 # Distributed under the terms of the GNU General Public License v2
145 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v 1.2 2012/09/14 10:47:27 polynomial-c Exp $
146 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v 1.3 2012/10/01 09:25:39 polynomial-c Exp $
147
148 EAPI=4
149
150 @@ -20,6 +20,8 @@
151
152 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
153 HOMEPAGE="http://www.virtualbox.org/"
154 +SRC_URI="${SRC_URI}
155 + http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.0-patches-01.tar.xz"
156
157 LICENSE="GPL-2"
158 SLOT="0"
159 @@ -143,24 +145,10 @@
160 sed -e "s@MY_LIBDIR@$(get_libdir)@" \
161 "${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
162
163 - # unset useless/problematic checks in configure
164 - epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
165 - "${FILESDIR}/${PN}-4-makeself-check.patch" \
166 - "${FILESDIR}/${PN}-4-mkisofs-check.patch"
167 -
168 - # fix build with --as-needed (bug #249295 and bug #350907)
169 - epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
170 -
171 # Respect LDFLAGS
172 sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
173 -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
174
175 - # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
176 - epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
177 -
178 - # Don't build vboxpci.ko module (D'oh!)
179 - epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
180 -
181 # Use PAM only when pam USE flag is enbaled (bug #376531)
182 if ! use pam ; then
183 elog "Disabling PAM removes the possibility to use the VRDP features."
184 @@ -176,10 +164,13 @@
185 java-pkg-opt-2_src_prepare
186 fi
187
188 - # Fix compile error on hardened bug 339914 (disable PIE)
189 - if gcc-specs-pie ; then
190 - epatch "${FILESDIR}"/virtualbox-4.2.0-nopie.patch
191 + if ! gcc-specs-pie ; then
192 + EPATCH_EXCLUDE="050_${PN}-4.2.0-nopie.patch"
193 fi
194 +
195 + EPATCH_SUFFIX="patch" \
196 + EPATCH_FORCE="yes" \
197 + epatch "${WORKDIR}/patches"
198 }
199
200 src_configure() {
Report Message
Find on MARC Find on Google Groups