summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2006-03-20 19:05:51 +0000
committerMike Auty <ikelos@gentoo.org>2006-03-20 19:05:51 +0000
commit54ffb09b8de5ca79a861c38e76e53ad5d1f15fc0 (patch)
tree737c3d0c9a448b4007ad2499d3c525ce7333c604 /app-emulation
parentFix typo with !amd64? dependency fix applied in last update. (diff)
downloadvmware-54ffb09b8de5ca79a861c38e76e53ad5d1f15fc0.tar.gz
vmware-54ffb09b8de5ca79a861c38e76e53ad5d1f15fc0.tar.bz2
vmware-54ffb09b8de5ca79a861c38e76e53ad5d1f15fc0.zip
Vmware-server-modules gcc4 patch.
Reformatting of various vmware-server-* dependencies. svn path=/trunk/; revision=11
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vmware-server-console/Manifest6
-rw-r--r--app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild39
-rw-r--r--app-emulation/vmware-server-modules/Manifest9
-rw-r--r--app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22088-makefile2.patch12
-rw-r--r--app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild1
-rw-r--r--app-emulation/vmware-server/Manifest6
-rw-r--r--app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild36
7 files changed, 63 insertions, 46 deletions
diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index 2dd20ef..722b954 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -7,6 +7,6 @@ SHA256 fa2d858dc5fb5349991ec500529a742cae6b2c9652938dad3352187c311e4842 files/di
MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 3e90e5eb45b41630ca18d55baae0cfd3 vmware-server-console-1.0.0.22088.ebuild 5193
-RMD160 0af2f1656b1bf3e2d1a77ced865fdf04ac23ab50 vmware-server-console-1.0.0.22088.ebuild 5193
-SHA256 ee0d8ac3ed8e6b3e9782d34213335a14b76ab736e5863af53eb61b849b050490 vmware-server-console-1.0.0.22088.ebuild 5193
+MD5 bf79772e43fdc14e656d1444f0b56dee vmware-server-console-1.0.0.22088.ebuild 5179
+RMD160 c0de01d6b521a755038c549b64158b10519455c9 vmware-server-console-1.0.0.22088.ebuild 5179
+SHA256 c3a54a10ae0b4c680c0809312f67640a3f708d34f83e86cbbf091a2ca89de3c8 vmware-server-console-1.0.0.22088.ebuild 5179
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
index 62790ef..53e46a5 100644
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
@@ -33,25 +33,26 @@ DEPEND=">=sys-libs/glibc-2.3.5
# precompiled binary package thats linked to glibc.
RDEPEND=">=sys-libs/glibc-2.3.5
amd64? ( app-emulation/emul-linux-x86-gtklibs )
- !amd64? ( || ( ( x11-libs/libSM
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- virtual/x11
- )
- )
- >=dev-lang/perl-5"
+ !amd64 ( || ( ( x11-libs/libSM
+ x11-libs/libICE
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXcursor
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXft
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ )
+ virtual/x11
+ )
+ )
+ >=dev-lang/perl-5
+ "
dir=/opt/vmware/server/console
Ddir=${D}/${dir}
diff --git a/app-emulation/vmware-server-modules/Manifest b/app-emulation/vmware-server-modules/Manifest
index 2024785..700f98e 100644
--- a/app-emulation/vmware-server-modules/Manifest
+++ b/app-emulation/vmware-server-modules/Manifest
@@ -4,6 +4,9 @@ SHA256 2d51fda762c6249e64277e425b65d49f414d8650056359f62d2557205ec1f54c files/di
MD5 b90ff7e76d6c548c562b6bb276ad28ae files/vmware-server-modules-1.0.0.22088-makefile.patch 343
RMD160 d2f63ede9d9dbc6ec94ccede9177a5a15a678e62 files/vmware-server-modules-1.0.0.22088-makefile.patch 343
SHA256 fadf02891dd78611790f6b59c2ba7ec5aaaa9767bbe779d97e6c3b38aaaa7b94 files/vmware-server-modules-1.0.0.22088-makefile.patch 343
-MD5 b637e9b4782d7dd3e6ec3304742ad074 vmware-server-modules-1.0.0.22088.ebuild 1445
-RMD160 11b11b620d55bfc4aac5b60dd1795673e80ab0f0 vmware-server-modules-1.0.0.22088.ebuild 1445
-SHA256 c4dbba6e70be35cc3391252c89c6d4da86370334d82e90e463c3a11094cd138a vmware-server-modules-1.0.0.22088.ebuild 1445
+MD5 adcad68386a2f83052102dc6798ec5b1 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
+RMD160 dbb5a1608a0387a0820f6e872497782c92a1fb96 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
+SHA256 41802b0831b12982b3166551ac3b6fdcce512aee7230ca1f71863511e4bbd697 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
+MD5 118743a5aa87acc28aa9a575bc12733a vmware-server-modules-1.0.0.22088.ebuild 1487
+RMD160 3d61d60adb413e8110ce3793e28366c3c514acbb vmware-server-modules-1.0.0.22088.ebuild 1487
+SHA256 afbd8dead0266a35c15e39e9395f65226dc85f24dddce7906820d1f23027bbe0 vmware-server-modules-1.0.0.22088.ebuild 1487
diff --git a/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22088-makefile2.patch b/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22088-makefile2.patch
new file mode 100644
index 0000000..2d9ec21
--- /dev/null
+++ b/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22088-makefile2.patch
@@ -0,0 +1,12 @@
+diff -uNr Makefile.kernel Makefile.kernel
+--- Makefile.kernel 2006-03-07 19:51:08.000000000 +0000
++++ Makefile.kernel 2006-03-17 13:58:14.000000000 +0000
+@@ -8,7 +8,7 @@
+
+ vm_check_build = $(shell if $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) \
+ $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default -DKBUILD_BASENAME=\"$(DRIVER)\" \
+- -Werror -S -o /dev/null -xc $(1) \
++ -Wno-unused -Wno-attributes -Werror -S -o /dev/null -xc $(1) \
+ > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi)
+
+ CC_WARNINGS := -Wall -Wstrict-prototypes
diff --git a/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild b/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
index 186de4b..b957b72 100644
--- a/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
@@ -45,6 +45,7 @@ src_unpack() {
unpack ./${PARENT_PN}-distrib/lib/modules/source/${dir}.tar
cd ${S}/${dir}-only
epatch ${FILESDIR}/${P}-makefile.patch
+ epatch ${FILESDIR}/${P}-makefile2.patch
convert_to_m ${S}/${dir}-only/Makefile
done
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index b6a42a9..901df27 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -31,6 +31,6 @@ SHA256 408be40a1e176ef2c74fae1e9cc9dcd716ece187b6b2bcf037892a4f5ae1394b files/vm
MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 dde343810f4953260e5134739d04a6c4 vmware-server-1.0.0.22088.ebuild 9277
-RMD160 5fe6ed75e9edea0e900106c679d3d6d719151ce2 vmware-server-1.0.0.22088.ebuild 9277
-SHA256 931c2f38e17d2d87416068bde10ca7a8fc7dde75e0b93248d9be7a93e60ac570 vmware-server-1.0.0.22088.ebuild 9277
+MD5 2d182d0443410c122d5ec3fd79d1b55a vmware-server-1.0.0.22088.ebuild 9259
+RMD160 754f663e73912f031d40c3a20c81c2da24ca1d6c vmware-server-1.0.0.22088.ebuild 9259
+SHA256 14780b5acf95891ebcb2a78ba4c744db272faeb527bd1cc8a6249f0f36fa6441 vmware-server-1.0.0.22088.ebuild 9259
diff --git a/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild b/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
index 9ba1968..7dd3591 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
@@ -35,24 +35,24 @@ RDEPEND=">=sys-libs/glibc-2.3.5
amd64? ( app-emulation/emul-linux-x86-baselibs
app-emulation/emul-linux-x86-gtklibs
)
- !amd64? ( || ( ( x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXinerama
- x11-libs/libXi
- x11-libs/libXft
- )
- ( virtual/x11
- virtual/xft
- )
- )
- )
- >=dev-lang/perl-5
- !app-emulation/vmware-player
- !app-emulation/vmware-workstation
- sys-apps/pciutils
- sys-apps/xinetd
- >=sys-apps/baselayout-1.11.14
- ~app-emulation/${PN}-modules-${PV}"
+ !amd64 ( || ( ( x11-libs/libXrandr
+ x11-libs/libXcursor
+ x11-libs/libXinerama
+ x11-libs/libXi
+ x11-libs/libXft
+ )
+ ( virtual/x11
+ virtual/xft
+ )
+ )
+ )
+ >=dev-lang/perl-5
+ !app-emulation/vmware-player
+ !app-emulation/vmware-workstation
+ sys-apps/pciutils
+ sys-apps/xinetd
+ >=sys-apps/baselayout-1.11.14
+ ~app-emulation/${PN}-modules-${PV}"
dir=/opt/vmware/server
Ddir=${D}/${dir}