Gentoo Archives: gentoo-commits

From: "Doug Goldstein (cardoe)" <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox/files: virtualbox.desktop virtualbox-wrapper virtualbox-1.6.2-remove-unused.patch
Date: Fri, 13 Jun 2008 22:45:26
Message-Id: E1K7I1H-0008Us-QW@stork.gentoo.org
1 cardoe 08/06/13 22:45:19
2
3 Modified: virtualbox.desktop virtualbox-wrapper
4 Added: virtualbox-1.6.2-remove-unused.patch
5 Log:
6 copy changes from jokey's overlay to the tree as jokey requested
7 (Portage version: 2.1.5.5)
8
9 Revision Changes Path
10 1.4 app-emulation/virtualbox/files/virtualbox.desktop
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox.desktop?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox.desktop?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox.desktop?r1=1.3&r2=1.4
15
16 Index: virtualbox.desktop
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/files/virtualbox.desktop,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- virtualbox.desktop 5 Dec 2007 22:52:45 -0000 1.3
23 +++ virtualbox.desktop 13 Jun 2008 22:45:19 -0000 1.4
24 @@ -1,5 +1,5 @@
25 [Desktop Entry]
26 -Name=Innotek VirtualBox
27 +Name=Sun xVM VirtualBox
28 Type=Application
29 Comment=Run several virtual systems on a single host computer
30 Exec=VirtualBox
31
32
33
34 1.4 app-emulation/virtualbox/files/virtualbox-wrapper
35
36 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-wrapper?rev=1.4&view=markup
37 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-wrapper?rev=1.4&content-type=text/plain
38 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-wrapper?r1=1.3&r2=1.4
39
40 Index: virtualbox-wrapper
41 ===================================================================
42 RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/files/virtualbox-wrapper,v
43 retrieving revision 1.3
44 retrieving revision 1.4
45 diff -u -r1.3 -r1.4
46 --- virtualbox-wrapper 3 Nov 2007 15:08:52 -0000 1.3
47 +++ virtualbox-wrapper 13 Jun 2008 22:45:19 -0000 1.4
48 @@ -121,6 +121,9 @@
49 VBoxSDL)
50 exec "$INSTALL_DIR/VBoxSDL" "$@"
51 ;;
52 + VBoxHeadless)
53 + exec "$INSTALL_DIR/VBoxHeadless" "$@"
54 + ;;
55 *)
56 echo "Unknown application - $APP"
57 ;;
58
59
60
61 1.1 app-emulation/virtualbox/files/virtualbox-1.6.2-remove-unused.patch
62
63 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-1.6.2-remove-unused.patch?rev=1.1&view=markup
64 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-1.6.2-remove-unused.patch?rev=1.1&content-type=text/plain
65
66 Index: virtualbox-1.6.2-remove-unused.patch
67 ===================================================================
68 --- Config.kmk.orig 2008-06-06 17:14:01.000000000 +0200
69 +++ Config.kmk 2008-06-06 17:15:47.000000000 +0200
70 @@ -132,26 +132,26 @@
71
72 # This indicates that additions (of some kind or another) is being _built_.
73 # VBOX_WITHOUT_ADDITIONS overrides it.
74 -if1of ($(KBUILD_TARGET),l4 linux os2 solaris win)
75 - VBOX_WITH_ADDITIONS = 1
76 -else ifdef VBOX_WITH_WIN32_ADDITIONS # for ssh cross builds -remove later!
77 - VBOX_WITH_ADDITIONS = 1
78 -else ifdef VBOX_WITH_LINUX_ADDITIONS # for ssh cross builds - remove later!
79 - VBOX_WITH_ADDITIONS = 1
80 -endif
81 +#if1of ($(KBUILD_TARGET),l4 linux os2 solaris win)
82 +# VBOX_WITH_ADDITIONS = 1
83 +#else ifdef VBOX_WITH_WIN32_ADDITIONS # for ssh cross builds -remove later!
84 +# VBOX_WITH_ADDITIONS = 1
85 +#else ifdef VBOX_WITH_LINUX_ADDITIONS # for ssh cross builds - remove later!
86 +# VBOX_WITH_ADDITIONS = 1
87 +#endif
88 # Build the optional ring-0 part of the additions for syntax checking.
89 # (Ignored ifndef VBOX_WITH_ADDITIONS. Hack for 32/64 linux issues.)
90 -VBOX_WITH_ADDITION_DRIVERS = 1
91 +#VBOX_WITH_ADDITION_DRIVERS = 1
92 # Build win32 additions (cross building them on linux and l4 using wine).
93 -if1of ($(KBUILD_TARGET),l4 linux win)
94 - VBOX_WITH_WIN32_ADDITIONS = 1
95 -endif
96 +#if1of ($(KBUILD_TARGET),l4 linux win)
97 +# VBOX_WITH_WIN32_ADDITIONS = 1
98 +#endif
99 # Build linux additions.
100 # Note! VBOX_WITH_LINUX_ADDITIONS will be removed later and only
101 # VBOX_WITH_WIN32_ADDITIONS will be kept around for cross building.
102 -if1of ($(KBUILD_TARGET),l4 linux)
103 - VBOX_WITH_LINUX_ADDITIONS = 1
104 -endif
105 +#if1of ($(KBUILD_TARGET),l4 linux)
106 +# VBOX_WITH_LINUX_ADDITIONS = 1
107 +#endif
108 # Build X11 additions. Can be disabled separately.
109 ifndef VBOX_WITH_X11_ADDITIONS
110 ifdef VBOX_WITH_LINUX_ADDITIONS
111 @@ -207,7 +207,7 @@
112 # The SDL based GUI.
113 VBOX_WITH_VBOXSDL = 1
114 # The basic frontend (w/o Main).
115 -VBOX_WITH_VBOXBFE = 1
116 +#VBOX_WITH_VBOXBFE = 1
117 # The Qt GUI.
118 VBOX_WITH_QTGUI = 1
119 # The Qt 4 GUI (experimental).
120 @@ -243,9 +243,9 @@
121 # Enable the kchmviewer
122 VBOX_WITH_KCHMVIEWER = 1
123 # Build the testsuite.
124 -VBOX_WITH_TESTSUITE = 1
125 +#VBOX_WITH_TESTSUITE = 1
126 # Build the testcases.
127 -VBOX_WITH_TESTCASES = 1
128 +#VBOX_WITH_TESTCASES = 1
129 # Set this to not use COM or XPCOM in places where it can be avoided.
130 #VBOX_WITHOUT_COM = 1
131 # Set this to skip installing the redistributable compiler runtime.
132 --- configure.orig 2008-06-06 17:14:06.000000000 +0200
133 +++ configure 2008-06-06 17:15:32.000000000 +0200
134 @@ -1785,14 +1785,14 @@
135 # some things are not available in for OSE
136 if [ $OSE -ge 1 ]; then
137 cnf_append "VBOX_OSE" "1"
138 - cnf_append "VBOX_WITH_TESTSUITE" ""
139 +# cnf_append "VBOX_WITH_TESTSUITE" ""
140 cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
141
142 - if [ "$OS" = "linux" ]; then
143 - cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
144 - else
145 - cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
146 - fi
147 +# if [ "$OS" = "linux" ]; then
148 +# cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
149 +# else
150 +# cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
151 +# fi
152 echo >> $CNF
153 fi
154
155
156
157
158 --
159 gentoo-commits@l.g.o mailing list