parent
baf6d7c59f
commit
9232072b13
@ -1,16 +1,13 @@
|
||||
src/lbunzip2.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/lbunzip2.c b/src/lbunzip2.c
|
||||
index 113be47..67579ea 100644
|
||||
index 113be47..5d8a456 100644
|
||||
--- a/src/lbunzip2.c
|
||||
+++ b/src/lbunzip2.c
|
||||
@@ -1453,7 +1453,7 @@ mux(struct w2m_q *w2m_q, struct m2s_q *m2s_q, struct filespec *ispec,
|
||||
if (w2m_blk->bs100k) {
|
||||
bs100k = w2m_blk->bs100k;
|
||||
any |= (9u >= bs100k);
|
||||
- if (crc != w2m_blk->crc)
|
||||
+ if (0 && crc != w2m_blk->crc)
|
||||
log_fatal("%s: %s%s%s: stream CRC mismatch\n", pname, ispec->sep,
|
||||
ispec->fmt, ispec->sep);
|
||||
crc = 0u;
|
||||
@@ -604,7 +604,7 @@ work_decompr(struct w2w_blk *w2w_blk, struct w2m_q *w2m_q,
|
||||
w2m_blk->id.decompr_blk_id = decompr_blk_id++;
|
||||
w2m_blk->id.last_decompr = (YB_OK == ybret);
|
||||
w2m_blk->produced = sizeof w2m_blk->decompr - oleft;
|
||||
- w2m_blk->bs100k = w2w_blk->bs100k;
|
||||
+ w2m_blk->bs100k = (YB_OK == ybret) ? w2w_blk->bs100k : 0u;
|
||||
w2m_blk->crc = w2w_blk->crc;
|
||||
w2m_blk->crc1 = crc;
|
||||
w2m_blk->bs100k1 = bs100k;
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.1-r1.ebuild,v 1.1 2011/11/28 12:12:52 jlec Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.1-r2.ebuild,v 1.1 2011/12/05 19:42:45 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
@ -1,2 +0,0 @@
|
||||
DIST vmware-modules-1.0.0.25.amd64.tar.bz2 488816 RMD160 deb03d08b8cf1cad03967b3e1b0e98fc2649fd90 SHA1 00adbde24d72455837b5b81db49bc6a6390973d8 SHA256 f4c0baf981151ad3dbdbae104952983d44d83121048ecd7b88b8b34368dd05b7
|
||||
DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e058814597d4cfa2ca27 SHA1 155bccf1f27e6aecc765980443b6351e6ae15028 SHA256 ee794a0b714173a91bb523290a579306845f7af9696e5a274745d45c37f1f0e8
|
@ -1,582 +0,0 @@
|
||||
--- vmblock-only/autoconf/cachecreate.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/cachecreate.c.new 2010-02-05 23:29:47.077574422 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* All kernels before 2.6.22 take 6 arguments. All kernels since
|
||||
--- vmblock-only/autoconf/cachector.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/cachector.c.new 2010-02-05 23:32:39.086240477 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Between 2.6.23 and 2.6.24-rc1 ctor prototype was changed from
|
||||
--- vmblock-only/autoconf/cachector1.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/cachector1.c.new 2010-02-05 23:33:57.863050887 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Between 2.6.27-rc1 and 2.6.27-rc2 ctor prototype was changed from
|
||||
--- vmblock-only/autoconf/epoll.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/epoll.c.new 2010-02-05 23:34:03.782195888 +0100
|
||||
@@ -22,8 +22,12 @@
|
||||
* never had it, but some distros backported epoll patch.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
|
||||
#include <linux/poll.h>
|
||||
--- vmblock-only/autoconf/filldir1.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/filldir1.c.new 2010-02-05 23:34:09.582480900 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
|
||||
#include <linux/fs.h>
|
||||
--- vmblock-only/autoconf/geninclude.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/geninclude.c.new 2010-02-05 23:34:16.775702411 +0100
|
||||
@@ -16,7 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#ifdef CONFIG_X86_VOYAGER
|
||||
APATH/mach-voyager
|
||||
--- vmblock-only/autoconf/getsb1.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/getsb1.c.new 2010-02-05 23:34:21.727106345 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
|
||||
|
||||
--- vmblock-only/autoconf/setnice.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/setnice.c.new 2010-02-05 23:34:27.326719885 +0100
|
||||
@@ -20,8 +20,12 @@
|
||||
* set_user_nice appeared in 2.4.21. But some distros
|
||||
* backported it to older kernels.
|
||||
*/
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
|
||||
#include <linux/sched.h>
|
||||
--- vmblock-only/autoconf/statfs1.c 2009-03-27 06:34:29.000000000 +0100
|
||||
+++ vmblock-only/autoconf/statfs1.c.new 2010-02-05 23:34:34.998496715 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
|
||||
#include <linux/fs.h>
|
||||
--- vmblock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
|
||||
+++ vmblock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
|
||||
@@ -32,7 +32,12 @@
|
||||
#define INCLUDE_ALLOW_VMNIXMOD
|
||||
#include "includeCheck.h"
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
#include "compat_version.h"
|
||||
|
||||
/*
|
||||
--- vmci-only/autoconf/epoll.c 2009-03-27 06:34:31.000000000 +0100
|
||||
+++ vmci-only/autoconf/epoll.c.new 2010-02-05 23:38:31.793973380 +0100
|
||||
@@ -22,8 +22,12 @@
|
||||
* never had it, but some distros backported epoll patch.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
|
||||
#include <linux/poll.h>
|
||||
--- vmci-only/autoconf/geninclude.c 2009-03-27 06:34:31.000000000 +0100
|
||||
+++ vmci-only/autoconf/geninclude.c.new 2010-02-05 23:38:45.704327021 +0100
|
||||
@@ -16,7 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#ifdef CONFIG_X86_VOYAGER
|
||||
APATH/mach-voyager
|
||||
--- vmci-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
|
||||
+++ vmci-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
|
||||
@@ -32,7 +32,12 @@
|
||||
#define INCLUDE_ALLOW_VMNIXMOD
|
||||
#include "includeCheck.h"
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
#include "compat_version.h"
|
||||
|
||||
/*
|
||||
--- vmmon-only/autoconf/epoll.c 2010-02-05 23:39:45.361576611 +0100
|
||||
+++ vmmon-only/autoconf/epoll.c.new 2010-02-05 23:40:41.241245910 +0100
|
||||
@@ -22,8 +22,12 @@
|
||||
* never had it, but some distros backported epoll patch.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
|
||||
#include <linux/poll.h>
|
||||
--- vmmon-only/autoconf/geninclude.c 2010-02-05 23:39:45.362577852 +0100
|
||||
+++ vmmon-only/autoconf/geninclude.c.new 2010-02-05 23:40:50.833402279 +0100
|
||||
@@ -16,7 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#ifdef CONFIG_X86_VOYAGER
|
||||
APATH/mach-voyager
|
||||
--- vmmon-only/autoconf/nopage1.c 2010-02-05 23:39:45.363577625 +0100
|
||||
+++ vmmon-only/autoconf/nopage1.c.new 2010-02-05 23:40:58.674161808 +0100
|
||||
@@ -21,8 +21,12 @@
|
||||
* it uses new prototype. For 2.6.1 (and its -rc) and older do
|
||||
* compile test.
|
||||
*/
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2)
|
||||
#include <linux/mm.h>
|
||||
--- vmmon-only/autoconf/setnice.c 2010-02-05 23:39:45.363577625 +0100
|
||||
+++ vmmon-only/autoconf/setnice.c.new 2010-02-05 23:41:12.017985901 +0100
|
||||
@@ -20,8 +20,12 @@
|
||||
* set_user_nice appeared in 2.4.21. But some distros
|
||||
* backported it to older kernels.
|
||||
*/
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
|
||||
#include <linux/sched.h>
|
||||
--- vmmon-only/autoconf/smpcall.c 2010-02-05 23:39:45.364577754 +0100
|
||||
+++ vmmon-only/autoconf/smpcall.c.new 2010-02-05 23:40:25.057954672 +0100
|
||||
@@ -21,8 +21,12 @@
|
||||
* Change happened between 2.6.26 and 2.6.27-rc1.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
|
||||
# error This compile test intentionally fails.
|
||||
--- vmmon-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
|
||||
+++ vmmon-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
|
||||
@@ -32,7 +32,12 @@
|
||||
#define INCLUDE_ALLOW_VMNIXMOD
|
||||
#include "includeCheck.h"
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
#include "compat_version.h"
|
||||
|
||||
/*
|
||||
--- vmnet-only/epoll.c 2009-03-27 06:34:28.000000000 +0100
|
||||
+++ vmnet-only/epoll.c.new 2010-02-05 23:43:43.642940246 +0100
|
||||
@@ -22,8 +22,12 @@
|
||||
* never had it, but some distros backported epoll patch.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
|
||||
#include <linux/poll.h>
|
||||
--- vmnet-only/geninclude.c 2009-03-27 06:34:28.000000000 +0100
|
||||
+++ vmnet-only/geninclude.c.new 2010-02-05 23:43:52.931081128 +0100
|
||||
@@ -16,7 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#ifdef CONFIG_X86_VOYAGER
|
||||
APATH/mach-voyager
|
||||
--- vmnet-only/netdev_has_dev_net.c 2009-03-27 06:34:28.000000000 +0100
|
||||
+++ vmnet-only/netdev_has_dev_net.c.new 2010-02-05 23:44:11.315557541 +0100
|
||||
@@ -21,8 +21,12 @@
|
||||
* It appeared between 2.6.25 and 2.6.26-rc1.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
|
||||
# error This compile test intentionally fails.
|
||||
--- vmnet-only/netdev_has_net.c 2009-03-27 06:34:28.000000000 +0100
|
||||
+++ vmnet-only/netdev_has_net.c.new 2010-02-05 23:44:29.348948588 +0100
|
||||
@@ -27,8 +27,12 @@
|
||||
* as hopefully in few weeks all 2.6.24-rc1 users will be gone.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
|
||||
# error This compile test intentionally fails.
|
||||
--- vmnet-only/nfhook_uses_skb.c 2009-03-27 06:34:28.000000000 +0100
|
||||
+++ vmnet-only/nfhook_uses_skb.c.new 2010-02-05 23:44:35.228702615 +0100
|
||||
@@ -23,8 +23,12 @@
|
||||
* 2.6.24-rc1.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
|
||||
# error This compile test intentionally fails.
|
||||
--- vmnet-only/setnice.c 2009-03-27 06:34:28.000000000 +0100
|
||||
+++ vmnet-only/setnice.c.new 2010-02-05 23:44:45.613286546 +0100
|
||||
@@ -20,8 +20,12 @@
|
||||
* set_user_nice appeared in 2.4.21. But some distros
|
||||
* backported it to older kernels.
|
||||
*/
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
|
||||
#include <linux/sched.h>
|
||||
--- vmnet-only/sk_alloc.c 2009-03-27 06:34:28.000000000 +0100
|
||||
+++ vmnet-only/sk_alloc.c.new 2010-02-05 23:44:59.796490045 +0100
|
||||
@@ -21,8 +21,12 @@
|
||||
* This API change was introduced between 2.6.12-rc1 and 2.6.12-rc2.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
|
||||
#include <net/sock.h>
|
||||
--- vmnet-only/skblin.c 2009-03-27 06:34:28.000000000 +0100
|
||||
+++ vmnet-only/skblin.c.new 2010-02-05 23:45:17.276123591 +0100
|
||||
@@ -20,8 +20,12 @@
|
||||
* Detect whether skb_linearize takes one or two arguments.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
|
||||
/*
|
||||
--- vmnet-only/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
|
||||
+++ vmnet-only/driver-config.h 2010-02-03 00:13:29.608823892 +0100
|
||||
@@ -32,7 +32,12 @@
|
||||
#define INCLUDE_ALLOW_VMNIXMOD
|
||||
#include "includeCheck.h"
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
#include "compat_version.h"
|
||||
|
||||
/*
|
||||
--- vsock-only/autoconf/cachecreate.c 2009-03-27 06:34:32.000000000 +0100
|
||||
+++ vsock-only/autoconf/cachecreate.c.new 2010-02-05 23:46:29.157369452 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* All kernels before 2.6.22 take 6 arguments. All kernels since
|
||||
--- vsock-only/autoconf/epoll.c 2009-03-27 06:34:32.000000000 +0100
|
||||
+++ vsock-only/autoconf/epoll.c.new 2010-02-05 23:46:39.884406108 +0100
|
||||
@@ -22,8 +22,12 @@
|
||||
* never had it, but some distros backported epoll patch.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
|
||||
#include <linux/poll.h>
|
||||
--- vsock-only/autoconf/filldir1.c 2009-03-27 06:34:32.000000000 +0100
|
||||
+++ vsock-only/autoconf/filldir1.c.new 2010-02-05 23:46:52.692243523 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
|
||||
#include <linux/fs.h>
|
||||
--- vsock-only/autoconf/geninclude.c 2009-03-27 06:34:32.000000000 +0100
|
||||
+++ vsock-only/autoconf/geninclude.c.new 2010-02-05 23:46:58.292953391 +0100
|
||||
@@ -16,7 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#ifdef CONFIG_X86_VOYAGER
|
||||
APATH/mach-voyager
|
||||
--- vsock-only/autoconf/getsb1.c 2009-03-27 06:34:32.000000000 +0100
|
||||
+++ vsock-only/autoconf/getsb1.c.new 2010-02-05 23:47:07.516892747 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
|
||||
|
||||
--- vsock-only/autoconf/setnice.c 2009-03-27 06:34:32.000000000 +0100
|
||||
+++ vsock-only/autoconf/setnice.c.new 2010-02-05 23:47:16.829514462 +0100
|
||||
@@ -20,8 +20,12 @@
|
||||
* set_user_nice appeared in 2.4.21. But some distros
|
||||
* backported it to older kernels.
|
||||
*/
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
|
||||
#include <linux/sched.h>
|
||||
--- vsock-only/autoconf/sk_filter.c 2009-03-27 06:34:32.000000000 +0100
|
||||
+++ vsock-only/autoconf/sk_filter.c.new 2010-02-05 23:47:28.501825992 +0100
|
||||
@@ -23,8 +23,12 @@
|
||||
* This test will fail to build on kernels with the new interface.
|
||||
*/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* We'd restrict this test to 2.4.21 and earlier kernels, but Mandrake's
|
||||
--- vsock-only/autoconf/statfs1.c 2009-03-27 06:34:32.000000000 +0100
|
||||
+++ vsock-only/autoconf/statfs1.c.new 2010-02-05 23:47:41.174472911 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
*
|
||||
*********************************************************/
|
||||
|
||||
-#include <linux/autoconf.h>
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
|
||||
#include <linux/fs.h>
|
||||
--- vsock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
|
||||
+++ vsock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
|
||||
@@ -32,7 +32,12 @@
|
||||
#define INCLUDE_ALLOW_VMNIXMOD
|
||||
#include "includeCheck.h"
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
#include "compat_version.h"
|
||||
|
||||
/*
|
@ -1,72 +0,0 @@
|
||||
diff -urN old/vmblock-only/Makefile.kernel work/vmblock-only/Makefile.kernel
|
||||
--- old/vmblock-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
|
||||
+++ work/vmblock-only/Makefile.kernel 2009-08-21 16:11:34.000000000 -0400
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
INCLUDE := -I$(SRCROOT)/include
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, )
|
||||
diff -urN old/vmci-only/Makefile.kernel work/vmci-only/Makefile.kernel
|
||||
--- old/vmci-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
|
||||
+++ work/vmci-only/Makefile.kernel 2009-08-21 16:11:47.000000000 -0400
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, )
|
||||
|
||||
diff -urN old/vmmon-only/Makefile.kernel work/vmmon-only/Makefile.kernel
|
||||
--- old/vmmon-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
|
||||
+++ work/vmmon-only/Makefile.kernel 2009-08-21 16:12:48.000000000 -0400
|
||||
@@ -22,7 +22,7 @@
|
||||
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
|
||||
-I$(SRCROOT)/vmcore
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c, -DVMW_SKAS_MMAP, )
|
||||
diff -urN old/vmnet-only/Makefile.kernel work/vmnet-only/Makefile.kernel
|
||||
--- old/vmnet-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
|
||||
+++ work/vmnet-only/Makefile.kernel 2009-08-21 16:13:02.000000000 -0400
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
INCLUDE := -I$(SRCROOT)
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c, -DVMW_HAVE_EPOLL, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
|
||||
diff -urN old/vsock-only/linux/util.c work/vsock-only/linux/util.c
|
||||
--- old/vsock-only/linux/util.c 2009-08-21 16:10:32.000000000 -0400
|
||||
+++ work/vsock-only/linux/util.c 2009-08-21 16:13:27.000000000 -0400
|
||||
@@ -154,7 +154,7 @@
|
||||
goto error;
|
||||
}
|
||||
|
||||
- Log(buf);
|
||||
+ Log("%s", buf);
|
||||
|
||||
return;
|
||||
|
||||
diff -urN old/vsock-only/Makefile.kernel work/vsock-only/Makefile.kernel
|
||||
--- old/vsock-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
|
||||
+++ work/vsock-only/Makefile.kernel 2009-08-21 16:13:41.000000000 -0400
|
||||
@@ -25,7 +25,7 @@
|
||||
INCLUDE += -I$(SRCROOT)/linux
|
||||
INCLUDE += -I$(SRCROOT)/common
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
|
||||
|
@ -1,80 +0,0 @@
|
||||
diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
|
||||
index 0a9ffd6..4aa09e8 100644
|
||||
--- a/vmblock-only/Makefile
|
||||
+++ b/vmblock-only/Makefile
|
||||
@@ -29,9 +29,9 @@ SRCROOT = .
|
||||
VM_UNAME = $(shell uname -r)
|
||||
|
||||
# Header directory for the running kernel
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmblock
|
||||
PRODUCT := @PRODUCT@
|
||||
diff --git a/vmci-only/Makefile b/vmci-only/Makefile
|
||||
index 0a6c9c6..6cd0b6d 100644
|
||||
--- a/vmci-only/Makefile
|
||||
+++ b/vmci-only/Makefile
|
||||
@@ -29,9 +29,9 @@ SRCROOT = .
|
||||
VM_UNAME = $(shell uname -r)
|
||||
|
||||
# Header directory for the running kernel
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmci
|
||||
PRODUCT := @PRODUCT@
|
||||
diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
|
||||
index d26e58c..f8a40f4 100644
|
||||
--- a/vmmon-only/Makefile
|
||||
+++ b/vmmon-only/Makefile
|
||||
@@ -29,9 +29,9 @@ SRCROOT = .
|
||||
VM_UNAME = $(shell uname -r)
|
||||
|
||||
# Header directory for the running kernel
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmmon
|
||||
PRODUCT := @PRODUCT@
|
||||
diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
|
||||
index 4cabc30..568271a 100644
|
||||
--- a/vmnet-only/Makefile
|
||||
+++ b/vmnet-only/Makefile
|
||||
@@ -29,9 +29,9 @@ SRCROOT = .
|
||||
VM_UNAME = $(shell uname -r)
|
||||
|
||||
# Header directory for the running kernel
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmnet
|
||||
PRODUCT := @PRODUCT@
|
||||
diff --git a/vsock-only/Makefile b/vsock-only/Makefile
|
||||
index a69bc22..8a74856 100644
|
||||
--- a/vsock-only/Makefile
|
||||
+++ b/vsock-only/Makefile
|
||||
@@ -29,9 +29,9 @@ SRCROOT = .
|
||||
VM_UNAME = $(shell uname -r)
|
||||
|
||||
# Header directory for the running kernel
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vsock
|
||||
PRODUCT := ws
|
@ -1,87 +0,0 @@
|
||||
diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmci-only/include/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmci-only/include/compat_semaphore.h
|
||||
--- vmware-modules-1.0.0.25-r2.orig/work/vmci-only/include/compat_semaphore.h 2011-01-11 21:55:57.016999997 +0100
|
||||
+++ vmware-modules-1.0.0.25-r2/work/vmci-only/include/compat_semaphore.h 2011-01-11 21:57:39.719999997 +0100
|
||||
@@ -45,5 +45,13 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
||||
+ #ifndef DECLARE_MUTEX
|
||||
+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
|
||||
+ #endif
|
||||
+ #ifndef init_MUTEX
|
||||
+ #define init_MUTEX(_m) sema_init(_m,1)
|
||||
+ #endif
|
||||
+#endif
|
||||
|
||||
#endif /* __COMPAT_SEMAPHORE_H__ */
|
||||
diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmmon-only/include/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmmon-only/include/compat_semaphore.h
|
||||
--- vmware-modules-1.0.0.25-r2.orig/work/vmmon-only/include/compat_semaphore.h 2011-01-11 21:55:57.028999997 +0100
|
||||
+++ vmware-modules-1.0.0.25-r2/work/vmmon-only/include/compat_semaphore.h 2011-01-11 21:58:57.529999998 +0100
|
||||
@@ -45,5 +45,13 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
||||
+ #ifndef DECLARE_MUTEX
|
||||
+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
|
||||
+ #endif
|
||||
+ #ifndef init_MUTEX
|
||||
+ #define init_MUTEX(_m) sema_init(_m,1)
|
||||
+ #endif
|
||||
+#endif
|
||||
|
||||
#endif /* __COMPAT_SEMAPHORE_H__ */
|
||||
diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmnet-only/compat_semaphore.h
|
||||
--- vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/compat_semaphore.h 2011-01-11 21:55:57.022999997 +0100
|
||||
+++ vmware-modules-1.0.0.25-r2/work/vmnet-only/compat_semaphore.h 2011-01-11 21:58:23.678999996 +0100
|
||||
@@ -45,5 +45,14 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
||||
+ #ifndef DECLARE_MUTEX
|
||||
+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
|
||||
+ #endif
|
||||
+ #ifndef init_MUTEX
|
||||
+ #define init_MUTEX(_m) sema_init(_m,1)
|
||||
+ #endif
|
||||
+#endif
|
||||
+
|
||||
|
||||
#endif /* __COMPAT_SEMAPHORE_H__ */
|
||||
diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/vnetFilter.h vmware-modules-1.0.0.25-r2/work/vmnet-only/vnetFilter.h
|
||||
--- vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/vnetFilter.h 2011-01-11 21:55:57.020999997 +0100
|
||||
+++ vmware-modules-1.0.0.25-r2/work/vmnet-only/vnetFilter.h 2011-01-11 22:02:29.522999997 +0100
|
||||
@@ -203,5 +203,13 @@
|
||||
}
|
||||
#include "vmware_pack_end.h"
|
||||
VNet_SetLogLevel;
|
||||
+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
||||
+ #ifndef DECLARE_MUTEX
|
||||
+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
|
||||
+ #endif
|
||||
+ #ifndef init_MUTEX
|
||||
+ #define init_MUTEX(_m) sema_init(_m,1)
|
||||
+ #endif
|
||||
+#endif
|
||||
|
||||
#endif // ifndef _VNETFILTER_H_
|
||||
diff -ru vmware-modules-1.0.0.25-r2.orig/work/vsock-only/linux/af_vsock.h vmware-modules-1.0.0.25-r2/work/vsock-only/linux/af_vsock.h
|
||||
--- vmware-modules-1.0.0.25-r2.orig/work/vsock-only/linux/af_vsock.h 2011-01-11 21:55:57.040999997 +0100
|
||||
+++ vmware-modules-1.0.0.25-r2/work/vsock-only/linux/af_vsock.h 2011-01-11 22:03:59.066999997 +0100
|
||||
@@ -88,4 +88,14 @@
|
||||
#endif
|
||||
} VSockVmciSock;
|
||||
|
||||
+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
|
||||
+ #ifndef DECLARE_MUTEX
|
||||
+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
|
||||
+ #endif
|
||||
+ #ifndef init_MUTEX
|
||||
+ #define init_MUTEX(_m) sema_init(_m,1)
|
||||
+ #endif
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
#endif /* __AF_VSOCK_H__ */
|
@ -1,92 +0,0 @@
|
||||
--- vsock-only/linux/af_vsock.c.orig 2010-08-04 14:07:01.000000000 -0400
|
||||
+++ vsock-only/linux/af_vsock.c 2010-08-04 14:07:42.000000000 -0400
|
||||
@@ -3188,7 +3188,7 @@
|
||||
* a notification of an error.
|
||||
*/
|
||||
timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
|
||||
- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
|
||||
+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
|
||||
|
||||
while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
|
||||
if (timeout == 0) {
|
||||
@@ -3211,7 +3211,7 @@
|
||||
goto outWaitError;
|
||||
}
|
||||
|
||||
- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
|
||||
+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
|
||||
}
|
||||
|
||||
if (sk->compat_sk_err) {
|
||||
@@ -3223,7 +3223,7 @@
|
||||
}
|
||||
|
||||
outWait:
|
||||
- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
|
||||
+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
|
||||
out:
|
||||
release_sock(sk);
|
||||
return err;
|
||||
@@ -3430,7 +3430,7 @@
|
||||
|
||||
sk = sock->sk;
|
||||
|
||||
- poll_wait(file, sk->compat_sk_sleep, wait);
|
||||
+ poll_wait(file, compat_sk_sleep(sk), wait);
|
||||
mask = 0;
|
||||
|
||||
if (sk->compat_sk_err) {
|
||||
@@ -4041,7 +4041,7 @@
|
||||
* Wait for room in the produce queue to enqueue our user's data.
|
||||
*/
|
||||
timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
|
||||
- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
|
||||
+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
|
||||
|
||||
while (totalWritten < len) {
|
||||
Bool sentWrote;
|
||||
@@ -4080,7 +4080,7 @@
|
||||
goto outWait;
|
||||
}
|
||||
|
||||
- compat_cont_prepare_to_wait(sk->compat_sk_sleep,
|
||||
+ compat_cont_prepare_to_wait(compat_sk_sleep(sk),
|
||||
&wait, TASK_INTERRUPTIBLE);
|
||||
}
|
||||
|
||||
@@ -4163,7 +4163,7 @@
|
||||
if (totalWritten > 0) {
|
||||
err = totalWritten;
|
||||
}
|
||||
- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
|
||||
+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
|
||||
out:
|
||||
release_sock(sk);
|
||||
return err;
|
||||
@@ -4386,7 +4386,7 @@
|
||||
timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
|
||||
copied = 0;
|
||||
|
||||
- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
|
||||
+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
|
||||
|
||||
while ((ready = VMCIQueue_BufReady(vsk->consumeQ,
|
||||
vsk->produceQ,
|
||||
@@ -4429,7 +4429,7 @@
|
||||
goto outWait;
|
||||
}
|
||||
|
||||
- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
|
||||
+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
|
||||
}
|
||||
|
||||
if (sk->compat_sk_err) {
|
||||
@@ -4521,7 +4521,7 @@
|
||||
err = copied;
|
||||
|
||||
outWait:
|
||||
- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
|
||||
+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
|
||||
out:
|
||||
release_sock(sk);
|
||||
return err;
|
@ -1,33 +0,0 @@
|
||||
diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
|
||||
index 3cd4923..0d4f6df 100644
|
||||
--- a/vmmon-only/linux/driver.c
|
||||
+++ b/vmmon-only/linux/driver.c
|
||||
@@ -170,6 +170,7 @@ static int LinuxDriver_Open(struct inode *inode, struct file *filp);
|
||||
static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
|
||||
u_int iocmd, unsigned long ioarg);
|
||||
#if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
|
||||
+#define VMW_HAVE_UNLOCKED_IOCTL
|
||||
static long LinuxDriver_UnlockedIoctl(struct file *filp,
|
||||
u_int iocmd, unsigned long ioarg);
|
||||
#endif
|
||||
diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
|
||||
index c83628d..eb4a707 100644
|
||||
--- a/vmmon-only/linux/hostif.c
|
||||
+++ b/vmmon-only/linux/hostif.c
|
||||
@@ -3411,7 +3413,7 @@ HostIFDoIoctl(struct file *filp,
|
||||
if (filp->f_op->unlocked_ioctl) {
|
||||
return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
|
||||
}
|
||||
-#endif
|
||||
+#else
|
||||
if (filp->f_op->ioctl) {
|
||||
long err;
|
||||
|
||||
@@ -3420,6 +3422,7 @@ HostIFDoIoctl(struct file *filp,
|
||||
unlock_kernel();
|
||||
return err;
|
||||
}
|
||||
+#endif
|
||||
return -ENOIOCTLCMD;
|
||||
}
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- vmmon-only/linux/hostif.c.orig 2009-11-16 13:24:00.000000000 +0200
|
||||
+++ vmmon-only/linux/hostif.c 2009-11-16 13:08:56.000000000 +0200
|
||||
@@ -78,6 +78,8 @@
|
||||
#include "vmmonInt.h"
|
||||
#include "versioned_atomic.h"
|
||||
|
||||
+#include <asm/apic.h>
|
||||
+
|
||||
#define UPTIME_FREQ CONST64(1000000)
|
||||
|
||||
static struct {
|
||||
|
@ -1,22 +0,0 @@
|
||||
diff -ur vmci-only.before/linux/vmciKernelIf.c vmci-only/linux/vmciKernelIf.c
|
||||
--- vmci-only.before/linux/vmciKernelIf.c 2010-01-02 14:56:31.000000000 -0500
|
||||
+++ vmci-only/linux/vmciKernelIf.c 2010-01-02 14:57:01.000000000 -0500
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "compat_module.h"
|
||||
|
||||
#include "compat_version.h"
|
||||
+#include "compat_sched.h"
|
||||
#include "compat_wait.h"
|
||||
#include "compat_interrupt.h"
|
||||
#include "compat_spinlock.h"
|
||||
diff -ur vmnet-only.before/vnetUserListener.c vmnet-only/vnetUserListener.c
|
||||
--- vmnet-only.before/vnetUserListener.c 2010-01-02 14:56:38.000000000 -0500
|
||||
+++ vmnet-only/vnetUserListener.c 2010-01-02 14:58:29.000000000 -0500
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/poll.h>
|
||||
#include "compat_skbuff.h"
|
||||
+#include "compat_sched.h"
|
||||
#include "compat_wait.h"
|
||||
#include "vnetInt.h"
|
||||
|
@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r3.ebuild,v 1.4 2011/03/16 17:36:57 vadimk Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils flag-o-matic linux-mod
|
||||
|
||||
DESCRIPTION="VMware kernel modules"
|
||||
HOMEPAGE="http://www.vmware.com/"
|
||||
|
||||
SRC_URI="x86? (
|
||||
mirror://gentoo/${P}.x86.tar.bz2
|
||||
http://dev.gentoo.org/~vadimk/${P}.x86.tar.bz2
|
||||
)
|
||||
amd64? (
|
||||
mirror://gentoo/${P}.amd64.tar.bz2
|
||||
http://dev.gentoo.org/~vadimk/${P}.amd64.tar.bz2
|
||||
)"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
pkg_setup() {
|
||||
linux-mod_pkg_setup
|
||||
|
||||
VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER
|
||||
VMWARE_GROUP=${VMWARE_GROUP:-vmware}
|
||||
|
||||
VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
|
||||
VMWARE_MOD_DIR="${PN}-${PVR}"
|
||||
|
||||
BUILD_TARGETS="auto-build VMWARE_VER=${VMWARE_VER} KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
|
||||
|
||||
enewgroup "${VMWARE_GROUP}"
|
||||
filter-flags -mfpmath=sse
|
||||
|
||||
for mod in ${VMWARE_MODULE_LIST}; do
|
||||
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
|
||||
done
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
for mod in ${VMWARE_MODULE_LIST}; do
|
||||
unpack ./"${P}"/${mod}.tar
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
|
||||
epatch "${FILESDIR}/${PV}-makefile-include.patch"
|
||||
epatch "${FILESDIR}/sched_h-2.6.32.patch"
|
||||
epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
|
||||
epatch "${FILESDIR}/apic.patch"
|
||||
kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
|
||||
kernel_is ge 2 6 36 && epatch "${FILESDIR}/${PV}-unlocked_ioctl.patch"
|
||||
kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV}-sema.patch"
|
||||
|
||||
sed -i -e 's/make/$(MAKE)/g' {vmmon,vsock,vmblock,vmnet,vmci}-only/Makefile\
|
||||
|| die "Sed failed."
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# this adds udev rules for vmmon*
|
||||
if [[ -n "`echo ${VMWARE_MODULE_LIST} | grep vmmon`" ]];
|
||||
then
|
||||
dodir /etc/udev/rules.d
|
||||
echo 'KERNEL=="vmmon*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
|
||||
echo 'KERNEL=="vmnet*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
|
||||
fi
|
||||
|
||||
linux-mod_src_install
|
||||
}
|
@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r4.ebuild,v 1.2 2011/03/18 15:53:13 mr_bones_ Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils flag-o-matic linux-info linux-mod
|
||||
|
||||
DESCRIPTION="VMware kernel modules"
|
||||
HOMEPAGE="http://www.vmware.com/"
|
||||
|
||||
SRC_URI="x86? (
|
||||
mirror://gentoo/${P}.x86.tar.bz2
|
||||
http://dev.gentoo.org/~vadimk/${P}.x86.tar.bz2
|
||||
)
|
||||
amd64? (
|
||||
mirror://gentoo/${P}.amd64.tar.bz2
|
||||
http://dev.gentoo.org/~vadimk/${P}.amd64.tar.bz2
|
||||
)"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
pkg_setup() {
|
||||
if kernel_is ge 2 6 37; then
|
||||
CONFIG_CHECK="BKL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
|
||||
linux-mod_pkg_setup
|
||||
|
||||
VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER
|
||||
VMWARE_GROUP=${VMWARE_GROUP:-vmware}
|
||||
|
||||
VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
|
||||
VMWARE_MOD_DIR="${PN}-${PVR}"
|
||||
|
||||
BUILD_TARGETS="auto-build VMWARE_VER=${VMWARE_VER} KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
|
||||
|
||||
enewgroup "${VMWARE_GROUP}"
|
||||
filter-flags -mfpmath=sse
|
||||
|
||||
for mod in ${VMWARE_MODULE_LIST}; do
|
||||
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
|
||||
done
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
for mod in ${VMWARE_MODULE_LIST}; do
|
||||
unpack ./"${P}"/${mod}.tar
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
|
||||
epatch "${FILESDIR}/${PV}-makefile-include.patch"
|
||||
epatch "${FILESDIR}/sched_h-2.6.32.patch"
|
||||
epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
|
||||
epatch "${FILESDIR}/apic.patch"
|
||||
kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
|
||||
kernel_is ge 2 6 36 && epatch "${FILESDIR}/${PV}-unlocked_ioctl.patch"
|
||||
kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV}-sema.patch"
|
||||
|
||||
sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' {vmmon,vsock,vmblock,vmnet,vmci}-only/Makefile\
|
||||
|| die "Sed failed."
|
||||
}
|
||||
|
||||
src_install() {
|
||||
linux-mod_src_install
|
||||
local udevrules="${T}/60-vmware.rules"
|
||||
cat > "${udevrules}" <<-EOF
|
||||
KERNEL=="vmci", GROUP="vmware", MODE=660
|
||||
KERNEL=="vmmon", GROUP="vmware", MODE=660
|
||||
KERNEL=="vsock", GROUP="vmware", MODE=660
|
||||
EOF
|
||||
insinto /etc/udev/rules.d/
|
||||
doins "${udevrules}"
|
||||
}
|
@ -1,14 +0,0 @@
|
||||
diff --git a/vmware-player-extras.py b/vmware-player-extras.py
|
||||
index 21595b1..e8adf08 100644
|
||||
--- a/vmware-player-extras.py
|
||||
+++ b/vmware-player-extras.py
|
||||
@@ -6,7 +6,8 @@ VMware Player Extras component installer.
|
||||
|
||||
DEST = LIBDIR/'vmware'
|
||||
SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
|
||||
-CONF = DEST/'setup/vmware-config'
|
||||
+import os
|
||||
+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
|
||||
|
||||
|
||||
class PlayerExtras(Installer):
|
@ -1,64 +0,0 @@
|
||||
diff --git a/vmware-player.py b/vmware-player.py
|
||||
index bee22df..d06cca9 100644
|
||||
--- a/vmware-player.py
|
||||
+++ b/vmware-player.py
|
||||
@@ -6,7 +6,8 @@ VMware Player component installer.
|
||||
|
||||
GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
|
||||
DEST = LIBDIR/'vmware'
|
||||
-CONFIG = DEST/'setup/vmware-config'
|
||||
+import os
|
||||
+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
|
||||
CUPSLIBDIR = LIBDIR/'cups'
|
||||
# XXX: LIBDIR should be properly calculated, to make this cleaner
|
||||
if (PREFIX/'lib64/cups').exists():
|
||||
@@ -84,12 +85,12 @@ class Player(Installer):
|
||||
ret, kvers = output('uname', '-r')
|
||||
kvers = kvers.strip()
|
||||
modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
|
||||
- base = path('/lib/modules/%s/misc' % kvers)
|
||||
+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
|
||||
|
||||
for module in modules:
|
||||
for ext in ('o', 'ko'):
|
||||
mod = '%s.%s' % (module, ext)
|
||||
- (base/mod).remove(ignore_errors=True)
|
||||
+ # (base/mod).remove(ignore_errors=True)
|
||||
|
||||
def PreUninstall(self, old, new, upgrade):
|
||||
script = INITSCRIPTDIR/'vmware'
|
||||
@@ -156,8 +157,8 @@ class Player(Installer):
|
||||
def PostTransactionInstall(self, old, new, upgrade):
|
||||
if ENV.get('VMWARE_SKIP_MODULES'):
|
||||
log.info('Skipping kernel module installation')
|
||||
- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
|
||||
- log.info('Successfully installed kernel modules')
|
||||
+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
|
||||
+ # log.info('Successfully installed kernel modules')
|
||||
else:
|
||||
log.info('Unable to install kernel modules')
|
||||
|
||||
@@ -189,8 +190,8 @@ class Player(Installer):
|
||||
for handler in ('vm', 'vms'):
|
||||
for gconfType, key, value in settings:
|
||||
key = key % handler
|
||||
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
||||
- '--type', gconfType, '--set', key, value)
|
||||
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
||||
+ # '--type', gconfType, '--set', key, value)
|
||||
|
||||
# Instruct all gconfd daemons to reload.
|
||||
run('killall', '-HUP', 'gconfd-2')
|
||||
@@ -200,9 +201,9 @@ class Player(Installer):
|
||||
def _deconfigureVMStreamingHandlers(self):
|
||||
""" Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
|
||||
def deconfigureGConf():
|
||||
- for handler in ('vm', 'vms'):
|
||||
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
||||
- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
|
||||
+ # for handler in ('vm', 'vms'):
|
||||
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
||||
+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
|
||||
|
||||
# Instruct all gconfd daemons to reload.
|
||||
run('killall', '-HUP', 'gconfd-2')
|
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
MY_BASE=$(basename $1)
|
||||
if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ];
|
||||
then
|
||||
echo -n "Module Patcher: "
|
||||
patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch
|
||||
fi
|
@ -1,91 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
ORIGFILE="$1"
|
||||
|
||||
is_relative() {
|
||||
local path="$1"
|
||||
shift
|
||||
|
||||
[ "${path:0:1}" != "/" ]
|
||||
return
|
||||
}
|
||||
|
||||
set_offsets() {
|
||||
# This won't work with non-GNU stat.
|
||||
FILE_SIZE=`stat -L --format "%s" "$1"`
|
||||
local offset=$(($FILE_SIZE - 4))
|
||||
|
||||
MAGIC_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
CHECKSUM_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
VERSION_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
PREPAYLOAD_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
PREPAYLOAD_SIZE_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
LAUNCHER_SIZE_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
PAYLOAD_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
PAYLOAD_SIZE_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
}
|
||||
|
||||
set_lengths() {
|
||||
local file="$1"
|
||||
if [ ! -s "$file" ]; then
|
||||
echo "$file does not exist"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# XXX: put extraction in its own function
|
||||
MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '`
|
||||
|
||||
if [ "$MAGIC_NUMBER" != "907380241" ]; then
|
||||
echo "magic number does not match"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '`
|
||||
PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
|
||||
PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
|
||||
|
||||
SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE))
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
if is_relative "${ORIGFILE}"; then
|
||||
ORIGFILE="`pwd`/${ORIGFILE}"
|
||||
fi
|
||||
|
||||
|
||||
set_offsets ${ORIGFILE}
|
||||
set_lengths ${ORIGFILE}
|
||||
|
||||
echo "Unbundling" ${ORIGFILE}
|
||||
|
||||
PREPAYLOAD="prepayload"
|
||||
PAYLOAD="payload"
|
||||
|
||||
# Unpack the pre-payload file
|
||||
mkdir ${PREPAYLOAD}
|
||||
cd ${PREPAYLOAD}
|
||||
dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null
|
||||
cd ..
|
||||
|
||||
# Unpack the main file
|
||||
mkdir ${PAYLOAD}
|
||||
cd ${PAYLOAD}
|
||||
dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null
|
||||
cd ..
|
||||
|
@ -1,29 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
CONFIG_FILE="${D}/etc/vmware/config"
|
||||
|
||||
remove_key() {
|
||||
local key=${1}
|
||||
grep -v "^${key} =" ${CONFIG_FILE}
|
||||
grep -v "^${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp
|
||||
mv ${CONFIG_FILE}.tmp ${CONFIG_FILE}
|
||||
}
|
||||
|
||||
add_key() {
|
||||
local key=${1}
|
||||
local value=${2}
|
||||
echo "${1} = \"${2}\"" >> ${CONFIG_FILE}
|
||||
}
|
||||
|
||||
mkdir -p $(dirname ${CONFIG_FILE})
|
||||
touch ${CONFIG_FILE}
|
||||
|
||||
if [ "${1}" == "-s" ]; then
|
||||
remove_key ${2}
|
||||
add_key ${2} ${3/${D}/}
|
||||
fi
|
||||
|
||||
if [ "${1}" == "-d" ]; then
|
||||
remove_key ${2}
|
||||
fi
|
||||
|
@ -1,64 +0,0 @@
|
||||
diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
|
||||
index 7a46312..e1dbff1 100644
|
||||
--- a/payload/install/vmware-installer/vmis/__init__.py
|
||||
+++ b/payload/install/vmware-installer/vmis/__init__.py
|
||||
@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
|
||||
VERSION = '.'.join([str(x) for x in VERSION_INFO])
|
||||
MAJOR_VERSION = VERSION_INFO[0]
|
||||
|
||||
-CONFDIR = path(u'/etc/vmware')
|
||||
+CONFDIR = path(u'./vmware-confdir')
|
||||
DATABASE_PATH = CONFDIR/'database'
|
||||
diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
|
||||
index e7abc2e..81c4a2b 100644
|
||||
--- a/payload/install/vmware-installer/vmis/core/env.py
|
||||
+++ b/payload/install/vmware-installer/vmis/core/env.py
|
||||
@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
|
||||
# Python will interrept as being a module separator
|
||||
moduleName = component.name.replace('.', '')
|
||||
fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
|
||||
+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
|
||||
+ fileObj = file(pathName)
|
||||
|
||||
try:
|
||||
# XXX: db.config cannot be set at the module level because this
|
||||
diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
|
||||
index 2be10de..f92ecff 100644
|
||||
--- a/payload/install/vmware-installer/vmis/core/questions.py
|
||||
+++ b/payload/install/vmware-installer/vmis/core/questions.py
|
||||
@@ -139,6 +139,9 @@ class InitDir(Directory):
|
||||
"""
|
||||
super(InitDir, self).Validate(answer)
|
||||
|
||||
+ ### GENTOO PATCH ### Finish early
|
||||
+ return True
|
||||
+
|
||||
rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
|
||||
answer = path(answer)
|
||||
|
||||
diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
|
||||
index 525df75..abb81b3 100644
|
||||
--- a/payload/install/vmware-installer/vmis/ui/console.py
|
||||
+++ b/payload/install/vmware-installer/vmis/ui/console.py
|
||||
@@ -148,7 +148,7 @@ class Wizard(object):
|
||||
wrapper = TextWrapper()
|
||||
wrapper.width = 79
|
||||
wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
|
||||
- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
|
||||
+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
|
||||
except IOError: # RHEL4 appears to close stdin while we still expect it to be open
|
||||
pass
|
||||
|
||||
diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
|
||||
index 4f609c4..b07b89d 100644
|
||||
--- a/payload/install/vmware-installer/vmis/util/log.py
|
||||
+++ b/payload/install/vmware-installer/vmis/util/log.py
|
||||
@@ -22,6 +22,8 @@ else:
|
||||
# running a build)
|
||||
LOG_FILE = '/tmp/vmware-installer.log'
|
||||
|
||||
+LOG_FILE = './vmware-installer.log'
|
||||
+
|
||||
if level <= logging.DEBUG:
|
||||
MAX_BYTES = 0
|
||||
BACKUP_COUNT = 0
|
@ -1,174 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.5.328052.ebuild,v 1.4 2011/11/22 18:00:27 vadimk Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils versionator fdo-mime gnome2-utils
|
||||
|
||||
MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)"
|
||||
|
||||
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
|
||||
HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
|
||||
SRC_URI="
|
||||
x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle )
|
||||
amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
|
||||
"
|
||||
|
||||
LICENSE="vmware"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
IUSE=""
|
||||
RESTRICT="strip binchecks"
|
||||
|
||||
# vmware-workstation should not use virtual/libc as this is a
|
||||
# precompiled binary package thats linked to glibc.
|
||||
DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
|
||||
dev-python/lxml"
|
||||
RDEPEND="
|
||||
~app-emulation/vmware-modules-1.0.0.25
|
||||
dev-cpp/cairomm
|
||||
dev-cpp/libgnomecanvasmm
|
||||
dev-cpp/libsexymm
|
||||
dev-libs/libxml2
|
||||
sys-libs/glibc
|
||||
sys-apps/pciutils
|
||||
>=x11-libs/libview-0.6.2
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXft
|
||||
x11-libs/libXi
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXtst
|
||||
!app-emulation/vmware-workstation
|
||||
"
|
||||
|
||||
S=${WORKDIR}/vmware-distrib
|
||||
VM_INSTALL_DIR="/opt/vmware/player"
|
||||
|
||||
pkg_setup() {
|
||||
if use x86; then
|
||||
MY_P="${MY_PN}.i386"
|
||||
elif use amd64; then
|
||||
MY_P="${MY_PN}.x86_64"
|
||||
fi
|
||||
|
||||
if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
|
||||
die "Please emerge this package using a different terminal (e.g. not within screen)."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_nofetch() {
|
||||
if use x86; then
|
||||
MY_P="${MY_PN}.i386"
|
||||
elif use amd64; then
|
||||
MY_P="${MY_PN}.x86_64"
|
||||
fi
|
||||
|
||||
einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# Unbundle the bundle
|
||||
cp "${FILESDIR}"/helpers/* "${WORKDIR}"
|
||||
chmod a+x "${WORKDIR}"/*.sh
|
||||
"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Patch up the installer
|
||||
epatch "${FILESDIR}/${P}-installer.patch"
|
||||
|
||||
mkdir "${WORKDIR}/vmware-confdir"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /etc/init.d
|
||||
|
||||
#Run the installer
|
||||
local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
|
||||
local PYOPTS="-W ignore::DeprecationWarning"
|
||||
export VMWARE_SKIP_NETWORKING="true"
|
||||
python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
|
||||
--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
|
||||
--set-setting initdir "${T}" \
|
||||
--set-setting initscriptdir "${D}/etc/init.d" \
|
||||
--set-setting prefix "${D}${VM_INSTALL_DIR}" \
|
||||
--set-setting sysconfdir "${D}/etc" \
|
||||
--install-component "${INSTALLER}" \
|
||||
--install-bundle "${DISTDIR}/${MY_P}.bundle" \
|
||||
--console --required
|
||||
|
||||
rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
|
||||
|
||||
if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
|
||||
eerror "VMware installation seems to have rolled back."
|
||||
eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
|
||||
eerror "in any bug reports you file."
|
||||
die "VMware installation rolled back."
|
||||
fi
|
||||
|
||||
# Redirect all the ${D} paths to / paths"
|
||||
sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
|
||||
|
||||
# Fix up icons/mime/desktop handlers
|
||||
dodir /usr/share/
|
||||
mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
|
||||
rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
|
||||
mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
|
||||
dodir /usr/share/mime
|
||||
mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
|
||||
sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
|
||||
|
||||
# Bug 311435
|
||||
mv "${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2 \
|
||||
"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2.old
|
||||
dosym /usr/lib/libxml2.so.2 "${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2
|
||||
|
||||
# Copy across the temporary /etc/vmware directory
|
||||
dodir /etc/vmware/init.d
|
||||
cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
|
||||
mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
|
||||
sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
|
||||
newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
|
||||
touch "${D}"/etc/vmware/networking
|
||||
|
||||
# Setup the path environment
|
||||
insinto /etc/env.d
|
||||
doins "${FILESDIR}/90${PN}"
|
||||
|
||||
# Fix some paths to allow included gtk to work
|
||||
for i in "/etc/pango/pangorc" \
|
||||
"/etc/pango/pango.modules" \
|
||||
"/etc/gtk-2.0/gtk.immodules" \
|
||||
"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
|
||||
sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
|
||||
sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
|
||||
done
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
|
||||
ewarn "Before you can use vmware-player, you must configure a default network setup."
|
||||
ewarn "You can do this by running 'emerge --config ${PN}'."
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
einfo "Stopping ${product_name} for safe unmerge"
|
||||
/etc/init.d/vmware stop
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
@ -1,14 +0,0 @@
|
||||
diff --git a/vmware-player-extras.py b/vmware-player-extras.py
|
||||
index 21595b1..e8adf08 100644
|
||||
--- a/vmware-player-extras.py
|
||||
+++ b/vmware-player-extras.py
|
||||
@@ -6,7 +6,8 @@ VMware Player Extras component installer.
|
||||
|
||||
DEST = LIBDIR/'vmware'
|
||||
SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
|
||||
-CONF = DEST/'setup/vmware-config'
|
||||
+import os
|
||||
+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
|
||||
|
||||
|
||||
class PlayerExtras(Installer):
|
@ -1,64 +0,0 @@
|
||||
diff --git a/vmware-player.py b/vmware-player.py
|
||||
index bee22df..d06cca9 100644
|
||||
--- a/vmware-player.py
|
||||
+++ b/vmware-player.py
|
||||
@@ -6,7 +6,8 @@ VMware Player component installer.
|
||||
|
||||
GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
|
||||
DEST = LIBDIR/'vmware'
|
||||
-CONFIG = DEST/'setup/vmware-config'
|
||||
+import os
|
||||
+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
|
||||
CUPSLIBDIR = LIBDIR/'cups'
|
||||
# XXX: LIBDIR should be properly calculated, to make this cleaner
|
||||
if (PREFIX/'lib64/cups').exists():
|
||||
@@ -84,12 +85,12 @@ class Player(Installer):
|
||||
ret, kvers = output('uname', '-r')
|
||||
kvers = kvers.strip()
|
||||
modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
|
||||
- base = path('/lib/modules/%s/misc' % kvers)
|
||||
+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
|
||||
|
||||
for module in modules:
|
||||
for ext in ('o', 'ko'):
|
||||
mod = '%s.%s' % (module, ext)
|
||||
- (base/mod).remove(ignore_errors=True)
|
||||
+ # (base/mod).remove(ignore_errors=True)
|
||||
|
||||
def PreUninstall(self, old, new, upgrade):
|
||||
script = INITSCRIPTDIR/'vmware'
|
||||
@@ -156,8 +157,8 @@ class Player(Installer):
|
||||
def PostTransactionInstall(self, old, new, upgrade):
|
||||
if ENV.get('VMWARE_SKIP_MODULES'):
|
||||
log.info('Skipping kernel module installation')
|
||||
- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
|
||||
- log.info('Successfully installed kernel modules')
|
||||
+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
|
||||
+ # log.info('Successfully installed kernel modules')
|
||||
else:
|
||||
log.info('Unable to install kernel modules')
|
||||
|
||||
@@ -189,8 +190,8 @@ class Player(Installer):
|
||||
for handler in ('vm', 'vms'):
|
||||
for gconfType, key, value in settings:
|
||||
key = key % handler
|
||||
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
||||
- '--type', gconfType, '--set', key, value)
|
||||
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
||||
+ # '--type', gconfType, '--set', key, value)
|
||||
|
||||
# Instruct all gconfd daemons to reload.
|
||||
run('killall', '-HUP', 'gconfd-2')
|
||||
@@ -200,9 +201,9 @@ class Player(Installer):
|
||||
def _deconfigureVMStreamingHandlers(self):
|
||||
""" Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
|
||||
def deconfigureGConf():
|
||||
- for handler in ('vm', 'vms'):
|
||||
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
||||
- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
|
||||
+ # for handler in ('vm', 'vms'):
|
||||
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
||||
+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
|
||||
|
||||
# Instruct all gconfd daemons to reload.
|
||||
run('killall', '-HUP', 'gconfd-2')
|
@ -1,14 +0,0 @@
|
||||
diff --git a/vmware-vix.py b/vmware-vix.py
|
||||
index ac64dc5..8fdc2b2 100644
|
||||
--- a/vmware-vix.py
|
||||
+++ b/vmware-vix.py
|
||||
@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc. All rights reserved. -- VMware Confidential
|
||||
VIX component installer.
|
||||
"""
|
||||
DEST = LIBDIR/'vmware-vix'
|
||||
-conf = DEST/'setup/vmware-config'
|
||||
+import os
|
||||
+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
|
||||
|
||||
class VIX(Installer):
|
||||
def InitializeInstall(self, old, new, upgrade):
|
@ -1,23 +0,0 @@
|
||||
diff --git a/vmware-workstation.py b/vmware-workstation.py
|
||||
index 55476d9..8dd4c0a 100644
|
||||
--- a/vmware-workstation.py
|
||||
+++ b/vmware-workstation.py
|
||||
@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc. All rights reserved. -- VMware Confidential
|
||||
VMware Workstation component installer.
|
||||
"""
|
||||
DEST = LIBDIR/'vmware'
|
||||
-conf = DEST/'setup/vmware-config'
|
||||
+import os
|
||||
+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
|
||||
|
||||
class Workstation(Installer):
|
||||
def PreTransactionInstall(self, old, new, upgrade):
|
||||
@@ -40,7 +41,7 @@ class Workstation(Installer):
|
||||
self.AddPermission(DEST/'bin/*', BINARY)
|
||||
|
||||
eclipse = config.Get('vmware-workstation.eclipse')
|
||||
- eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
|
||||
+ False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
|
||||
Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
|
||||
|
||||
def _vmwareMountRunnable(self, vmwareMount):
|
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
MY_BASE=$(basename $1)
|
||||
if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ];
|
||||
then
|
||||
echo -n "Module Patcher: "
|
||||
patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch
|
||||
fi
|
@ -1,91 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
ORIGFILE="$1"
|
||||
|
||||
is_relative() {
|
||||
local path="$1"
|
||||
shift
|
||||
|
||||
[ "${path:0:1}" != "/" ]
|
||||
return
|
||||
}
|
||||
|
||||
set_offsets() {
|
||||
# This won't work with non-GNU stat.
|
||||
FILE_SIZE=`stat -L --format "%s" "$1"`
|
||||
local offset=$(($FILE_SIZE - 4))
|
||||
|
||||
MAGIC_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
CHECKSUM_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
VERSION_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
PREPAYLOAD_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
PREPAYLOAD_SIZE_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
LAUNCHER_SIZE_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
PAYLOAD_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
|
||||
PAYLOAD_SIZE_OFFSET=$offset
|
||||
offset=$(($offset - 4))
|
||||
}
|
||||
|
||||
set_lengths() {
|
||||
local file="$1"
|
||||
if [ ! -s "$file" ]; then
|
||||
echo "$file does not exist"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# XXX: put extraction in its own function
|
||||
MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '`
|
||||
|
||||
if [ "$MAGIC_NUMBER" != "907380241" ]; then
|
||||
echo "magic number does not match"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '`
|
||||
PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
|
||||
PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
|
||||
|
||||
SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE))
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
if is_relative "${ORIGFILE}"; then
|
||||
ORIGFILE="`pwd`/${ORIGFILE}"
|
||||
fi
|
||||
|
||||
|
||||
set_offsets ${ORIGFILE}
|
||||
set_lengths ${ORIGFILE}
|
||||
|
||||
echo "Unbundling" ${ORIGFILE}
|
||||
|
||||
PREPAYLOAD="prepayload"
|
||||
PAYLOAD="payload"
|
||||
|
||||
# Unpack the pre-payload file
|
||||
mkdir ${PREPAYLOAD}
|
||||
cd ${PREPAYLOAD}
|
||||
dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null
|
||||
cd ..
|
||||
|
||||
# Unpack the main file
|
||||
mkdir ${PAYLOAD}
|
||||
cd ${PAYLOAD}
|
||||
dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null
|
||||
cd ..
|
||||
|
@ -1,29 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
CONFIG_FILE="${D}/etc/vmware/config"
|
||||
|
||||
remove_key() {
|
||||
local key=${1}
|
||||
grep -v "^${key} =" ${CONFIG_FILE}
|
||||
grep -v "^${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp
|
||||
mv ${CONFIG_FILE}.tmp ${CONFIG_FILE}
|
||||
}
|
||||
|
||||
add_key() {
|
||||
local key=${1}
|
||||
local value=${2}
|
||||
echo "${1} = \"${2}\"" >> ${CONFIG_FILE}
|
||||
}
|
||||
|
||||
mkdir -p $(dirname ${CONFIG_FILE})
|
||||
touch ${CONFIG_FILE}
|
||||
|
||||
if [ "${1}" == "-s" ]; then
|
||||
remove_key ${2}
|
||||
add_key ${2} ${3/${D}/}
|
||||
fi
|
||||
|
||||
if [ "${1}" == "-d" ]; then
|
||||
remove_key ${2}
|
||||
fi
|
||||
|
@ -1,64 +0,0 @@
|
||||
diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
|
||||
index 7a46312..e1dbff1 100644
|
||||
--- a/payload/install/vmware-installer/vmis/__init__.py
|
||||
+++ b/payload/install/vmware-installer/vmis/__init__.py
|
||||
@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
|
||||
VERSION = '.'.join([str(x) for x in VERSION_INFO])
|
||||
MAJOR_VERSION = VERSION_INFO[0]
|
||||
|
||||
-CONFDIR = path(u'/etc/vmware')
|
||||
+CONFDIR = path(u'./vmware-confdir')
|
||||
DATABASE_PATH = CONFDIR/'database'
|
||||
diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
|
||||
index e7abc2e..81c4a2b 100644
|
||||
--- a/payload/install/vmware-installer/vmis/core/env.py
|
||||
+++ b/payload/install/vmware-installer/vmis/core/env.py
|
||||
@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
|
||||
# Python will interrept as being a module separator
|
||||
moduleName = component.name.replace('.', '')
|
||||
fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
|
||||
+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
|
||||
+ fileObj = file(pathName)
|
||||
|
||||
try:
|
||||
# XXX: db.config cannot be set at the module level because this
|
||||
diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
|
||||
index 2be10de..f92ecff 100644
|
||||
--- a/payload/install/vmware-installer/vmis/core/questions.py
|
||||
+++ b/payload/install/vmware-installer/vmis/core/questions.py
|
||||
@@ -139,6 +139,9 @@ class InitDir(Directory):
|
||||
"""
|
||||
super(InitDir, self).Validate(answer)
|
||||
|
||||
+ ### GENTOO PATCH ### Finish early
|
||||
+ return True
|
||||
+
|
||||
rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
|
||||
answer = path(answer)
|
||||
|
||||
diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
|
||||
index 525df75..abb81b3 100644
|
||||
--- a/payload/install/vmware-installer/vmis/ui/console.py
|
||||
+++ b/payload/install/vmware-installer/vmis/ui/console.py
|
||||
@@ -148,7 +148,7 @@ class Wizard(object):
|
||||
wrapper = TextWrapper()
|
||||
wrapper.width = 79
|
||||
wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
|
||||
- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
|
||||
+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
|
||||
except IOError: # RHEL4 appears to close stdin while we still expect it to be open
|
||||
pass
|
||||
|
||||
diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
|
||||
index 4f609c4..b07b89d 100644
|
||||
--- a/payload/install/vmware-installer/vmis/util/log.py
|
||||
+++ b/payload/install/vmware-installer/vmis/util/log.py
|
||||
@@ -22,6 +22,8 @@ else:
|
||||
# running a build)
|
||||
LOG_FILE = '/tmp/vmware-installer.log'
|
||||
|
||||
+LOG_FILE = './vmware-installer.log'
|
||||
+
|
||||
if level <= logging.DEBUG:
|
||||
MAX_BYTES = 0
|
||||
BACKUP_COUNT = 0
|
@ -1,174 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.5.5.328052.ebuild,v 1.5 2011/12/03 20:14:02 vadimk Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils versionator fdo-mime gnome2-utils
|
||||
|
||||
MY_PN="VMware-Workstation-$(replace_version_separator 3 - $PV)"
|
||||
|
||||
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
|
||||
HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
|
||||
DOWNLOAD_URL="http://www.vmware.com/download/ws/"
|
||||
SRC_URI="
|
||||
x86? ( ${MY_PN}.i386.bundle )
|
||||
amd64? ( ${MY_PN}.x86_64.bundle )
|
||||
"
|
||||
|
||||
LICENSE="vmware"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
IUSE=""
|
||||
RESTRICT="strip fetch binchecks"
|
||||
PROPERTIES="interactive"
|
||||
|
||||
# vmware-workstation should not use virtual/libc as this is a
|
||||
# precompiled binary package thats linked to glibc.
|
||||
DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
|
||||
dev-python/lxml"
|
||||
RDEPEND="
|
||||
~app-emulation/vmware-modules-1.0.0.25
|
||||
dev-cpp/cairomm
|
||||
dev-cpp/libgnomecanvasmm
|
||||
dev-cpp/libsexymm
|
||||
sys-apps/pciutils
|
||||
sys-fs/fuse
|
||||
sys-libs/glibc
|
||||
>=x11-libs/libview-0.6.2
|
||||
x11-libs/libgksu
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXft
|
||||
x11-libs/libXi
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXtst
|
||||
!!app-emulation/vmware-player
|
||||
"
|
||||
|
||||
S=${WORKDIR}/vmware-distrib
|
||||
VM_INSTALL_DIR="/opt/vmware/workstation"
|
||||
|
||||
pkg_setup() {
|
||||
if use x86; then
|
||||
MY_P="${MY_PN}.i386"
|
||||
elif use amd64; then
|
||||
MY_P="${MY_PN}.x86_64"
|
||||
fi
|
||||
|
||||
if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
|
||||
die "Please emerge this package using a different terminal (e.g. not within screen)."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_nofetch() {
|
||||
if use x86; then
|
||||
MY_P="${MY_PN}.i386"
|
||||
elif use amd64; then
|
||||
MY_P="${MY_PN}.x86_64"
|
||||
fi
|
||||
|
||||
einfo "Please download the ${MY_P}.bundle from"
|
||||
einfo "${DOWNLOAD_URL}"
|
||||
einfo "and place it in ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# Unbundle the bundle
|
||||
cp "${FILESDIR}"/helpers/* "${WORKDIR}"
|
||||
chmod a+x "${WORKDIR}"/*.sh
|
||||
"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Patch up the installer
|
||||
epatch "${FILESDIR}/${P}-installer.patch"
|
||||
|
||||
mkdir "${WORKDIR}/vmware-confdir"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /etc/init.d
|
||||
|
||||
#Run the installer
|
||||
local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
|
||||
local PYOPTS="-W ignore::DeprecationWarning"
|
||||
export VMWARE_SKIP_NETWORKING="true"
|
||||
python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
|
||||
--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
|
||||
--set-setting initdir "${T}" \
|
||||
--set-setting initscriptdir "${D}/etc/init.d" \
|
||||
--set-setting prefix "${D}${VM_INSTALL_DIR}" \
|
||||
--set-setting sysconfdir "${D}/etc" \
|
||||
--install-component "${INSTALLER}" \
|
||||
--install-bundle "${DISTDIR}/${MY_P}.bundle" \
|
||||
--console --required
|
||||
|
||||
rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
|
||||
|
||||
if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
|
||||
eerror "VMware installation seems to have rolled back."
|
||||
eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
|
||||
eerror "in any bug reports you file."
|
||||
die "VMware installation rolled back."
|
||||
fi
|
||||
|
||||
# Redirect all the ${D} paths to / paths"
|
||||
sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
|
||||
|
||||
# Fix up icons/mime/desktop handlers
|
||||
dodir /usr/share/
|
||||
mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
|
||||
rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
|
||||
mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
|
||||
dodir /usr/share/mime
|
||||
mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
|
||||
sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
|
||||
|
||||
# Copy across the temporary /etc/vmware directory
|
||||
dodir /etc/vmware/init.d
|
||||
cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
|
||||
mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
|
||||
sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
|
||||
newinitd "${FILESDIR}/${PN}"-6.5.rc vmware
|
||||
touch "${D}"/etc/vmware/networking
|
||||
|
||||
# Setup the path environment
|
||||
insinto /etc/env.d
|
||||
doins "${FILESDIR}/90${PN}"
|
||||
|
||||
# Fix some paths to allow included gtk to work
|
||||
for i in "/etc/pango/pangorc" \
|
||||
"/etc/pango/pango.modules" \
|
||||
"/etc/gtk-2.0/gtk.immodules" \
|
||||
"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
|
||||
sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
|
||||
sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
|
||||
done
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
|
||||
ewarn "Before you can use vmware-workstation, you must configure a default network setup."
|
||||
ewarn "You can do this by running 'emerge --config ${PN}'."
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
einfo "Stopping ${product_name} for safe unmerge"
|
||||
/etc/init.d/vmware stop
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
@ -1,2 +1,4 @@
|
||||
DIST winetricks-696 587948 RMD160 32f240a19ac29308531a1a0cf1e8fb018aca6693 SHA1 a28fb5f17aa60996f8d3ae4b9ca0745bc6d176ab SHA256 47de6401b79b92a8f334e836f2daab343338ef7b0d5027f473f4e2c1cbe9e3f0
|
||||
DIST winetricks-696.1 3469 RMD160 fcd6970b3badb9895ceec2de92de84c04d181062 SHA1 a8c45e5a33e2aee025e4527b3a9d8eebb4e4e3d4 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d
|
||||
DIST winetricks-744 599340 RMD160 a1651530aa6f8bb02ea4656f9498cff8eac66770 SHA1 ddaa5a5847bd042ee47fac2774f5a22cfcdbc1db SHA256 d63136db9e694d840a4e1b4519facbc4c64928227ea2962435bff2618b9b80fa
|
||||
DIST winetricks-744.1 3469 RMD160 fcd6970b3badb9895ceec2de92de84c04d181062 SHA1 a8c45e5a33e2aee025e4527b3a9d8eebb4e4e3d4 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d
|
||||
|
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-744.ebuild,v 1.1 2011/12/05 18:20:25 vapier Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
if [[ ${PV} == "99999999" ]] ; then
|
||||
ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
|
||||
inherit subversion
|
||||
else
|
||||
SRC_URI="http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks -> ${P}
|
||||
http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks.1 -> ${P}.1"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="easy way to install DLLs needed to work around problems in Wine"
|
||||
HOMEPAGE="http://code.google.com/p/winetricks/ http://wiki.winehq.org/winetricks"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="gtk kde"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="app-emulation/wine
|
||||
gtk? ( gnome-extra/zenity )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == "99999999" ]] ; then
|
||||
subversion_src_unpack
|
||||
else
|
||||
mkdir src
|
||||
cp "${DISTDIR}"/${P} src/${PN} || die
|
||||
cp "${DISTDIR}"/${P}.1 src/${PN}.1 || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd src
|
||||
dobin ${PN}
|
||||
doman ${PN}.1
|
||||
}
|
@ -1,5 +1,4 @@
|
||||
DIST byobu_4.40.orig.tar.gz 396156 RMD160 8b59c73c502e1f6dcf87a0836891b9a4c35dc7c6 SHA1 a96dc145214da017bb58fb2650948f0554b60ecf SHA256 ff650f3b910c285bd65bc01c272f4c88d10e354af4bd69da397b9c4ddd3b58dc
|
||||
DIST byobu_4.43.orig.tar.gz 397216 RMD160 b1172e5c84abf0bb3fc70e268933c796cf29c97c SHA1 5d06382c5abaff3c6d5a171288f0379693c6eac3 SHA256 eb2ec53c3ab0a4dc071e89ae786c7991218b2189b5e8dd9821603d4744710083
|
||||
DIST byobu_4.44.orig.tar.gz 397701 RMD160 e440899bd4ad20a72d80e4dac2ab8d34a142c62d SHA1 0407dccc9a7748439a5b29a8272c817066163ee9 SHA256 b26ad766b5f146f57b665d3884099047125fe1352fcb5a0b2b67dd93d1dc331a
|
||||
DIST byobu_4.47.orig.tar.gz 399931 RMD160 e0a5b8eb14d8d56bc0db90eaeb26045479b00c7e SHA1 8306c3c570346e84e383310d20ea7426f3940d8e SHA256 c3c2ab759a56f758c3932d9e2d5d7f7d23ed57d99b66f9d7666c4f7f614fc60b
|
||||
DIST byobu_4.48.orig.tar.gz 404879 RMD160 cf7c54a8b52679f2fd2e8ebf38854f419fb884d3 SHA1 55e01070049a82b292c39b28d5de7602188b1980 SHA256 3e5f4656ca7a01893edb25569b1c02a1400ae7b720b957e808560b8da6290a5c
|
||||
DIST byobu_4.52.orig.tar.gz 403607 RMD160 bcb16bf3254562c7ef65dd9130ea2cca97a7ba59 SHA1 220e8b91e736ac501f372f5005a20f8a94cb5558 SHA256 04ab143b484a351dac1eb2ff60aee819ba0c6b119f47e7473858619c528480b2
|
||||
|
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.40.ebuild,v 1.1 2011/10/14 23:29:34 radhermit Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
inherit python
|
||||
|
||||
DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
|
||||
HOMEPAGE="https://launchpad.net/byobu"
|
||||
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="|| ( app-misc/screen app-misc/tmux )
|
||||
dev-libs/newt"
|
||||
|
||||
src_prepare() {
|
||||
python_convert_shebangs -r 2 .
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
# Create symlinks for backends
|
||||
dosym ${PN} /usr/bin/${PN}-screen || die
|
||||
dosym ${PN} /usr/bin/${PN}-tmux || die
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.43.ebuild,v 1.1 2011/10/25 03:43:05 radhermit Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.52.ebuild,v 1.1 2011/12/05 20:58:03 radhermit Exp $
|
||||
|
||||
EAPI="4"
|
||||
PYTHON_DEPEND="2"
|
@ -1,6 +1,2 @@
|
||||
DIST cfg-update-1.8.0-r6.tar.gz 36273 RMD160 32d2ff4c78ac296b1fe671c899210ff339cfd356 SHA1 9b0ae2829cd78965d0d089d8c03505a76ad1a236 SHA256 3ddf61c9720f201422747f7d19b709f115cc39ad9ca2672fe52d9eb0abc83c0e
|
||||
DIST cfg-update-1.8.2-r1.tar.gz 164899 RMD160 d1271c5803460894246fecf0d067d819372c29f1 SHA1 61f3667a310d423b8343ecb37fd3c666adb233bd SHA256 8798a6009f7459e3c6cc3e71282389b16054f208ab8de0dd65eb4e853631a094
|
||||
DIST cfg-update-1.8.4.tgz 164558 RMD160 d905dc77da628cf89b347198eb5243a0cde481a9 SHA1 bcfe44a120db84353078394e62ec38eb20511cca SHA256 cf0017043a3ebb51cea0e8958def7a5587f8f42c30c710ca3e12605d817992e1
|
||||
DIST cfg-update-1.8.5.tgz 164597 RMD160 9cbc66a2f717b66afa4058876c347e06af2b2053 SHA1 5209e57712767f5657e11f44b796a20f509bca21 SHA256 568d405817ecad358c8225cb680d183664351368e80b780f2191e50457b17b8f
|
||||
DIST cfg-update-1.8.6.tgz 163205 RMD160 79166b523a5da6ff77aad710c87887afe0439873 SHA1 692f24eb954cf44a6b6cdc179aeb29be357dcd24 SHA256 4d973e9ac00a845b8696e0bcf2d003ac8dc1c715ac36dc7c57b8f10223c44760
|
||||
DIST cfg-update-1.8.7.tgz 163212 RMD160 2cbc70df83535dd59a4baf87205546516d97af0a SHA1 14292a0a6bb30869465a5c5e937c3c97bdf642ef SHA256 94cdb032a187e6e9e5998852afa5999d6746d7b30ae9cae7c1b68c435fe19a7d
|
||||
|
@ -1,74 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.0-r6.ebuild,v 1.9 2010/01/09 21:43:09 ssuominen Exp $
|
||||
|
||||
DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality"
|
||||
HOMEPAGE="http://people.zeelandnet.nl/xentric/"
|
||||
SRC_URI="http://people.zeelandnet.nl/xentric/${PF}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc sparc x86"
|
||||
IUSE="gnome"
|
||||
|
||||
RDEPEND="gnome? ( >=x11-misc/sux-1.0
|
||||
x11-apps/xhost
|
||||
>=dev-util/meld-0.9 )"
|
||||
|
||||
S=${WORKDIR}/${PF}
|
||||
|
||||
pkg_postrm() {
|
||||
ewarn
|
||||
ewarn "If you want to permanently remove cfg-update from your system"
|
||||
ewarn "you should manually remove the alias for emerge from /root/.bashrc"
|
||||
ewarn "followed by running: unalias emerge"
|
||||
ewarn "and remove the index file /var/lib/cfg-update/checksum.index"
|
||||
ewarn
|
||||
ewarn "If you are just updating to a newer version you should read the"
|
||||
ewarn "installation instructions on http://people.zeelandnet.nl/xentric"
|
||||
ewarn
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
cat >>cfg-update.conf <<-EOF
|
||||
|
||||
INDEXFILE = /var/lib/cfg-update/checksum.index
|
||||
EOF
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/bin
|
||||
doexe cfg-update emerge_with_indexing_for_cfg-update emerge_with_indexing_for_cfg-update_phphelper cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
|
||||
insinto /usr/lib/cfg-update
|
||||
doins cfg-update .bashrc
|
||||
dodoc ChangeLog
|
||||
doman *.8
|
||||
insinto /etc
|
||||
doins cfg-update.conf
|
||||
keepdir /var/lib/cfg-update
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
|
||||
&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
|
||||
then
|
||||
ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
|
||||
mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
|
||||
"${ROOT}"/var/lib/cfg-update/checksum.index
|
||||
eend $?
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} = / ]]
|
||||
then
|
||||
ebegin "Converting old backups to new filename format"
|
||||
cfg-update --convert-old-backups &>/dev/null
|
||||
eend $?
|
||||
ebegin "Trying to remove old emerge alias from /etc/profile"
|
||||
cfg-update --remove-old-alias &>/dev/null
|
||||
eend $?
|
||||
ewarn "Please read the installation instructions on http://people.zeelandnet.nl/xentric"
|
||||
ewarn "You need to run cfg-update --on after installation!"
|
||||
fi
|
||||
}
|
@ -1,113 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild,v 1.2 2010/07/10 22:30:03 truedfx Exp $
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality"
|
||||
HOMEPAGE="http://people.zeelandnet.nl/xentric/"
|
||||
SRC_URI="http://people.zeelandnet.nl/xentric/${P}-r1.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
|
||||
IUSE="X"
|
||||
|
||||
RDEPEND="X? ( >=x11-misc/sux-1.0
|
||||
x11-apps/xhost )"
|
||||
|
||||
S=${WORKDIR}/${P}-r1
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${P}-xxdiff-to-beediff.patch
|
||||
epatch "${FILESDIR}"/${P}-bashrc.patch
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
if [[ ${ROOT} == / ]]
|
||||
then
|
||||
ebegin "Disabling portage hook"
|
||||
cfg-update --ebuild --disable-portage-hook
|
||||
eend $?
|
||||
ebegin "Disabling paludis hook"
|
||||
cfg-update --ebuild --disable-paludis-hook
|
||||
eend $?
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
ewarn
|
||||
ewarn "If you want to permanently remove cfg-update from your system"
|
||||
ewarn "you should manually remove the alias for emerge from /root/.bashrc"
|
||||
ewarn "followed by running: unalias emerge"
|
||||
ewarn "and remove the index file /var/lib/cfg-update/checksum.index"
|
||||
ewarn
|
||||
ewarn "If you are just updating to a newer version you should read the"
|
||||
ewarn "installation instructions on http://people.zeelandnet.nl/xentric"
|
||||
ewarn
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/bin
|
||||
doexe cfg-update emerge_with_indexing_for_cfg-update emerge_with_indexing_for_cfg-update_phphelper cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
|
||||
insinto /usr/lib/cfg-update
|
||||
doins cfg-update cfg-update_indexing .bashrc test.tgz
|
||||
dodoc ChangeLog
|
||||
doman *.8
|
||||
insinto /etc
|
||||
doins cfg-update.conf
|
||||
doins cfg-update.hosts
|
||||
keepdir /var/lib/cfg-update
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
|
||||
&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
|
||||
then
|
||||
ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
|
||||
mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
|
||||
"${ROOT}"/var/lib/cfg-update/checksum.index
|
||||
eend $?
|
||||
fi
|
||||
|
||||
if [[ -e "${ROOT}"/usr/bin/paludis ]]
|
||||
then
|
||||
ewarn
|
||||
ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
|
||||
ewarn "that you have some corrupted CONTENTS files on your system..."
|
||||
ewarn
|
||||
ewarn "Please run: cfg-update --check-packages"
|
||||
ewarn
|
||||
ewarn "The above command will check all packages installed with Paludis and"
|
||||
ewarn "will output a list of packages that need to be re-installed with"
|
||||
ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
|
||||
ewarn "you risk losing your custom settings when updating configuration"
|
||||
ewarn "files, that belong to these packages, with cfg-update!"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == / ]]
|
||||
then
|
||||
ebegin "Moving backups to /var/lib/cfg-update/backups"
|
||||
/usr/bin/cfg-update --ebuild --move-backups
|
||||
eend $?
|
||||
fi
|
||||
|
||||
einfo
|
||||
einfo "If this is a first time install, please check the configuration"
|
||||
einfo "in /etc/cfg-update.conf before using cfg-update:"
|
||||
einfo
|
||||
einfo "If your system does not have an X-server installed you need to"
|
||||
einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
|
||||
einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
|
||||
einfo "beediff (default), kdiff3, meld, gtkdiff, gvimdiff, tkdiff"
|
||||
einfo
|
||||
einfo "TIP: to maximize the chances of future automatic updates, run:"
|
||||
einfo "cfg-update --optimize-backups"
|
||||
einfo
|
||||
einfo "For an example of an updating session with screenshots visit:"
|
||||
einfo "http://people.zeelandnet.nl/xentric"
|
||||
einfo
|
||||
}
|
@ -1,106 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.4.ebuild,v 1.1 2011/10/02 11:17:06 rich0 Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality"
|
||||
HOMEPAGE="https://github.com/rich0/cfg-update"
|
||||
SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
|
||||
IUSE="X"
|
||||
|
||||
RDEPEND="X? ( >=x11-misc/sux-1.0
|
||||
x11-apps/xhost )"
|
||||
|
||||
S="${WORKDIR}/rich0-cfg-update-dced21c"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
if [[ ${ROOT} == / ]]
|
||||
then
|
||||
ebegin "Disabling portage hook"
|
||||
cfg-update --ebuild --disable-portage-hook
|
||||
eend $?
|
||||
ebegin "Disabling paludis hook"
|
||||
cfg-update --ebuild --disable-paludis-hook
|
||||
eend $?
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
ewarn
|
||||
ewarn "If you want to permanently remove cfg-update from your system"
|
||||
ewarn "you should manually remove the alias for emerge from /root/.bashrc"
|
||||
ewarn "followed by running: unalias emerge"
|
||||
ewarn "and remove the index file /var/lib/cfg-update/checksum.index"
|
||||
ewarn
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/bin
|
||||
doexe cfg-update emerge_with_indexing_for_cfg-update emerge_with_indexing_for_cfg-update_phphelper cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
|
||||
insinto /usr/lib/cfg-update
|
||||
doins cfg-update cfg-update_indexing .bashrc test.tgz
|
||||
dodoc ChangeLog
|
||||
doman *.8
|
||||
insinto /etc
|
||||
doins cfg-update.conf
|
||||
doins cfg-update.hosts
|
||||
keepdir /var/lib/cfg-update
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
|
||||
&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
|
||||
then
|
||||
ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
|
||||
mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
|
||||
"${ROOT}"/var/lib/cfg-update/checksum.index
|
||||
eend $?
|
||||
fi
|
||||
|
||||
if [[ -e "${ROOT}"/usr/bin/paludis ]]
|
||||
then
|
||||
ewarn
|
||||
ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
|
||||
ewarn "that you have some corrupted CONTENTS files on your system..."
|
||||
ewarn
|
||||
ewarn "Please run: cfg-update --check-packages"
|
||||
ewarn
|
||||
ewarn "The above command will check all packages installed with Paludis and"
|
||||
ewarn "will output a list of packages that need to be re-installed with"
|
||||
ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
|
||||
ewarn "you risk losing your custom settings when updating configuration"
|
||||
ewarn "files, that belong to these packages, with cfg-update!"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == / ]]
|
||||
then
|
||||
ebegin "Moving backups to /var/lib/cfg-update/backups"
|
||||
/usr/bin/cfg-update --ebuild --move-backups
|
||||
eend $?
|
||||
fi
|
||||
|
||||
einfo
|
||||
einfo "If this is a first time install, please check the configuration"
|
||||
einfo "in /etc/cfg-update.conf before using cfg-update:"
|
||||
einfo
|
||||
einfo "If your system does not have an X-server installed you need to"
|
||||
einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
|
||||
einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
|
||||
einfo "xxdiff, beediff, kdiff3, meld (default), gtkdiff, gvimdiff, tkdiff"
|
||||
einfo
|
||||
einfo "TIP: to maximize the chances of future automatic updates, run:"
|
||||
einfo "cfg-update --optimize-backups"
|
||||
einfo
|
||||
}
|
@ -1,106 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.5.ebuild,v 1.1 2011/10/15 13:29:08 rich0 Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality"
|
||||
HOMEPAGE="https://github.com/rich0/cfg-update"
|
||||
SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
|
||||
IUSE="X"
|
||||
|
||||
RDEPEND="X? ( >=x11-misc/sux-1.0
|
||||
x11-apps/xhost )"
|
||||
|
||||
S="${WORKDIR}/rich0-cfg-update-1866ec0"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
if [[ ${ROOT} == / ]]
|
||||
then
|
||||
ebegin "Disabling portage hook"
|
||||
cfg-update --ebuild --disable-portage-hook
|
||||
eend $?
|
||||
ebegin "Disabling paludis hook"
|
||||
cfg-update --ebuild --disable-paludis-hook
|
||||
eend $?
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
ewarn
|
||||
ewarn "If you want to permanently remove cfg-update from your system"
|
||||
ewarn "you should manually remove the alias for emerge from /root/.bashrc"
|
||||
ewarn "followed by running: unalias emerge"
|
||||
ewarn "and remove the index file /var/lib/cfg-update/checksum.index"
|
||||
ewarn
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/bin
|
||||
doexe cfg-update emerge_with_indexing_for_cfg-update emerge_with_indexing_for_cfg-update_phphelper cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
|
||||
insinto /usr/lib/cfg-update
|
||||
doins cfg-update cfg-update_indexing .bashrc test.tgz
|
||||
dodoc ChangeLog
|
||||
doman *.8
|
||||
insinto /etc
|
||||
doins cfg-update.conf
|
||||
doins cfg-update.hosts
|
||||
keepdir /var/lib/cfg-update
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
|
||||
&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
|
||||
then
|
||||
ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
|
||||
mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
|
||||
"${ROOT}"/var/lib/cfg-update/checksum.index
|
||||
eend $?
|
||||
fi
|
||||
|
||||
if [[ -e "${ROOT}"/usr/bin/paludis ]]
|
||||
then
|
||||
ewarn
|
||||
ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
|
||||
ewarn "that you have some corrupted CONTENTS files on your system..."
|
||||
ewarn
|
||||
ewarn "Please run: cfg-update --check-packages"
|
||||
ewarn
|
||||
ewarn "The above command will check all packages installed with Paludis and"
|
||||
ewarn "will output a list of packages that need to be re-installed with"
|
||||
ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
|
||||
ewarn "you risk losing your custom settings when updating configuration"
|
||||
ewarn "files, that belong to these packages, with cfg-update!"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == / ]]
|
||||
then
|
||||
ebegin "Moving backups to /var/lib/cfg-update/backups"
|
||||
/usr/bin/cfg-update --ebuild --move-backups
|
||||
eend $?
|
||||
fi
|
||||
|
||||
einfo
|
||||
einfo "If this is a first time install, please check the configuration"
|
||||
einfo "in /etc/cfg-update.conf before using cfg-update:"
|
||||
einfo
|
||||
einfo "If your system does not have an X-server installed you need to"
|
||||
einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
|
||||
einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
|
||||
einfo "xxdiff, beediff, kdiff3, meld (default), gtkdiff, gvimdiff, tkdiff"
|
||||
einfo
|
||||
einfo "TIP: to maximize the chances of future automatic updates, run:"
|
||||
einfo "cfg-update --optimize-backups"
|
||||
einfo
|
||||
}
|
@ -1,106 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.6.ebuild,v 1.1 2011/10/29 12:24:01 rich0 Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality"
|
||||
HOMEPAGE="https://github.com/rich0/cfg-update"
|
||||
SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
|
||||
IUSE="X"
|
||||
|
||||
RDEPEND="X? ( >=x11-misc/sux-1.0
|
||||
x11-apps/xhost )"
|
||||
|
||||
S="${WORKDIR}/rich0-cfg-update-0239160"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
if [[ ${ROOT} == / ]]
|
||||
then
|
||||
ebegin "Disabling portage hook"
|
||||
cfg-update --ebuild --disable-portage-hook
|
||||
eend $?
|
||||
ebegin "Disabling paludis hook"
|
||||
cfg-update --ebuild --disable-paludis-hook
|
||||
eend $?
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
ewarn
|
||||
ewarn "If you want to permanently remove cfg-update from your system"
|
||||
ewarn "you should manually remove the alias for emerge from /root/.bashrc"
|
||||
ewarn "followed by running: unalias emerge"
|
||||
ewarn "and remove the index file /var/lib/cfg-update/checksum.index"
|
||||
ewarn
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/bin
|
||||
doexe cfg-update emerge_with_indexing_for_cfg-update emerge_with_indexing_for_cfg-update_phphelper cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
|
||||
insinto /usr/lib/cfg-update
|
||||
doins cfg-update cfg-update_indexing .bashrc test.tgz
|
||||
dodoc ChangeLog
|
||||
doman *.8
|
||||
insinto /etc
|
||||
doins cfg-update.conf
|
||||
doins cfg-update.hosts
|
||||
keepdir /var/lib/cfg-update
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
|
||||
&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
|
||||
then
|
||||
ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
|
||||
mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
|
||||
"${ROOT}"/var/lib/cfg-update/checksum.index
|
||||
eend $?
|
||||
fi
|
||||
|
||||
if [[ -e "${ROOT}"/usr/bin/paludis ]]
|
||||
then
|
||||
ewarn
|
||||
ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
|
||||
ewarn "that you have some corrupted CONTENTS files on your system..."
|
||||
ewarn
|
||||
ewarn "Please run: cfg-update --check-packages"
|
||||
ewarn
|
||||
ewarn "The above command will check all packages installed with Paludis and"
|
||||
ewarn "will output a list of packages that need to be re-installed with"
|
||||
ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
|
||||
ewarn "you risk losing your custom settings when updating configuration"
|
||||
ewarn "files, that belong to these packages, with cfg-update!"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == / ]]
|
||||
then
|
||||
ebegin "Moving backups to /var/lib/cfg-update/backups"
|
||||
/usr/bin/cfg-update --ebuild --move-backups
|
||||
eend $?
|
||||
fi
|
||||
|
||||
einfo
|
||||
einfo "If this is a first time install, please check the configuration"
|
||||
einfo "in /etc/cfg-update.conf before using cfg-update:"
|
||||
einfo
|
||||
einfo "If your system does not have an X-server installed you need to"
|
||||
einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
|
||||
einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
|
||||
einfo "xxdiff, beediff, kdiff3, meld (default), gtkdiff, gvimdiff, tkdiff"
|
||||
einfo
|
||||
einfo "TIP: to maximize the chances of future automatic updates, run:"
|
||||
einfo "cfg-update --optimize-backups"
|
||||
einfo
|
||||
}
|
@ -1,2 +1,2 @@
|
||||
DIST calibre-0.8.27.tar.gz 37872270 RMD160 b3bd6b0fae2fbd5c8a445cbe359553f6d958e234 SHA1 378b656c68e3776dcbf95c7db93b6e71cd6fb229 SHA256 deb44cdacb7a1a671b302b1f5949735a6224cd1fb8295dbeb92c060051f7a06f
|
||||
DIST calibre-0.8.28.tar.gz 37964835 RMD160 712440222f16a4b3d76a604879c5347a7d08c64b SHA1 bd5d10fdb5cdab3bb529b394d9a125d7a9ee32f4 SHA256 4074ef490fa4f01904112accb60d6c7eb94aa6f2cc50309f37fd9c67e5276386
|
||||
DIST calibre-0.8.29.tar.gz 38118963 RMD160 ae0e4f1a3d1b3e0230a939028e6f20d86ea136f6 SHA1 c211880d2c7e7bc9113be5e94dad24b33d5bfb5e SHA256 e41cb49da4251097a1b4d4a6b62ac192c4753bad96d127632774f034254ac580
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.27.ebuild,v 1.1 2011/11/20 06:17:49 zmedico Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.29.ebuild,v 1.1 2011/12/05 18:49:21 zmedico Exp $
|
||||
|
||||
EAPI=4
|
||||
PYTHON_DEPEND=2:2.7
|
@ -1 +1,2 @@
|
||||
DIST zathura-0.0.8.4.tar.gz 37542 RMD160 1d4161a0cc5668a18dee515204d6152ce87259f7 SHA1 5c0f02181baa555ff2e7ed0f4c68ca2a2a2a5893 SHA256 168b13b95c6689dcc3b0cc0f1758bf3877c7a81b4b8985e8c033bfbb8e35380e
|
||||
DIST zathura-0.0.8.5.tar.gz 38092 RMD160 5d8de1357124e067cf8cd37c74b21591ba8a9007 SHA1 8d65b964fc80f380cfee5ebe1a7fcbebf38cfbf7 SHA256 84751b09e00d95d7899573238666df0414cab72b3d20bd3e5e36db05e485f0b9
|
||||
|
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.0.8.5.ebuild,v 1.1 2011/12/05 22:06:01 wired Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit savedconfig toolchain-funcs eutils
|
||||
|
||||
DESCRIPTION="A highly customizable and functional PDF viewer based on poppler and GTK+"
|
||||
HOMEPAGE="http://zathura.pwmt.org/"
|
||||
SRC_URI="http://pwmt.org/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=x11-libs/cairo-1.8.8
|
||||
>=dev-libs/glib-2.22.4:2
|
||||
>=x11-libs/gtk+-2.18.6:2
|
||||
>=app-text/poppler-0.12.3[cairo]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig"
|
||||
|
||||
DOCS=( README )
|
||||
|
||||
src_prepare() {
|
||||
restore_config config.def.h
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
emake SFLAGS=""
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
save_config config.def.h
|
||||
|
||||
doman zathura.1
|
||||
domenu zathura.desktop
|
||||
}
|
@ -1 +1,2 @@
|
||||
DIST msp430-libc-20110612.tar.bz2 76622 RMD160 38702f720c551a9fefb6ca0259f7979253442b30 SHA1 4e44f4320254ecbb38e516ab9933532a19fdd5eb SHA256 4dbfc97d1ef20c3ac65b16398f6f1557ee480b9c5030bb9e94f5e718f0953271
|
||||
DIST msp430-libc-20111205.tar.bz2 95213 RMD160 90af27e19ae8bb55a16864002a8d21cf641e8309 SHA1 144b58bb1cf744ae1300662da3812c6b3b743d63 SHA256 3b409db32a3cfd872d98ffeabfa9effe1584d1ffd92fdead033d9bd7bc34360f
|
||||
|
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/msp430-libc/msp430-libc-20111205.ebuild,v 1.1 2011/12/05 22:14:11 radhermit Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
CHOST="msp430"
|
||||
CTARGET="msp430"
|
||||
|
||||
DESCRIPTION="C library for MSP430 microcontrollers"
|
||||
HOMEPAGE="http://mspgcc.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/mspgcc/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="crosscompile_opts_headers-only"
|
||||
|
||||
DEPEND="sys-devel/crossdev"
|
||||
[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
|
||||
&& RDEPEND="!dev-embedded/msp430-libc" \
|
||||
|| RDEPEND=""
|
||||
|
||||
S="${WORKDIR}/${P}/src"
|
||||
|
||||
pkg_setup() {
|
||||
ebegin "Checking for msp430-gcc"
|
||||
if type -p msp430-gcc > /dev/null ; then
|
||||
eend 0
|
||||
else
|
||||
eend 1
|
||||
|
||||
eerror
|
||||
eerror "Failed to locate 'msp430-gcc' in \$PATH. You can install a MSP430 toolchain using:"
|
||||
eerror " $ crossdev -t msp430"
|
||||
eerror
|
||||
die "MSP430 toolchain not found"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake PREFIX="${D}"/usr install
|
||||
}
|
@ -1,2 +1,3 @@
|
||||
DIST msp430mcu-20110613.tar.bz2 3014406 RMD160 234c5bea0a345c78daba9b60445ff3393b7f572d SHA1 79904ac0c1852c6846cadbb21a0cb77a47adcdcd SHA256 954abc20d3997c8b6f63abcd7c683034b26435c537c0aa086c94e13d95e1b004
|
||||
DIST msp430mcu-20111107.tar.bz2 4104438 RMD160 d06aec5c85e46c3a408ba735e2cafef28a5abfbc SHA1 3decd1753b772f9304c3db5adcfb75bea48f9a05 SHA256 9e722690abb59692911b092d79c8001b26bab1115b646349d9e4c4765b892deb
|
||||
DIST msp430mcu-20111205.tar.bz2 4101954 RMD160 07f94e7a079c0422d040e540d1c2b0998ce8dd09 SHA1 816f784f0ffc25f0340f01eda698a612d5eafa14 SHA256 a57bdac678dd943268e4ab391ed69da5ea3c823ecfda1bc232f4baad1e1193ad
|
||||
|
@ -0,0 +1,17 @@
|
||||
--- msp430mcu-20111205/scripts/install.sh.orig
|
||||
+++ msp430mcu-20111205/scripts/install.sh
|
||||
@@ -32,14 +32,3 @@
|
||||
# Install MCU-specific memory and periph maps
|
||||
cp -pr ${ANALYSIS}/ldscripts ${LIBPATH}
|
||||
chmod -R og+rX ${LIBPATH}/ldscripts
|
||||
-
|
||||
-# Install utility that tells where everything got installed
|
||||
-cat bin/msp430mcu-config.in \
|
||||
-| sed \
|
||||
- -e 's!@PREFIX@!'"${PREFIX}"'!g' \
|
||||
- -e 's!@SCRIPTPATH@!'"${LIBPATH}/ldscripts"'!g' \
|
||||
- -e 's!@INCPATH@!'"${INCPATH}"'!g' \
|
||||
- -e 's!@VERSION@!'"${VERSION}"'!g' \
|
||||
- -e 's!@UPSTREAM_VERSION@!'"${UPSTREAM_VERSION}"'!g' \
|
||||
-> ${BINPATH}/msp430mcu-config \
|
||||
-&& chmod 0755 ${BINPATH}/msp430mcu-config
|
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/msp430mcu/msp430mcu-20111205.ebuild,v 1.1 2011/12/05 22:09:01 radhermit Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="MCU-specific data for MSP430 microcontrollers"
|
||||
HOMEPAGE="http://mspgcc.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/mspgcc/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-install.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
MSP430MCU_ROOT="${S}" ./scripts/install.sh "${D}/usr"
|
||||
}
|
@ -1,2 +1,3 @@
|
||||
DIST mtl-1.1.0.2.tar.gz 18901 RMD160 e7032fc069c8b24b97725b259d2e6fb05ace208b SHA1 883deca3cdf8052173c995b741bdedccc3c91440 SHA256 a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36
|
||||
DIST mtl-1.1.1.1.tar.gz 18078 RMD160 0cc41217b4f0f127f06b8bba1fd9ae192640e66d SHA1 97f637c39c3d81fc85184add17c6c6c2d393f8d9 SHA256 a61326db190f098a95a60f1317b567d68f02999aad106cc5c98982975f5eef94
|
||||
DIST mtl-2.0.1.0.tar.gz 14124 RMD160 a8c5472ee6fd6b0ecc2a255abbf35f2269bd248c SHA1 ecb67ee33aebe5877f07c69767c6a4906e9ff024 SHA256 f36be461a0952905b60e750322b20105273f28e3fd99669f8db92240fdbfd2f0
|
||||
|
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/mtl-2.0.1.0.ebuild,v 1.1 2011/12/05 18:58:27 slyfox Exp $
|
||||
|
||||
# ebuild generated by hackport 0.2.13
|
||||
|
||||
EAPI="3"
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="Monad classes, using functional dependencies"
|
||||
HOMEPAGE="http://hackage.haskell.org/package/mtl"
|
||||
SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="=dev-haskell/transformers-0.2*
|
||||
>=dev-lang/ghc-6.8.2"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.6"
|
@ -1,3 +1,2 @@
|
||||
DIST PAR-1.002.tar.gz 90208 RMD160 d2403a33799855654fab8f38af85d6d180f03d73 SHA1 8ec29e9ce78190805aecbe7c969a96585ec8374b SHA256 b4196596979e3873a5e54ef6bb9835236dcf812ae9a0ec8cbac68559abeee5c1
|
||||
DIST PAR-1.003.tar.gz 90133 RMD160 abc74f1f9c9c1a47a2cc9eb22b40359ebbe6cfa4 SHA1 5c63f83b8735b2d320b3cb68d9bbb7e42228325d SHA256 05a676998a6556eeda78dd1b5a4b501f7350247c60eb9ecc2f5dff754411ab70
|
||||
DIST PAR-1.004.tar.gz 88034 RMD160 0af8d6c7d0023a7cbf1ba0d76b25d6045b5c02c1 SHA1 91654f0c4f8ce207fec58d8de9721b76322b8c48 SHA256 718cb3101c3668741b99e704871868a86036688b04bcfe90326f9e24a102b6bb
|
||||
DIST PAR-1.005.tar.gz 88293 RMD160 4dd6ae986d65d64ad5740fe75e5e030d1811faca SHA1 2d9c1ff3a243607374e3f9f1fb61c3d1bb4d8dc1 SHA256 c5e2aeb0380c132de251c3f4eb2fad3953967b94b2869f800956aaceab5c484f
|
||||
|
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/PAR/PAR-1.3.0.ebuild,v 1.1 2011/11/30 19:08:46 tove Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MODULE_AUTHOR=RSCHUPP
|
||||
MODULE_VERSION=1.003
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Perl Archive Toolkit"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="virtual/perl-AutoLoader
|
||||
>=virtual/perl-IO-Compress-1.30
|
||||
>=dev-perl/Archive-Zip-1.00
|
||||
>=dev-perl/PAR-Dist-0.32"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
SRC_TEST=do
|
@ -1,11 +1,11 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/PAR/PAR-1.4.0.ebuild,v 1.1 2011/12/02 14:52:25 tove Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/PAR/PAR-1.5.0.ebuild,v 1.1 2011/12/05 15:49:30 tove Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MODULE_AUTHOR=RSCHUPP
|
||||
MODULE_VERSION=1.004
|
||||
MODULE_VERSION=1.005
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Perl Archive Toolkit"
|
@ -1 +1,2 @@
|
||||
DIST WWW-Pastebin-PastebinCom-Create-0.003.tar.gz 8243 RMD160 e46e10614ba8acc071690e928a6c0f2f3a6fa823 SHA1 0b26d2ae510fed2838f7c5e3cb71b7bf5ee93a03 SHA256 0f699dceee543a42ce4bb5a804eab8b0f0095b4b35c8b348039948ef3070e877
|
||||
DIST WWW-Pastebin-PastebinCom-Create-0.004.tar.gz 8283 RMD160 e5ce17930a549740f45a7429360f69971f2a4add SHA1 bc97326f6e374e004fd684aa8acc066db7c45c20 SHA256 dd4a265a4cc77f6323036b4e1e1b72b390f941db29a1126811c4726dfa02f8b4
|
||||
|
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Pastebin-PastebinCom-Create/WWW-Pastebin-PastebinCom-Create-0.4.0.ebuild,v 1.1 2011/12/05 15:47:22 tove Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MODULE_AUTHOR=ZOFFIX
|
||||
MODULE_VERSION=0.004
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Paste to <http://pastebin.com> from Perl"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND=">=dev-perl/URI-1.35
|
||||
>=dev-perl/libwww-perl-5.807"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-Module-Build
|
||||
test? (
|
||||
virtual/perl-Test-Simple
|
||||
dev-perl/Test-Pod
|
||||
dev-perl/Test-Pod-Coverage
|
||||
)"
|
||||
|
||||
SRC_TEST="do"
|
@ -1,2 +1,3 @@
|
||||
DIST radiant-0.8.2.gem 6316544 RMD160 5df88e7eaaa43575c37aa5731cd887eed56e33af SHA1 299973067ef9076b4f32119effba36724c1cd832 SHA256 b39dd89e3fead2d6be69e115c89bc1ac0f95aa72b5d4e05f0c64665627044e13
|
||||
DIST radiant-0.9.1.gem 5289984 RMD160 7cce0e4032b5fa099df1651a45e9e2b7fca20400 SHA1 e37056ea9e5e629e15e2db66109907ff151053b9 SHA256 f288f3d00eef84531b507430d1ea8385c42b7c19c1de4eca88741c98637d7a34
|
||||
DIST radiant-1.0.0.rc3.gem 906752 RMD160 99ab90730e17111242ffe3d9bd2a63374d6c0d4f SHA1 5db5b7bf2efdd97e5b714cfbf0c150187138750d SHA256 053c603e800e819802c07f9761e7ac936e80ef28387f659e9b82b022b289d5e4
|
||||
|
@ -0,0 +1,15 @@
|
||||
Index: radiant/Gemfile
|
||||
===================================================================
|
||||
--- radiant.orig/Gemfile
|
||||
+++ radiant/Gemfile
|
||||
@@ -7,8 +7,8 @@ source :rubygems
|
||||
# requires radiant and therefore pulls in every
|
||||
# dependency mentioned in radiant.gemspec.
|
||||
#
|
||||
-gem 'rails', '2.3.14'
|
||||
-gem 'sqlite3', '1.3.4'
|
||||
+gem 'rails', '~> 2.3.14'
|
||||
+gem 'sqlite3', '~> 1.3.4'
|
||||
|
||||
# When radiant is installed as a gem you can run all of
|
||||
# its tests and specs from an instance. If you're working
|
@ -0,0 +1,61 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/radiant-1.0.0_rc3.ebuild,v 1.1 2011/12/05 20:52:44 flameeyes Exp $
|
||||
|
||||
EAPI="2"
|
||||
USE_RUBY="ruby18"
|
||||
|
||||
RUBY_FAKEGEM_VERSION=${PV/_/.}
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_TASK_TEST="spec cucumber"
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTORS.md README.md"
|
||||
|
||||
# All these files are needed because the generator expect to install them.
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG.md CONTRIBUTORS.md INSTALL.md LICENSE.md README.md Gemfile Gemfile.lock Rakefile app config db log public script vendor"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="A no-fluff, open source content management system"
|
||||
HOMEPAGE="http://radiantcms.org/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
# Testing depends on a working database and a bundled version of Rails 2.3.8
|
||||
# Needs more work later.
|
||||
RESTRICT="test"
|
||||
|
||||
#ruby_add_bdepend "test? ( dev-db/sqlite3-ruby dev-ruby/rspec dev-util/cucumber )"
|
||||
|
||||
ruby_add_rdepend ">=dev-ruby/redcloth-4.0.0
|
||||
>=dev-ruby/rack-1.1.0
|
||||
>=dev-ruby/rails-2.3.14:2.3
|
||||
>=dev-ruby/highline-1.5.1
|
||||
>=dev-ruby/radius-0.5.1
|
||||
=dev-ruby/will_paginate-2.3*
|
||||
dev-ruby/rack-cache
|
||||
>=dev-ruby/sqlite3-ruby-1.3.4
|
||||
dev-ruby/bundler"
|
||||
|
||||
# Remove code from vendor that we support as an external dependency.
|
||||
all_ruby_prepare() {
|
||||
rm -rf vendor/{highline,radius,rails,redcloth} Gemfile.lock
|
||||
|
||||
epatch "${FILESDIR}"/${P}-deps.patch
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
# we force a lock here so that it actually works without trying to
|
||||
# write in /usr as user.
|
||||
bundle install --local || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
cp config/database.sqlite.yml config/database.yml || die "Unable to provide database.yml for testing."
|
||||
${RUBY} -S rake db:migrate
|
||||
each_fakegem_test
|
||||
rm config/database.yml || die "Unable to remove testing database.yml."
|
||||
}
|
@ -1,3 +1,4 @@
|
||||
DIST sqlite3-1.3.3.gem 55808 RMD160 185b1840867de772cd33076fa1cf2990561de999 SHA1 8888ba7d755764486dd05cae7b95cf47ec2c3d0b SHA256 294f92e8eae56b45ad2416bb929046c5b8024b7f73addd80963ace5d909503be
|
||||
DIST sqlite3-1.3.4.gem 55296 RMD160 3f31b1a24001decdeed7fbe1a23648e25473833d SHA1 4dceed107d42c7baca6710bfc623a58838c6bd39 SHA256 2f16a663177a53a2f5b62a6adf59f59432081316f44670edb8576c010badf3aa
|
||||
DIST sqlite3-ruby-1.2.4.tar.bz2 80907 RMD160 5757d7ce79cb39a21c62daa19e8725a037bbd4c1 SHA1 1ff66fc2fc3e40af9e21f81377eb343fe19619b1 SHA256 4781bb0d4d0ef6d1078dfda2832af30332e2f28a316c17eb854bb7ff5ea6b0d6
|
||||
DIST sqlite3-ruby-1.3.2.gem 55808 RMD160 7203e884de200d21ae6006f26bf1b8ac48095645 SHA1 84ee78cf223b50c9a0766bf85d3ea1e700c2ca0d SHA256 9c3d4eb7c3a92bb16bfd2c804bfcd0222539cff0d050e809ec1493959738a64c
|
||||
|
@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite3-ruby/sqlite3-ruby-1.3.4.ebuild,v 1.1 2011/12/05 20:49:47 flameeyes Exp $
|
||||
|
||||
EAPI=2
|
||||
USE_RUBY="ruby18 ree18 ruby19"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="docs"
|
||||
RUBY_FAKEGEM_DOCDIR="doc faq"
|
||||
RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
|
||||
|
||||
RUBY_FAKEGEM_NAME="sqlite3"
|
||||
|
||||
inherit multilib ruby-fakegem
|
||||
|
||||
DESCRIPTION="An extension library to access a SQLite database from Ruby"
|
||||
HOMEPAGE="http://rubyforge.org/projects/sqlite-ruby/"
|
||||
LICENSE="BSD"
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=dev-db/sqlite-3*"
|
||||
DEPEND="${DEPEND}
|
||||
=dev-db/sqlite-3*"
|
||||
|
||||
ruby_add_bdepend "
|
||||
dev-ruby/rake-compiler
|
||||
dev-ruby/hoe
|
||||
test? ( virtual/ruby-test-unit )
|
||||
doc? ( dev-ruby/redcloth )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# We remove the vendor_sqlite3 rake task because it's used to
|
||||
# bundle SQlite3 which we definitely don't want.
|
||||
rm tasks/vendor_sqlite3.rake || die
|
||||
|
||||
sed -i -e 's:, HOE.spec::' -e '/task :test/d' tasks/native.rake || die
|
||||
}
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} -Cext/sqlite3 extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
# TODO: not sure what happens with jruby
|
||||
|
||||
emake -Cext/sqlite3 || die
|
||||
mv ext/sqlite3/sqlite3_native$(get_modname) lib/sqlite3/ || die
|
||||
}
|
||||
|
||||
all_ruby_compile() {
|
||||
all_fakegem_compile
|
||||
|
||||
if use doc; then
|
||||
rake faq || die "rake faq failed"
|
||||
fi
|
||||
}
|
||||
|
||||
each_ruby_install() {
|
||||
each_fakegem_install
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>tcltk</herd>
|
||||
<herd>tcltk</herd>
|
||||
</pkgmetadata>
|
||||
|
@ -1,3 +1,5 @@
|
||||
DIST pasang-emas-3.0.0.tar.bz2 2984954 RMD160 2f9ac6acdd56f239491091e65b6b1b361b9caed6 SHA1 e33c1149a3477b7604db9c1dfb50065f2ad4acb8 SHA256 f2f4f07a2cee099e8204a3721405d6af59c18d23c6ff0792fe9eb244a08b04b9
|
||||
DIST pasang-emas-3.1.0.tar.bz2 3030528 RMD160 fb58023b466e7c991d0e8fe4477feb6bcba0ae75 SHA1 36c03b9224937f575dcfaf136372a3de532aa5b0 SHA256 a36b63adb496dbe343adac2063164fa1377e2295b0bc78f3dd293f8d946acfe5
|
||||
DIST pasang-emas-themes-1.0.tar.bz2 1190560 RMD160 739f3c1b8dd0268c4d5c57eb426d6b64831dbd91 SHA1 cbf95e6548a77d34c699ce203eef1aa1407072ee SHA256 5be65e641a81109794300b1dda4f78dcbf7287747aaa5b2a0fcadfe2991affe9
|
||||
DIST pet-fragrance.tar.bz2 1019437 RMD160 ac2dae77600249afc04930146ba7118accda0b1a SHA1 aa7f9c62f83cdd0ac55ce2d5f081f8201291535e SHA256 3656277c8ef526f7b668f97567a772a2c2107dc7d46ef02a11d357e5e96b3f46
|
||||
DIST pet-marble.tar.bz2 631999 RMD160 7cf392378babaa5f4c08d49b7f04b3849f8449c1 SHA1 b17aa2d027823c88370f6a6616db37f05b8f2960 SHA256 221cd4d4030e12d5e51c2f17f26f38ed81aafcad3bbafb07c85f4ebd88f393ce
|
||||
|
@ -0,0 +1,37 @@
|
||||
--- pasang-emas-2.1.0-orig/src/Makefile.in
|
||||
+++ pasang-emas-2.1.0/src/Makefile.in
|
||||
@@ -196,7 +196,7 @@
|
||||
INCLUDES = $(DEPS_CFLAGS) \
|
||||
--include ../config.h \
|
||||
-DLOCALEDIR=\"$(localedir)\" \
|
||||
- -DPIXMAPSDIR=\"$(datadir)/pixmaps\" \
|
||||
+ -DPIXMAPSDIR=\"/usr/share/pixmaps\" \
|
||||
-DDATADIR=\"$(datadir)\" \
|
||||
-DTHEME_ROOT_DIR=\"$(datadir)/$(PACKAGE_TARNAME)/themes\" \
|
||||
-DUSER_THEME_ROOT_DIR=\".$(PACKAGE_TARNAME)/themes\" \
|
||||
--- pasang-emas-2.1.0-orig/data/Makefile.in
|
||||
+++ pasang-emas-2.1.0/data/Makefile.in
|
||||
@@ -229,10 +229,10 @@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
SUBDIRS = kayu
|
||||
-desktopdir = $(datadir)/applications
|
||||
+desktopdir = /usr/share/applications
|
||||
desktop_in_files = pasang-emas.desktop.in
|
||||
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
||||
-appicondir = $(datadir)/pixmaps
|
||||
+appicondir = /usr/share/pixmaps
|
||||
appicon_DATA = \
|
||||
pasang-emas.png \
|
||||
pasang-emas-flash.png
|
||||
--- pasang-emas-2.1.0-orig/po/Makefile.in.in
|
||||
+++ pasang-emas-2.1.0/po/Makefile.in.in
|
||||
@@ -34,7 +34,7 @@
|
||||
datarootdir = @datarootdir@
|
||||
libdir = @libdir@
|
||||
DATADIRNAME = @DATADIRNAME@
|
||||
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
|
||||
+itlocaledir = /usr/share/locale
|
||||
subdir = po
|
||||
install_sh = @install_sh@
|
||||
# Automake >= 1.8 provides @mkdir_p@.
|
@ -0,0 +1,56 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-board/pasang-emas/pasang-emas-3.1.0.ebuild,v 1.2 2011/12/05 17:50:05 mr_bones_ Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit eutils games
|
||||
|
||||
DESCRIPTION="A traditional game of Brunei"
|
||||
HOMEPAGE="http://pasang-emas.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
|
||||
extras? ( mirror://sourceforge/${PN}/pasang-emas-themes-1.0.tar.bz2
|
||||
mirror://sourceforge/${PN}/pet-marble.tar.bz2
|
||||
mirror://sourceforge/${PN}/pet-fragrance.tar.bz2 )"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="extras nls"
|
||||
|
||||
RDEPEND="app-text/gnome-doc-utils
|
||||
>=x11-libs/gtk+-2.18.2:2
|
||||
virtual/libintl
|
||||
app-text/scrollkeeper"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-build.patch
|
||||
sed -i \
|
||||
-e '/Encoding/d' \
|
||||
-e '/Icon/s:\.png::' \
|
||||
data/pasang-emas.desktop.in \
|
||||
|| die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
egamesconf \
|
||||
--disable-dependency-tracking \
|
||||
--localedir=/usr/share/locale \
|
||||
--with-omf-dir=/usr/share/omf \
|
||||
--with-help-dir=/usr/share/gnome/help \
|
||||
$(use_enable nls)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
if use extras; then
|
||||
insinto "${GAMES_DATADIR}/${PN}"/themes
|
||||
doins -r \
|
||||
"${WORKDIR}"/marble \
|
||||
"${WORKDIR}"/pasang-emas-themes-1.0/{conteng,kaca} \
|
||||
"${WORKDIR}"/fragrance || die
|
||||
fi
|
||||
use nls || rm -rf "${D}"usr/share/locale
|
||||
prepgamesdirs
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
DIST audacious-plugins-2.4.4.tgz 3425914 RMD160 d8ec95fb678efcb9acd17e77b890d4c685c2b892 SHA1 33a43cdcb699578accbc181918b96da6ab04cedc SHA256 24948ae2161ddde580bcad27dbc11faed0cacd142252749e64da5f8f5e8084e4
|
||||
DIST audacious-plugins-2.5.4.tar.gz 3500309 RMD160 a2cf4b9407492758c7ee9b858c7c75b9d906c524 SHA1 8aedcc58c3b5a9415345374014d809ccb9a7541a SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8
|
||||
DIST audacious-plugins-3.0.3.tar.bz2 2176767 RMD160 faa39df5bcd13e1134a97355c30422f6259af5e2 SHA1 12807cff9235bde8348d90d2fa9968855850ab36 SHA256 fe4620895b72c0e829b69105ef819c708ceb2c2ceb01b5438a50496dce62772e
|
||||
DIST audacious-plugins-3.1.1.tar.bz2 2167856 RMD160 8c0fca652b08884809271afb401990cda7c24eaf SHA1 49cdae9eedd99cfc2ce7455498ee2ec6c9ff6f20 SHA256 dd85e982a49a2794041a391aba3d12a12505338b2c9623b60f16842ae89215ad
|
||||
DIST audacious-plugins-3.1.tar.bz2 2156993 RMD160 b62f8724a7babb53d4e2d70fb91edda0e42f82d7 SHA1 0c89d5a74bb562c38be36d38537d15c3374feb76 SHA256 2d1e9b229b83e4ab2a2065e7116d0d36e774d73146d2cb63162ca880770d7ca8
|
||||
|
@ -0,0 +1,115 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild,v 1.1 2011/12/05 22:47:41 chainsaw Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils flag-o-matic
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
|
||||
HOMEPAGE="http://audacious-media-player.org/"
|
||||
SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
|
||||
IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
|
||||
lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile sse2 vorbis wavpack"
|
||||
|
||||
RDEPEND="app-arch/unzip
|
||||
>=dev-libs/dbus-glib-0.60
|
||||
dev-libs/libxml2:2
|
||||
media-libs/libmodplug
|
||||
>=media-sound/audacious-3.1.1
|
||||
>=net-libs/neon-0.26.4
|
||||
x11-libs/gtk+:3
|
||||
aac? ( >=media-libs/faad2-2.7 )
|
||||
adplug? ( >=dev-cpp/libbinio-1.4 )
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.16 )
|
||||
bs2b? ( media-libs/libbs2b )
|
||||
cdda? ( >=media-libs/libcddb-1.2.1
|
||||
>=dev-libs/libcdio-0.79-r1 )
|
||||
cue? ( media-libs/libcue )
|
||||
ffmpeg? ( >=media-video/ffmpeg-0.7.3
|
||||
!media-video/libav )
|
||||
flac? ( >=media-libs/libvorbis-1.0
|
||||
>=media-libs/flac-1.2.1-r1 )
|
||||
fluidsynth? ( media-sound/fluidsynth )
|
||||
jack? ( >=media-libs/bio2jack-0.4
|
||||
media-sound/jack-audio-connection-kit )
|
||||
lame? ( media-sound/lame )
|
||||
libnotify? ( x11-libs/libnotify )
|
||||
libsamplerate? ( media-libs/libsamplerate )
|
||||
mms? ( >=media-libs/libmms-0.3 )
|
||||
mp3? ( >=media-sound/mpg123-1.12.1 )
|
||||
mtp? ( media-libs/libmtp )
|
||||
pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
|
||||
scrobbler? ( net-misc/curl )
|
||||
sid? ( >=media-libs/libsidplay-2.1.1-r2 )
|
||||
sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
|
||||
vorbis? ( >=media-libs/libvorbis-1.2.0
|
||||
>=media-libs/libogg-1.1.3 )
|
||||
wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( dev-util/intltool )
|
||||
>=dev-util/pkgconfig-0.9.0"
|
||||
|
||||
mp3_warning() {
|
||||
if ! use mp3 ; then
|
||||
ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
mp3_warning
|
||||
|
||||
econf \
|
||||
--enable-chardet \
|
||||
--enable-modplug \
|
||||
--enable-neon \
|
||||
$(use_enable adplug) \
|
||||
$(use_enable aac) \
|
||||
$(use_enable alsa) \
|
||||
$(use_enable alsa amidiplug-alsa) \
|
||||
$(use_enable aqua coreaudio) \
|
||||
$(use_enable aqua dockalbumart) \
|
||||
$(use_enable bs2b) \
|
||||
$(use_enable cdda cdaudio) \
|
||||
$(use_enable cue) \
|
||||
$(use_enable ffmpeg ffaudio) \
|
||||
$(use_enable flac flacng) \
|
||||
$(use_enable fluidsynth amidiplug-flsyn) \
|
||||
$(use_enable flac filewriter_flac) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable jack) \
|
||||
$(use_enable gnome gnomeshortcuts) \
|
||||
$(use_enable lame filewriter_mp3) \
|
||||
$(use_enable libnotify notify) \
|
||||
$(use_enable libsamplerate resample) \
|
||||
$(use_enable mms) \
|
||||
$(use_enable mp3) \
|
||||
$(use_enable midi amidiplug) \
|
||||
$(use_enable mtp mtp_up) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable oss) \
|
||||
$(use_enable pulseaudio pulse) \
|
||||
$(use_enable scrobbler) \
|
||||
$(use_enable sid) \
|
||||
$(use_enable sndfile) \
|
||||
$(use_enable sse2) \
|
||||
$(use_enable vorbis) \
|
||||
$(use_enable vorbis filewriter_vorbis) \
|
||||
$(use_enable wavpack)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS
|
||||
}
|
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-6.5.15.ebuild,v 1.1 2011/12/05 21:01:23 radhermit Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="A program to convert abc files to Postscript files"
|
||||
HOMEPAGE="http://moinejf.free.fr/"
|
||||
SRC_URI="http://moinejf.free.fr/${P}.tar.gz
|
||||
http://moinejf.free.fr/transpose_abc.pl"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
|
||||
IUSE="examples pango"
|
||||
|
||||
RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--enable-a4 \
|
||||
--enable-deco-is-roll \
|
||||
$(use_enable pango)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin abcm2ps
|
||||
|
||||
insinto /usr/share/${PN}
|
||||
doins *.fmt
|
||||
|
||||
dodoc Changes README *.txt
|
||||
|
||||
if use examples ; then
|
||||
docinto examples
|
||||
dodoc *.{abc,eps}
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
docinto contrib
|
||||
dodoc "${DISTDIR}"/transpose_abc.pl
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
DIST audacious-2.4.4.tgz 1344519 RMD160 75c960b158b3b6367cca4a7da65d98d8a35a13d9 SHA1 697b2cc217cef9785cf7ec0c4ee617bc174fbe98 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8
|
||||
DIST audacious-2.5.4.tar.gz 1221134 RMD160 40c4482a0ed35c76e214180cf5c3a308b4d83d7a SHA1 6374b09690fba540b82f7fbaa9a4d763c5ea7d79 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd
|
||||
DIST audacious-3.0.3.tar.bz2 839693 RMD160 d387b155ee5a6a859b4b443bfc82f45e1003d3ff SHA1 f8e547fc9d743da0eba591395d353bae8b73facf SHA256 141d1963d6c44be3d140a43a5c01ebe9db588e5d9f29049a4819f24448dd3cf9
|
||||
DIST audacious-3.1.1.tar.bz2 766551 RMD160 2eea3bf3ca730636ab436d71c6ec90ed513af97f SHA1 fa5629d68ac1b12d563e8c0b4be083dea7c7924c SHA256 50e229579a0ee06e88d2b123c8db6b373db73e87898e8b4843a1bd02e3cab8ac
|
||||
DIST audacious-3.1.tar.bz2 793321 RMD160 6e4ccf241c6f1ad17da84c373f30b2176f05462c SHA1 f87bba07c1abc8bfe60a21c3bcef3359856529d7 SHA256 306db180cd269b072cfb23551b4139cd2af28d8afb6699836ad82aa3bcec3a46
|
||||
DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
|
||||
|
@ -0,0 +1,62 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.1.ebuild,v 1.1 2011/12/05 22:46:56 chainsaw Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
|
||||
HOMEPAGE="http://audacious-media-player.org/"
|
||||
SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
|
||||
mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
|
||||
IUSE="altivec chardet nls session sse2"
|
||||
|
||||
RDEPEND=">=dev-libs/dbus-glib-0.60
|
||||
>=dev-libs/glib-2.16
|
||||
>=dev-libs/libmcs-0.7.1-r2
|
||||
>=dev-libs/libmowgli-0.9.50
|
||||
dev-libs/libxml2
|
||||
>=x11-libs/cairo-1.2.6
|
||||
>=x11-libs/pango-1.8.0
|
||||
x11-libs/gtk+:3
|
||||
session? ( x11-libs/libSM )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/pkgconfig-0.9.0
|
||||
chardet? ( >=app-i18n/libguess-1.1 )
|
||||
nls? ( dev-util/intltool )"
|
||||
|
||||
PDEPEND=">=media-plugins/audacious-plugins-3.1.1"
|
||||
|
||||
src_configure() {
|
||||
# D-Bus is a mandatory dependency, remote control,
|
||||
# session management and some plugins depend on this.
|
||||
# Building without D-Bus is *unsupported* and a USE-flag
|
||||
# will not be added due to the bug reports that will result.
|
||||
# Bugs #197894, #199069, #207330, #208606
|
||||
# Use of GTK+2 causes plugin build failures, bug #384185
|
||||
econf \
|
||||
--enable-dbus \
|
||||
--enable-gtk3 \
|
||||
$(use_enable altivec) \
|
||||
$(use_enable chardet) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable session sm) \
|
||||
$(use_enable sse2)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc AUTHORS NEWS README
|
||||
|
||||
# Gentoo_ice skin installation; bug #109772
|
||||
insinto /usr/share/audacious/Skins/gentoo_ice
|
||||
doins "${WORKDIR}"/gentoo_ice/*
|
||||
docinto gentoo_ice
|
||||
dodoc "${WORKDIR}"/README
|
||||
}
|
@ -0,0 +1 @@
|
||||
DIST mkclean-0.8.6.tar.bz2 730851 RMD160 690369914fcfa619a504be5bc50582b5198afc73 SHA1 dd59c50178c5d1b11190e466c0562ac3cd64cd71 SHA256 6e81a7522ef47ddfefb4ae1f5d9bee217190741b6660f5240dba85bc4faf4a44
|
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>video</herd>
|
||||
<maintainer>
|
||||
<email>sbriesen@gentoo.org</email>
|
||||
<name>Stefan Briesenick</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed. It reorders the elements with the Cues at the front, so your Matroska files are ready to be streamed efficiently over the web. It also removes elements not found in the Matroska specs and the extra Meta Seek list of Clusters that some program add to their file. It can also optionally remux the Cluster blocks to start each boundary with a keyframe and the matching audio/subtitle blocks for that keyframe.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-video/mkclean/mkclean-0.8.6.ebuild,v 1.1 2011/12/05 22:28:30 sbriesen Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="mkclean is a command line tool to clean and optimize Matroska files"
|
||||
HOMEPAGE="http://www.matroska.org/downloads/mkclean.html"
|
||||
SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
./configure # non-standard configure
|
||||
|
||||
# fixing generated makefiles
|
||||
sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
|
||||
-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak")
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin release/*/${PN}
|
||||
newdoc ChangeLog.txt ChangeLog
|
||||
newdoc ReadMe.txt README
|
||||
}
|
@ -0,0 +1 @@
|
||||
DIST mkvalidator-0.3.7.tar.bz2 579174 RMD160 5f74f0f09db124fa74657f224f200f825ca721dd SHA1 4dada51d23255dffb4176450b410d6326a72d845 SHA256 236247098052022757243a3c7ae5939b4ca34e07c573e3344346c4ca66c66ba1
|
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>video</herd>
|
||||
<maintainer>
|
||||
<email>sbriesen@gentoo.org</email>
|
||||
<name>Stefan Briesenick</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
mkvalidator is a simple command line tool to verify Matroska and WebM files for spec conformance. It checks the various bogus or missing key elements against the EBML DocType version of the file and reports the errors/warnings in the command line.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-video/mkvalidator/mkvalidator-0.3.7.ebuild,v 1.1 2011/12/05 22:30:24 sbriesen Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="mkvalidator is a command line tool to verify Matroska files for spec conformance"
|
||||
HOMEPAGE="http://www.matroska.org/downloads/mkvalidator.html"
|
||||
SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
./configure # non-standard configure
|
||||
|
||||
# fixing generated makefiles
|
||||
sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
|
||||
-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak")
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin release/*/${PN}
|
||||
newdoc ChangeLog.txt ChangeLog
|
||||
newdoc ReadMe.txt README
|
||||
}
|
@ -1,22 +0,0 @@
|
||||
kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
|
||||
kernel_linux? ( sys-apps/module-init-tools )
|
||||
0
|
||||
x86? ( mirror://gentoo/vmware-modules-1.0.0.25.x86.tar.bz2 http://dev.gentoo.org/~vadimk/vmware-modules-1.0.0.25.x86.tar.bz2 ) amd64? ( mirror://gentoo/vmware-modules-1.0.0.25.amd64.tar.bz2 http://dev.gentoo.org/~vadimk/vmware-modules-1.0.0.25.amd64.tar.bz2 )
|
||||
|
||||
http://www.vmware.com/
|
||||
GPL-2
|
||||
VMware kernel modules
|
||||
amd64 x86
|
||||
eutils flag-o-matic linux-info linux-mod multilib portability toolchain-funcs user versionator
|
||||
kernel_linux
|
||||
|
||||
|
||||
|
||||
2
|
||||
|
||||
compile install postinst postrm preinst prepare setup unpack
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1,22 +0,0 @@
|
||||
kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
|
||||
kernel_linux? ( sys-apps/module-init-tools )
|
||||
0
|
||||
x86? ( mirror://gentoo/vmware-modules-1.0.0.25.x86.tar.bz2 http://dev.gentoo.org/~vadimk/vmware-modules-1.0.0.25.x86.tar.bz2 ) amd64? ( mirror://gentoo/vmware-modules-1.0.0.25.amd64.tar.bz2 http://dev.gentoo.org/~vadimk/vmware-modules-1.0.0.25.amd64.tar.bz2 )
|
||||
|
||||
http://www.vmware.com/
|
||||
GPL-2
|
||||
VMware kernel modules
|
||||
~amd64 ~x86
|
||||
eutils flag-o-matic linux-info linux-mod multilib portability toolchain-funcs user versionator
|
||||
kernel_linux
|
||||
|
||||
|
||||
|
||||
2
|
||||
|
||||
compile install postinst postrm preinst prepare setup unpack
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1,22 +0,0 @@
|
||||
>=dev-lang/python-2.5[sqlite,ncurses] dev-python/lxml >=sys-apps/sed-4
|
||||
~app-emulation/vmware-modules-1.0.0.25 dev-cpp/cairomm dev-cpp/libgnomecanvasmm dev-cpp/libsexymm dev-libs/libxml2 sys-libs/glibc sys-apps/pciutils >=x11-libs/libview-0.6.2 x11-libs/libXcursor x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst !app-emulation/vmware-workstation
|
||||
0
|
||||
x86? ( mirror://vmware/software/vmplayer/VMware-Player-2.5.5-328052.i386.bundle ) amd64? ( mirror://vmware/software/vmplayer/VMware-Player-2.5.5-328052.x86_64.bundle )
|
||||
strip binchecks
|
||||
http://www.vmware.com/products/desktop/ws_features.html
|
||||
vmware
|
||||
Emulate a complete PC on your PC without the usual performance overhead of most emulators
|
||||
-* amd64 x86
|
||||
eutils fdo-mime gnome2-utils multilib portability toolchain-funcs user versionator
|
||||
|
||||
|
||||
|
||||
|
||||
2
|
||||
|
||||
config install nofetch postinst postrm preinst prepare prerm setup unpack
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1,22 +0,0 @@
|
||||
>=dev-lang/python-2.5[sqlite,ncurses] dev-python/lxml >=sys-apps/sed-4
|
||||
~app-emulation/vmware-modules-1.0.0.25 dev-cpp/cairomm dev-cpp/libgnomecanvasmm dev-cpp/libsexymm sys-apps/pciutils sys-fs/fuse sys-libs/glibc >=x11-libs/libview-0.6.2 x11-libs/libgksu x11-libs/libXcursor x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst !!app-emulation/vmware-player
|
||||
0
|
||||
x86? ( VMware-Workstation-6.5.5-328052.i386.bundle ) amd64? ( VMware-Workstation-6.5.5-328052.x86_64.bundle )
|
||||
strip fetch binchecks
|
||||
http://www.vmware.com/products/desktop/ws_features.html
|
||||
vmware
|
||||
Emulate a complete PC on your PC without the usual performance overhead of most emulators
|
||||
-* amd64 x86
|
||||
eutils fdo-mime gnome2-utils multilib portability toolchain-funcs user versionator
|
||||
|
||||
|
||||
|
||||
|
||||
2
|
||||
interactive
|
||||
config install nofetch postinst postrm preinst prepare prerm setup unpack
|
||||
|
||||
|
||||
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue