deleted: app-emulation/wine/files

	modified:   app-emulation/wine/wine-9999.ebuild
	deleted:    www-apps/trac/files/9138-mysql-key-size-r9405.patch
	modified:   www-apps/trac/trac-9999.ebuild

4 files changed, 6 insertions, 116 deletions

diff --git a/app-emulation/wine/files b/app-emulation/wine/files
deleted file mode 120000
index 1f940ec..0000000
--- a/app-emulation/wine/files
+++ /dev/null
@@ -1 +0,0 @@
-/usr/portage/app-emulation/wine/files
\ No newline at end of file
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 8cd44b3..8d2bc9d 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit multilib git autotools
+inherit multilib git autotools eutils
 
 
 IUSE="alsa cups dbus esd +gecko gnutls +hacks hal jack jpeg lcms ldap nas ncurses +opengl oss png pulseaudio samba scanner ssl +X xcomposite xinerama xml"
@@ -79,6 +79,8 @@ src_unpack() {
 	git_src_unpack
 	cd ${S}
 #	epatch ${FILESDIR}/bits.patch
+	epatch ${FILESDIR}/mousepatch.diff
+#	epatch ${FILESDIR}/0001-dinput-Read-raw-relative-mouse-movements-from-dev.patch
 #	epatch  ${FILESDIR}/wined3d.diff
 #	useq pulseaudio && epatch ${FILESDIR}/winepulse-0.28.patch
 #	useq pulseaudio && epatch ${FILESDIR}/winepulse-0.17-configure.ac.patch
@@ -87,6 +89,7 @@ src_unpack() {
 }
 
 src_prepare() {
+
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
diff --git a/www-apps/trac/files/9138-mysql-key-size-r9405.patch b/www-apps/trac/files/9138-mysql-key-size-r9405.patch
deleted file mode 100644
index ab5d468..0000000
--- a/www-apps/trac/files/9138-mysql-key-size-r9405.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/trac/db/mysql_backend.py b/trac/db/mysql_backend.py
---- a/trac/db/mysql_backend.py
-+++ b/trac/db/mysql_backend.py
-@@ -121,7 +121,9 @@
-             name = '`%s`' % c
-             table_col = filter((lambda x: x.name == c), table.columns)
-             if len(table_col) == 1 and table_col[0].type.lower() == 'text':
--                if name == '`rev`':
-+                if table_col[0].key_size is not None:
-+                    name += '(%d)' % table_col[0].key_size
-+                elif name == '`rev`':
-                     name += '(20)'
-                 elif name == '`path`':
-                     name += '(255)'
-diff --git a/trac/db/schema.py b/trac/db/schema.py
---- a/trac/db/schema.py
-+++ b/trac/db/schema.py
-@@ -35,11 +35,12 @@
- class Column(object):
-     """Declare a table column in a database schema."""
- 
--    def __init__(self, name, type='text', size=None, unique=False,
-+    def __init__(self, name, type='text', size=None, key_size=None,
-                  auto_increment=False):
-         self.name = name
-         self.type = type
-         self.size = size
-+        self.key_size = key_size
-         self.auto_increment = auto_increment
- 
- 
-diff --git a/trac/db_default.py b/trac/db_default.py
---- a/trac/db_default.py
-+++ b/trac/db_default.py
-@@ -91,17 +91,17 @@
-         Column('value')],
-     Table('revision', key=('repos', 'rev'))[
-         Column('repos', type='int'),
--        Column('rev'),
-+        Column('rev', key_size=20),
-         Column('time', type='int64'),
-         Column('author'),
-         Column('message'),
-         Index(['repos', 'time'])],
-     Table('node_change', key=('repos', 'rev', 'path', 'change_type'))[
-         Column('repos', type='int'),
--        Column('rev'),
--        Column('path'),
-+        Column('rev', key_size=20),
-+        Column('path', key_size=255),
-         Column('node_type', size=1),
--        Column('change_type', size=1),
-+        Column('change_type', size=1, key_size=2),
-         Column('base_path'),
-         Column('base_rev'),
-         Index(['repos', 'rev'])],
-diff --git a/trac/upgrades/db23.py b/trac/upgrades/db23.py
---- a/trac/upgrades/db23.py
-+++ b/trac/upgrades/db23.py
-@@ -15,17 +15,17 @@
-                 Column('value')],
-               Table('revision', key=('repos', 'rev'))[
-                 Column('repos'),
--                Column('rev'),
-+                Column('rev', key_size=20),
-                 Column('time', type='int'),
-                 Column('author'),
-                 Column('message'),
-                 Index(['repos', 'time'])],
-               Table('node_change', key=('repos', 'rev', 'path', 'change_type'))[
--                Column('repos'),
--                Column('rev'),
--                Column('path'),
-+                Column('repos', key_size=56),
-+                Column('rev', key_size=20),
-+                Column('path', key_size=255),
-                 Column('node_type', size=1),
--                Column('change_type', size=1),
-+                Column('change_type', size=1, key_size=2),
-                 Column('base_path'),
-                 Column('base_rev'),
-                 Index(['repos', 'rev'])]]
-diff --git a/trac/upgrades/db24.py b/trac/upgrades/db24.py
---- a/trac/upgrades/db24.py
-+++ b/trac/upgrades/db24.py
-@@ -24,17 +24,17 @@
-                   Column('value')],
-               Table('revision', key=('repos', 'rev'))[
-                   Column('repos', type='int'),
--                  Column('rev'),
-+                  Column('rev', key_size=20),
-                   Column('time', type='int'),
-                   Column('author'),
-                   Column('message'),
-                   Index(['repos', 'time'])],
-               Table('node_change', key=('repos', 'rev', 'path', 'change_type'))[
-                   Column('repos', type='int'),
--                  Column('rev'),
--                  Column('path'),
-+                  Column('rev', key_size=20),
-+                  Column('path', key_size=255),
-                   Column('node_type', size=1),
--                  Column('change_type', size=1),
-+                  Column('change_type', size=1, key_size=2),
-                   Column('base_path'),
-                   Column('base_rev'),
-                   Index(['repos', 'rev'])]]
diff --git a/www-apps/trac/trac-9999.ebuild b/www-apps/trac/trac-9999.ebuild
index b838aa6..605be79 100644
--- a/www-apps/trac/trac-9999.ebuild
+++ b/www-apps/trac/trac-9999.ebuild
@@ -16,13 +16,8 @@ SRC_URI=""
 
 IUSE="cgi fastcgi mysql multirepos postgres sqlite subversion"
 
-if use multirepos ; then
-    ESVN_REPO_URI="http://svn.edgewall.com/repos/trac/sandbox/multirepos"
-    ESVN_PROJECT="${PN/-multirepos-svn}"
-else
-    ESVN_REPO_URI="http://svn.edgewall.org/repos/trac/trunk"
-    ESVN_PROJECT="${PN/-svn}"
-fi
+ESVN_REPO_URI="http://svn.edgewall.org/repos/trac/trunk"
+ESVN_PROJECT="${PN/-svn}"
 ESVN_STORE_DIR="${DISTDIR}/svn-src"
 #ESVN_BOOTSTRAP="./reconf"