From: Markus Ullmann Date: Fri, 16 Mar 2007 22:15:52 +0000 (+0000) Subject: Version bump and minor bugfixes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aef2e233708b1786fcdaabe8cd6ed380c052ae14;p=gentoo.git Version bump and minor bugfixes Package-Manager: portage-2.1.2.2 --- diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog index fbf0e6c49351..2a6ea584d88f 100644 --- a/app-emulation/virtualbox/ChangeLog +++ b/app-emulation/virtualbox/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-emulation/virtualbox # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.12 2007/03/11 19:00:16 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.13 2007/03/16 22:15:52 jokey Exp $ + +*virtualbox-1.3.8 (16 Mar 2007) +*virtualbox-1.3.6-r1 (16 Mar 2007) + + 16 Mar 2007; Markus Ullmann + +files/virtualbox-1.3.8-remove-alsa.patch, + +files/virtualbox-1.3.8-remove-splitted-stuff.patch, + +files/virtualbox-wrapper, -virtualbox-1.3.4-r1.ebuild, + -virtualbox-1.3.4-r2.ebuild, -virtualbox-1.3.6.ebuild, + +virtualbox-1.3.6-r1.ebuild, +virtualbox-1.3.8.ebuild: + Version bump and minor bugfixes 11 Mar 2007; Markus Ullmann virtualbox-9999.ebuild: Missing IUSE, thanks jakub diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 2028d07cc068..9cac3878c33d 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -6,45 +6,50 @@ AUX virtualbox-1.3.6-wrapper 1463 RMD160 ab9ca6fc1bb9166d9aaeaca54febebf7df4a79c MD5 278382b3d521c6d655fd1b657086515d files/virtualbox-1.3.6-wrapper 1463 RMD160 ab9ca6fc1bb9166d9aaeaca54febebf7df4a79c5 files/virtualbox-1.3.6-wrapper 1463 SHA256 fb5567559f3345d671b4780bea3ef33cee0a73acb822680ca53e44bfde1ef9e1 files/virtualbox-1.3.6-wrapper 1463 +AUX virtualbox-1.3.8-remove-alsa.patch 732 RMD160 e398d436f74d594fcc29c223b24b02ce801fc5cf SHA1 a70c8be16afb805b469bd74ea5760195ba31d9e6 SHA256 1944d96f9673dbd59b3ca6e2bb433711b6c8444a4701acae0b99c70b7109f4c5 +MD5 beb8a2c21a4796a200bbe7905a81f539 files/virtualbox-1.3.8-remove-alsa.patch 732 +RMD160 e398d436f74d594fcc29c223b24b02ce801fc5cf files/virtualbox-1.3.8-remove-alsa.patch 732 +SHA256 1944d96f9673dbd59b3ca6e2bb433711b6c8444a4701acae0b99c70b7109f4c5 files/virtualbox-1.3.8-remove-alsa.patch 732 +AUX virtualbox-1.3.8-remove-splitted-stuff.patch 1806 RMD160 ec6347e2269cbe8abca288d0da5bbfa147840416 SHA1 7f1dba3ccea41a458e2acc9ba93d453958033f07 SHA256 2e2340a7ed16f652a509a483a1f8020d7d5682e5301e453a2e84908cb5903697 +MD5 eae4954001002e26a03fd0d6ec04cb3b files/virtualbox-1.3.8-remove-splitted-stuff.patch 1806 +RMD160 ec6347e2269cbe8abca288d0da5bbfa147840416 files/virtualbox-1.3.8-remove-splitted-stuff.patch 1806 +SHA256 2e2340a7ed16f652a509a483a1f8020d7d5682e5301e453a2e84908cb5903697 files/virtualbox-1.3.8-remove-splitted-stuff.patch 1806 +AUX virtualbox-wrapper 1606 RMD160 21a75925d364c61c1040b3d217b3e05dfbbfc175 SHA1 d0e885ead0dd5626a70ace3e9185940d27715743 SHA256 28a6305a7162c1864fee241568c1dd25e758c129069790512a0b1d7767656168 +MD5 424b5ca7e892bbb82a7c3e38661d1a43 files/virtualbox-wrapper 1606 +RMD160 21a75925d364c61c1040b3d217b3e05dfbbfc175 files/virtualbox-wrapper 1606 +SHA256 28a6305a7162c1864fee241568c1dd25e758c129069790512a0b1d7767656168 files/virtualbox-wrapper 1606 AUX virtualbox.desktop 249 RMD160 9fa141cf63f4a7e387dc281d0a8794a17235051c SHA1 e58fb63f70ed041bd15f6a8a2487be44687477d6 SHA256 3c0174cd67eba7925c72dcddf834d78ad8d28a2afc516854adb80f8a65c15efc MD5 c5bc3c92fce4aa813b6c6ce05bc91704 files/virtualbox.desktop 249 RMD160 9fa141cf63f4a7e387dc281d0a8794a17235051c files/virtualbox.desktop 249 SHA256 3c0174cd67eba7925c72dcddf834d78ad8d28a2afc516854adb80f8a65c15efc files/virtualbox.desktop 249 -DIST VirtualBox-OSE-1.3.4.tar.bz2 17491150 RMD160 32bd5f5e9bbf19bf59ffa93ccf6013496b40e318 SHA1 080330ef237ab89c0c00c32aa195c9341c434cf5 SHA256 c7d756645c96d202b8e88924f2b4da414c6d02775d3224739b21cdda064bbeee DIST VirtualBox-OSE-1.3.6.tar.bz2 17458095 RMD160 f082f6397ceec0d0d543b155821592e6032affc3 SHA1 4aa6a375488d3d3dac500e401346661116ac6cf4 SHA256 e249c6f4792291e56e026cf9d807d355809283538cfa296b4e72f9ec1c71cdae -EBUILD virtualbox-1.3.4-r1.ebuild 3039 RMD160 aa491b934dad08948e3c709f39113be57788f79e SHA1 a4565a2569f4c31ad0f147df52c681d488fe0a7b SHA256 78aab8163925cb11cd4b9a9043fcb28ba724775e425a8ef671ff890887453c05 -MD5 d2384fef7745cbae3aa05de6c2654134 virtualbox-1.3.4-r1.ebuild 3039 -RMD160 aa491b934dad08948e3c709f39113be57788f79e virtualbox-1.3.4-r1.ebuild 3039 -SHA256 78aab8163925cb11cd4b9a9043fcb28ba724775e425a8ef671ff890887453c05 virtualbox-1.3.4-r1.ebuild 3039 -EBUILD virtualbox-1.3.4-r2.ebuild 3227 RMD160 57b4ab8ac419fd831e0d7d0ee136a44ec37057ba SHA1 42870958fd969a36b668762de309fbfe23a5b709 SHA256 698bf42c0c6a1658b8abcaf0167e34aafd24d87d0ec5aff83ed4990c16b87dc2 -MD5 6040a1b3095777bd6bfb1ee3e4396327 virtualbox-1.3.4-r2.ebuild 3227 -RMD160 57b4ab8ac419fd831e0d7d0ee136a44ec37057ba virtualbox-1.3.4-r2.ebuild 3227 -SHA256 698bf42c0c6a1658b8abcaf0167e34aafd24d87d0ec5aff83ed4990c16b87dc2 virtualbox-1.3.4-r2.ebuild 3227 -EBUILD virtualbox-1.3.6.ebuild 3334 RMD160 eb1849c9623c0f6cbc45d88af567fc2f97839a46 SHA1 9fe0b7d9ce37618b64e58ccd94ebabc0c28d6981 SHA256 422e97828310ae5518546d086bf6240ac2b8f3a64c141c547a19c9f86468487d -MD5 5f4d581d6fe131c8db7e6b7c64c17b48 virtualbox-1.3.6.ebuild 3334 -RMD160 eb1849c9623c0f6cbc45d88af567fc2f97839a46 virtualbox-1.3.6.ebuild 3334 -SHA256 422e97828310ae5518546d086bf6240ac2b8f3a64c141c547a19c9f86468487d virtualbox-1.3.6.ebuild 3334 -EBUILD virtualbox-9999.ebuild 3682 RMD160 57580646bd1515afc5b7ca507dd944c9b50f95b8 SHA1 f8c2d67f23994e6cac57ddad18c81fe9e41adb4c SHA256 35e2e15432d66b37bd323d9cf6405b738ed9faa0bf9c8f52274b3cd1180c0e39 -MD5 127c54fbcd5d8cf114b3d31e3d9cec78 virtualbox-9999.ebuild 3682 -RMD160 57580646bd1515afc5b7ca507dd944c9b50f95b8 virtualbox-9999.ebuild 3682 -SHA256 35e2e15432d66b37bd323d9cf6405b738ed9faa0bf9c8f52274b3cd1180c0e39 virtualbox-9999.ebuild 3682 -MISC ChangeLog 2284 RMD160 328449cd36db1b6b4ea84e27da53ce9405313d38 SHA1 4592dd2abc16eba65a162c9fba3817c9fb8eb2f2 SHA256 200b92349d9c50fb13ab20f4bd099758e05b436f6454710f2b13603e34eb70c8 -MD5 77379cf006f9f9a8ef48b24b146c01a9 ChangeLog 2284 -RMD160 328449cd36db1b6b4ea84e27da53ce9405313d38 ChangeLog 2284 -SHA256 200b92349d9c50fb13ab20f4bd099758e05b436f6454710f2b13603e34eb70c8 ChangeLog 2284 +DIST VirtualBox-OSE-1.3.8.tar.bz2 17458132 RMD160 e832fc31773c4d2dc1ecfa7a24a68cfd190818a7 SHA1 2769c1064fb21d6a37d7588fa0b9b6f73309ac43 SHA256 14d84c38932f783bfa0bfbf1a91347cc2bba6fd3d4ba60744e7a0ace4bd5cce4 +EBUILD virtualbox-1.3.6-r1.ebuild 3387 RMD160 a16588269940e393ee78f4915fcc13014dda886c SHA1 ec7fa35787b79c9e58269072a1f2b3d74b6dd95d SHA256 b8736ac46cfe46c70bd04e7e9192b20132f2e171f35ee8075205860a1b30971a +MD5 6804c69ed3b2767ef2d82da79e867647 virtualbox-1.3.6-r1.ebuild 3387 +RMD160 a16588269940e393ee78f4915fcc13014dda886c virtualbox-1.3.6-r1.ebuild 3387 +SHA256 b8736ac46cfe46c70bd04e7e9192b20132f2e171f35ee8075205860a1b30971a virtualbox-1.3.6-r1.ebuild 3387 +EBUILD virtualbox-1.3.8.ebuild 3497 RMD160 ccac74500acecb2912e576894def3418d4b82bee SHA1 eb26c5324d0c37fc0cc92eb7addb45a7c9ab173c SHA256 9b806096165ebfa47929811d2c9633069e6d9ed219e66df93aef5f5be8e8f37d +MD5 2bd970a903dc6fe852338927bf8823e2 virtualbox-1.3.8.ebuild 3497 +RMD160 ccac74500acecb2912e576894def3418d4b82bee virtualbox-1.3.8.ebuild 3497 +SHA256 9b806096165ebfa47929811d2c9633069e6d9ed219e66df93aef5f5be8e8f37d virtualbox-1.3.8.ebuild 3497 +EBUILD virtualbox-9999.ebuild 3776 RMD160 b55d4705b3b783f6771d4fef1bce60596aae76f5 SHA1 3135abb80e64581cc6903f0891aad1a2c9df4d2f SHA256 a47a620a438074404a34d87e8a233183aae96dc841039a90dca654a8043dbb8f +MD5 4341bc6596a40c31d5dee3a4cfb0343d virtualbox-9999.ebuild 3776 +RMD160 b55d4705b3b783f6771d4fef1bce60596aae76f5 virtualbox-9999.ebuild 3776 +SHA256 a47a620a438074404a34d87e8a233183aae96dc841039a90dca654a8043dbb8f virtualbox-9999.ebuild 3776 +MISC ChangeLog 2708 RMD160 6543e749d4f6db472c25597f950cb0770d28b7af SHA1 66478c39510f4cd6c0c7e3c5216db803a813ce8f SHA256 e6e7834523f8fc85929448c2c9ad585be3c7c5fd717d217cf297f6f08484cb09 +MD5 d992ec9737c93527d8669956457be264 ChangeLog 2708 +RMD160 6543e749d4f6db472c25597f950cb0770d28b7af ChangeLog 2708 +SHA256 e6e7834523f8fc85929448c2c9ad585be3c7c5fd717d217cf297f6f08484cb09 ChangeLog 2708 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 metadata.xml 344 -MD5 daecacb946f29436b7fb3f41361328c2 files/digest-virtualbox-1.3.4-r1 271 -RMD160 8720f55536766b10c41f6e6438f31f1a6b9b2310 files/digest-virtualbox-1.3.4-r1 271 -SHA256 4a2a60b8eaa2d3cf0837947806e841464309d4c58ed73e78e08ef3ad6b0256a2 files/digest-virtualbox-1.3.4-r1 271 -MD5 daecacb946f29436b7fb3f41361328c2 files/digest-virtualbox-1.3.4-r2 271 -RMD160 8720f55536766b10c41f6e6438f31f1a6b9b2310 files/digest-virtualbox-1.3.4-r2 271 -SHA256 4a2a60b8eaa2d3cf0837947806e841464309d4c58ed73e78e08ef3ad6b0256a2 files/digest-virtualbox-1.3.4-r2 271 -MD5 aa67bc776af134860cfe42c3f12b4a0a files/digest-virtualbox-1.3.6 271 -RMD160 85814f7b06a15fdf5d1d94ca3e41bff2807cef4e files/digest-virtualbox-1.3.6 271 -SHA256 8d8ee07093a07044aad30ecda87c8aa21772a5b3f7add5a24dff79ed813ab3ab files/digest-virtualbox-1.3.6 271 +MD5 aa67bc776af134860cfe42c3f12b4a0a files/digest-virtualbox-1.3.6-r1 271 +RMD160 85814f7b06a15fdf5d1d94ca3e41bff2807cef4e files/digest-virtualbox-1.3.6-r1 271 +SHA256 8d8ee07093a07044aad30ecda87c8aa21772a5b3f7add5a24dff79ed813ab3ab files/digest-virtualbox-1.3.6-r1 271 +MD5 958c4dd1b917ce9dda529a5ca4dd19c7 files/digest-virtualbox-1.3.8 271 +RMD160 899d121d2cd6056b532a16c49f17d8d78cac2456 files/digest-virtualbox-1.3.8 271 +SHA256 40ab600643fde6adab2924343957464ddb15e89e4c5061cb72ba7e0c1b5edd61 files/digest-virtualbox-1.3.8 271 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-virtualbox-9999 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-virtualbox-9999 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-virtualbox-9999 0 diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1 deleted file mode 100644 index d3662f648fa4..000000000000 --- a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 67853add4afc2eace5d8f45cfe9a32c5 VirtualBox-OSE-1.3.4.tar.bz2 17491150 -RMD160 32bd5f5e9bbf19bf59ffa93ccf6013496b40e318 VirtualBox-OSE-1.3.4.tar.bz2 17491150 -SHA256 c7d756645c96d202b8e88924f2b4da414c6d02775d3224739b21cdda064bbeee VirtualBox-OSE-1.3.4.tar.bz2 17491150 diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r2 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r2 deleted file mode 100644 index d3662f648fa4..000000000000 --- a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 67853add4afc2eace5d8f45cfe9a32c5 VirtualBox-OSE-1.3.4.tar.bz2 17491150 -RMD160 32bd5f5e9bbf19bf59ffa93ccf6013496b40e318 VirtualBox-OSE-1.3.4.tar.bz2 17491150 -SHA256 c7d756645c96d202b8e88924f2b4da414c6d02775d3224739b21cdda064bbeee VirtualBox-OSE-1.3.4.tar.bz2 17491150 diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.6 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.6-r1 similarity index 100% rename from app-emulation/virtualbox/files/digest-virtualbox-1.3.6 rename to app-emulation/virtualbox/files/digest-virtualbox-1.3.6-r1 diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.8 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.8 new file mode 100644 index 000000000000..aaef4a5a6a5b --- /dev/null +++ b/app-emulation/virtualbox/files/digest-virtualbox-1.3.8 @@ -0,0 +1,3 @@ +MD5 c012923a084a44ed91966f8df887927f VirtualBox-OSE-1.3.8.tar.bz2 17458132 +RMD160 e832fc31773c4d2dc1ecfa7a24a68cfd190818a7 VirtualBox-OSE-1.3.8.tar.bz2 17458132 +SHA256 14d84c38932f783bfa0bfbf1a91347cc2bba6fd3d4ba60744e7a0ace4bd5cce4 VirtualBox-OSE-1.3.8.tar.bz2 17458132 diff --git a/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch new file mode 100644 index 000000000000..41da11680006 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch @@ -0,0 +1,22 @@ +--- Config.kmk.orig 2007-03-14 13:10:41.000000000 +0100 ++++ Config.kmk 2007-03-14 13:11:07.000000000 +0100 +@@ -163,7 +163,7 @@ + # Enable the ISCSI feature. + VBOX_WITH_ISCSI = 1 + # Enable ALSA support for Linux +-VBOX_WITH_ALSA = 1 ++#VBOX_WITH_ALSA = 1 + # Disable WINMM support for Windows (not implemented) + VBOX_WITH_WINMM = + # Enable the kchmviewer +--- configure.orig 2007-03-14 13:10:49.000000000 +0100 ++++ configure 2007-03-14 13:11:01.000000000 +0100 +@@ -1200,7 +1200,7 @@ + (($OSE==0)) && check_pam + [ "$OS" != "darwin" ] && check_sdl + (($OSE==0)) && check_sdl_ttf +-[ "$OS" != "darwin" ] && check_alsa ++[ "$OS" != "darwin" ] + [ "$OS" != "darwin" ] && check_x + [ "$OS" != "darwin" ] && check_xcursor + (($WITH_QT==1)) && check_qt diff --git a/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-splitted-stuff.patch b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-splitted-stuff.patch new file mode 100644 index 000000000000..5de2a32dd4d4 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-splitted-stuff.patch @@ -0,0 +1,58 @@ +--- Config.kmk.orig 2007-03-14 12:54:24.000000000 +0100 ++++ Config.kmk 2007-03-14 12:56:24.000000000 +0100 +@@ -102,7 +102,7 @@ + + # Build linux / win32 additions. + ifeq ($(BUILD_TARGET),linux) +- VBOX_WITH_LINUX_ADDITIONS = 1 ++# VBOX_WITH_LINUX_ADDITIONS = 1 + VBOX_WITH_WIN32_ADDITIONS = 1 + endif + ifeq ($(BUILD_TARGET),l4) +@@ -134,7 +134,7 @@ + VBOX_WITHOUT_IDT_PATCHING = 1 + endif + # The kernel driver/module and related runtime libraries. +-VBOX_WITH_VBOXDRV = 1 ++#VBOX_WITH_VBOXDRV = 1 + # build with secure label support + ifeq ($(filter win.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),) # too much work with freetype and all that. + VBOX_WITH_SECURELABEL = 1 +@@ -167,11 +167,11 @@ + # Disable WINMM support for Windows (not implemented) + VBOX_WITH_WINMM = + # Enable the kchmviewer +-VBOX_WITH_KCHMVIEWER = 1 ++#VBOX_WITH_KCHMVIEWER = 1 + # Build the testsuite. +-VBOX_WITH_TESTSUITE = 1 ++#VBOX_WITH_TESTSUITE = 1 + # Build the testcases. +-VBOX_WITH_TESTCASES = 1 ++#VBOX_WITH_TESTCASES = 1 + # Set this to not use COM or XPCOM in places where it can be avoided. + #VBOX_WITHOUT_COM = 1 + # Set this to skip installing the redistributable compiler runtime. +--- configure.orig 2007-03-14 12:56:30.000000000 +0100 ++++ configure 2007-03-14 13:00:47.000000000 +0100 +@@ -1161,14 +1161,14 @@ + # some things are not available in for OSE + if (($OSE)); then + cnf_append "VBOX_OSE" "1" +- cnf_append "VBOX_WITH_TESTSUITE" "" ++# cnf_append "VBOX_WITH_TESTSUITE" "" + cnf_append "VBOX_WITH_WIN32_ADDITIONS" "" + +- if [ "$OS" = "linux" ]; then +- cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1" +- else +- cnf_append "VBOX_WITH_LINUX_ADDITIONS" "" +- fi ++# if [ "$OS" = "linux" ]; then ++# cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1" ++# else ++# cnf_append "VBOX_WITH_LINUX_ADDITIONS" "" ++# fi + echo >> $CNF + fi + diff --git a/app-emulation/virtualbox/files/virtualbox-wrapper b/app-emulation/virtualbox/files/virtualbox-wrapper new file mode 100644 index 000000000000..059a7887241f --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-wrapper @@ -0,0 +1,66 @@ +#!/bin/sh + +INSTALL_DIR=/opt/VirtualBox +USER=$( whoami ) + +SERVER_PID=$( ps -U $USER | grep VBoxSVC | awk '{ print $1 }' ) + +if [ "$1" = shutdown ]; then + if [ "$SERVER_PID" != "" ]; then + kill -TERM $SERVER_PID + sleep 2 + fi + exit 0 +fi + +[ "$VBOX_USER_HOME" = "" ] && VBOX_USER_HOME="$HOME/.VirtualBox" + +mkdir -p "$VBOX_USER_HOME" +LOG="$VBOX_USER_HOME/VBoxSVC.log" + +if [[ -e /proc/modules && ! -e /dev/vboxdrv ]] ; then + echo "Error: vboxdrv kernel module is not loaded..." + echo "Please load the module before starting VirtualBox." + exit 1 +elif [ ! -w /dev/vboxdrv ]; then + if [ "`id | grep vboxusers`" = "" ]; then + echo "Error: You are not a member of the \"vboxusers\" group..." + echo "Please add yourself to this group before starting VirtualBox." + else + echo "Error: /dev/vboxdrv is not writable for some reason..." + echo "If you recently added the current user to the vboxusers group," + echo "then you have to logout and re-login to take the change effect." + fi + exit 1 +fi + +export LD_LIBRARY_PATH="$INSTALL_DIR" + +if [ "$SERVER_PID" = "" ]; then + rm -rf /tmp/.vbox-$USER-ipc + [ -f "$LOG.1" ] && mv "$LOG.1" "$LOG.2" + [ -f "$LOG.0" ] && mv "$LOG.0" "$LOG.1" + [ -f "$LOG" ] && mv "$LOG" "$LOG.0" + /opt/VirtualBox/VBoxSVC --daemonize >"$LOG" 2>&1 +fi + +APP=$( which $0 ) +APP=${APP##/*/} +case "$APP" in + virtualbox) + exec "$INSTALL_DIR/VirtualBox" "$@" + ;; + vboxmanage) + exec "$INSTALL_DIR/VBoxManage" "$@" + ;; + vboxsdl) + exec "$INSTALL_DIR/VBoxSDL" "$@" + ;; + vboxbfe) + exec "$INSTALL_DIR/VBoxBFE" "$@" + ;; + *) + echo "Error: Unknown application - $APP" + exit 1 + ;; +esac diff --git a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild deleted file mode 100644 index 1b3d576a6544..000000000000 --- a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header $ - -inherit eutils linux-mod qt3 - -MY_P=VirtualBox-OSE-${PV} -DESCRIPTION="Softwarefamily of powerful x86 virtualization" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-amd64 ~x86" -IUSE="additions sdk" - -RDEPEND="!app-emulation/virtualbox-bin - dev-libs/libIDL - >=dev-libs/libxslt-1.1.19 - dev-libs/xalan-c - dev-libs/xerces-c - media-libs/libsdl - x11-libs/libXcursor - $(qt_min_version 3.3.5) - =virtual/libstdc++-3.3" -DEPEND="${RDEPEND} - sys-devel/bin86 - sys-devel/dev86 - sys-power/iasl" -RDEPEND="${RDEPEND} - additions? ( =app-emulation/virtualbox-additions-${PV} )" - -S=${WORKDIR}/${MY_P} - -BUILD_TARGETS="all" -MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" -} - -src_compile() { - cd "${S}" - ./configure || die "configure failed" - source ./env.sh - kmk all || die "kmk failed" - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin - - insinto /opt/VirtualBox - if use sdk; then - doins -r sdk - make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - fperms 0755 /opt/VirtualBox/sdk/bin/xpidl - fi - - rm -rf sdk src tst* testcase additions vboxdrv.ko SUPInstall SUPUninstall - - doins -r * - for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl ; do - fperms 0755 /opt/VirtualBox/${each} - done - make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - make_wrapper vboxvrdp "./VBoxVRDP" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - - # udev rule for vboxdrv - dodir /etc/udev/rules.d - echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules" - - # desktop entry - insinto /usr/share/pixmaps - newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png - insinto /usr/share/applications - doins "${FILESDIR}"/${PN}.desktop -} - -pkg_preinst() { - enewgroup vboxusers -} - -pkg_postinst() { - if use amd64; then - elog "" - elog "To avoid the nmi_watchdog bug and load the vboxdrv module" - elog "you may need to update your bootloader configuration and pass the option:" - elog "nmi_watchdog=0" - fi - elog "" - elog "In order to launch VirtualBox you need to start VBoxSVC first," - elog "this can be done with:" - elog "vboxsvc --daemonize && virtualbox" - elog "" - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "The last user manual is available for download at:" - elog "http://www.virtualbox.org/download/UserManual.pdf" - elog "" -} diff --git a/app-emulation/virtualbox/virtualbox-1.3.4-r2.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r2.ebuild deleted file mode 100644 index 6fa326d53a91..000000000000 --- a/app-emulation/virtualbox/virtualbox-1.3.4-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header $ - -inherit eutils linux-mod qt3 - -MY_P=VirtualBox-OSE-${PV} -DESCRIPTION="Softwarefamily of powerful x86 virtualization" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="additions sdk vditool" - -RDEPEND="!app-emulation/virtualbox-bin - dev-libs/libIDL - >=dev-libs/libxslt-1.1.19 - dev-libs/xalan-c - dev-libs/xerces-c - media-libs/libsdl - x11-libs/libXcursor - $(qt_min_version 3.3.5) - =virtual/libstdc++-3.3" -DEPEND="${RDEPEND} - sys-devel/bin86 - sys-devel/dev86 - sys-power/iasl" -RDEPEND="${RDEPEND} - additions? ( =app-emulation/virtualbox-additions-${PV} )" - -S=${WORKDIR}/${MY_P} - -BUILD_TARGETS="all" -MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" -} - -src_compile() { - cd "${S}" - ./configure || die "configure failed" - source ./env.sh - kmk all || die "kmk failed" - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin - - insinto /opt/VirtualBox - if use sdk; then - doins -r sdk - make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - fperms 0755 /opt/VirtualBox/sdk/bin/xpidl - fi - if use vditool; then - doins vditool - make_wrapper vditool "./vditool" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - fperms 0755 /opt/VirtualBox/vditool - fi - - rm -rf sdk src tst* testcase additions vditool vboxdrv.ko xpidl SUPInstall SUPUninstall - - doins -r * - for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do - fperms 0755 /opt/VirtualBox/${each} - done - make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - make_wrapper vboxvrdp "./VBoxVRDP" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" - - # udev rule for vboxdrv - dodir /etc/udev/rules.d - echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules" - - # desktop entry - insinto /usr/share/pixmaps - newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png - insinto /usr/share/applications - doins "${FILESDIR}"/${PN}.desktop -} - -pkg_preinst() { - enewgroup vboxusers -} - -pkg_postinst() { - if use amd64; then - elog "" - elog "To avoid the nmi_watchdog bug and load the vboxdrv module" - elog "you may need to update your bootloader configuration and pass the option:" - elog "nmi_watchdog=0" - fi - elog "" - elog "In order to launch VirtualBox you need to start VBoxSVC first," - elog "this can be done with:" - elog "vboxsvc --daemonize && virtualbox" - elog "" - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "The last user manual is available for download at:" - elog "http://www.virtualbox.org/download/UserManual.pdf" - elog "" -} diff --git a/app-emulation/virtualbox/virtualbox-1.3.6.ebuild b/app-emulation/virtualbox/virtualbox-1.3.6-r1.ebuild similarity index 77% rename from app-emulation/virtualbox/virtualbox-1.3.6.ebuild rename to app-emulation/virtualbox/virtualbox-1.3.6-r1.ebuild index 93fe9e27278e..038f1efab0df 100644 --- a/app-emulation/virtualbox/virtualbox-1.3.6.ebuild +++ b/app-emulation/virtualbox/virtualbox-1.3.6-r1.ebuild @@ -12,10 +12,10 @@ SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="-amd64 ~x86" -IUSE="additions alsa sdk vboxbfe vditool wrapper" +IUSE="additions alsa nowrapper sdk vboxbfe vditool" RDEPEND="!app-emulation/virtualbox-bin - =app-emulation/virtualbox-modules-${PV} + ~app-emulation/virtualbox-modules-${PV} dev-libs/libIDL >=dev-libs/libxslt-1.1.19 dev-libs/xalan-c @@ -30,7 +30,7 @@ DEPEND="${RDEPEND} sys-power/iasl alsa? ( >=media-libs/alsa-lib-1.0.13 )" RDEPEND="${RDEPEND} - additions? ( =app-emulation/virtualbox-additions-${PV} )" + additions? ( ~app-emulation/virtualbox-additions-${PV} )" S=${WORKDIR}/${MY_P} @@ -38,7 +38,8 @@ src_unpack() { unpack ${A} cd "${S}" - # Remove Alsa checks in configure and don't build the Alsa audio driver, when Alsa is not selected + # Remove Alsa checks in configure and don't build the Alsa audio driver + # when Alsa is not selected (bug #167739) use alsa || epatch "${FILESDIR}/${P}-remove-alsa.patch" } @@ -67,10 +68,10 @@ src_install() { doins VBoxBFE fperms 0755 /opt/VirtualBox/VBoxBFE - if use wrapper ; then - dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxBFE - else + if use nowrapper ; then make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + else + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe fi fi @@ -81,17 +82,17 @@ src_install() { fperms 0755 /opt/VirtualBox/${each} done - if use wrapper ; then - exeinto /opt/VirtualBox - newexe "${FILESDIR}/${P}-wrapper" "wrapper.sh" - dosym /opt/VirtualBox/wrapper.sh /usr/bin/VirtualBox - dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxManage - dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxSDL - else + if use nowrapper ; then make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + else + exeinto /opt/VirtualBox + newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh" + dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl fi # desktop entry @@ -103,10 +104,13 @@ src_install() { pkg_postinst() { elog "" - elog "In order to launch VirtualBox you need to start VBoxSVC first, with:" - elog "vboxsvc --daemonize && virtualbox" - elog "" - elog "If you selected the useflag \"wrapper\" just type \"VirtualBox\" instead." + if use nowrapper; then + elog "In order to launch VirtualBox you need to start the" + elog "VirtualBox XPCom Server first, with:" + elog "vboxsvc --daemonize && virtualbox" + else + elog "To launch VirtualBox just type: \"virtualbox\"" + fi elog "" elog "You must be in the vboxusers group to use VirtualBox." elog "" diff --git a/app-emulation/virtualbox/virtualbox-1.3.8.ebuild b/app-emulation/virtualbox/virtualbox-1.3.8.ebuild new file mode 100644 index 000000000000..c29908f16cfc --- /dev/null +++ b/app-emulation/virtualbox/virtualbox-1.3.8.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header $ + +inherit eutils qt3 + +MY_P=VirtualBox-OSE-${PV} +DESCRIPTION="Softwarefamily of powerful x86 virtualization" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-amd64 ~x86" +IUSE="additions alsa nowrapper sdk vboxbfe vditool" + +RDEPEND="!app-emulation/virtualbox-bin + ~app-emulation/virtualbox-modules-${PV} + dev-libs/libIDL + >=dev-libs/libxslt-1.1.19 + dev-libs/xalan-c + dev-libs/xerces-c + media-libs/libsdl + x11-libs/libXcursor + $(qt_min_version 3.3.5) + =virtual/libstdc++-3.3" +DEPEND="${RDEPEND} + sys-devel/bin86 + sys-devel/dev86 + sys-power/iasl + alsa? ( >=media-libs/alsa-lib-1.0.13 )" +RDEPEND="${RDEPEND} + additions? ( ~app-emulation/virtualbox-additions-${PV} )" + +S=${WORKDIR}/vbox-ose-${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Don't build vboxdrv and additions: splitted into separate ebuilds + epatch "${FILESDIR}/${P}-remove-splitted-stuff.patch" + # Don't build the Alsa audio driver and remove Alsa checks in configure + # when Alsa is not selected (bug #167739) + use alsa || epatch "${FILESDIR}/${P}-remove-alsa.patch" +} + +src_compile() { + cd "${S}" + ./configure || die "configure failed" + source ./env.sh + kmk all || die "kmk failed" +} + +src_install() { + cd "${S}"/out/linux.${ARCH}/release/bin + + insinto /opt/VirtualBox + if use sdk; then + doins -r sdk + make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + fperms 0755 /opt/VirtualBox/sdk/bin/xpidl + fi + if use vditool; then + doins vditool + make_wrapper vditool "./vditool" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + fperms 0755 /opt/VirtualBox/vditool + fi + if use vboxbfe; then + doins VBoxBFE + fperms 0755 /opt/VirtualBox/VBoxBFE + + if use nowrapper ; then + make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + else + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe + fi + fi + + rm -rf sdk src tst* testcase VBoxBFE vditool xpidl SUPInstall SUPUninstall + + doins -r * + for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do + fperms 0755 /opt/VirtualBox/${each} + done + + if use nowrapper ; then + make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + else + exeinto /opt/VirtualBox + newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh" + dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl + fi + + # desktop entry + insinto /usr/share/pixmaps + newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png + insinto /usr/share/applications + doins "${FILESDIR}"/${PN}.desktop +} + +pkg_postinst() { + elog "" + if use nowrapper; then + elog "In order to launch VirtualBox you need to start the" + elog "VirtualBox XPCom Server first, with:" + elog "vboxsvc --daemonize && virtualbox" + else + elog "To launch VirtualBox just type: \"virtualbox\"" + fi + elog "" + elog "You must be in the vboxusers group to use VirtualBox." + elog "" + elog "The last user manual is available for download at:" + elog "http://www.virtualbox.org/download/UserManual.pdf" + elog "" +} diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild index ff39a060387c..2670318bfc8d 100644 --- a/app-emulation/virtualbox/virtualbox-9999.ebuild +++ b/app-emulation/virtualbox/virtualbox-9999.ebuild @@ -11,7 +11,7 @@ ESVN_REPO_URI="http://virtualbox.org/svn/vbox/trunk" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="additions alsa sdk vboxbfe vditool wrapper" +IUSE="additions alsa nowrapper sdk vboxbfe vditool" RDEPEND="!app-emulation/virtualbox-bin dev-libs/libIDL @@ -30,10 +30,14 @@ DEPEND="${RDEPEND} RDEPEND="${RDEPEND} additions? ( app-emulation/virtualbox-additions )" -BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" BUILD_TARGETS="all" MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)" +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" +} + src_compile() { cd "${S}" ./configure || die "configure failed" @@ -61,10 +65,11 @@ src_install() { if use vboxbfe; then doins VBoxBFE fperms 0755 /opt/VirtualBox/VBoxBFE - if use wrapper ; then - dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxBFE - else + + if use nowrapper ; then make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + else + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe fi fi @@ -75,17 +80,17 @@ src_install() { fperms 0755 /opt/VirtualBox/${each} done - if use wrapper ; then - exeinto /opt/VirtualBox - newexe "${FILESDIR}/${PN}-1.3.6-wrapper" "wrapper.sh" - dosym /opt/VirtualBox/wrapper.sh /usr/bin/VirtualBox - dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxManage - dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxSDL - else + if use nowrapper ; then make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin" + else + exeinto /opt/VirtualBox + newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh" + dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage + dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl fi # udev rule for vboxdrv @@ -104,6 +109,7 @@ pkg_preinst() { } pkg_postinst() { + linux-mod_pkg_postinst if use amd64; then elog "" elog "To avoid the nmi_watchdog bug and load the vboxdrv module" @@ -111,10 +117,13 @@ pkg_postinst() { elog "nmi_watchdog=0" fi elog "" - elog "In order to launch VirtualBox you need to start VBoxSVC first, with:" - elog "vboxsvc --daemonize && virtualbox" - elog "" - elog "If you selected the useflag \"wrapper\" just type \"VirtualBox\" instead." + if use nowrapper; then + elog "In order to launch VirtualBox you need to start the" + elog "VirtualBox XPCom Server first, with:" + elog "vboxsvc --daemonize && virtualbox" + else + elog "To launch VirtualBox just type: \"virtualbox\"" + fi elog "" elog "You must be in the vboxusers group to use VirtualBox." elog ""