From 9dbd63969ba48dc4f1cc48d900fece798248ed91 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 17 Nov 2011 02:21:02 -0700
Subject: [PATCH] wine-unstable: fix virtual pkg conflict stuff

---
 srcpkgs/wine-unstable/libwine-unstable.template    | 4 +++-
 srcpkgs/wine-unstable/template                     | 3 ++-
 srcpkgs/wine-unstable/wine-unstable-devel.template | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template
index e356ecd684..ca61ae86e9 100644
--- a/srcpkgs/wine-unstable/libwine-unstable.template
+++ b/srcpkgs/wine-unstable/libwine-unstable.template
@@ -1,13 +1,15 @@
 # Template file for 'libwine-unstable'.
 #
-revision=1
+revision=2
 short_desc="${short_desc} - Runtime library"
 long_desc="${long_desc}
 
  This package contains the wine runtime."
 
+only_for_archs=i686
 replaces="libwine>=0"
 provides="libwine-$version"
+conflicts="libwine>=0"
 
 do_install()
 {
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index c36e34ac8d..affe0002b3 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-x"
 homepage="http://www.winehq.org/"
 distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${version}.tar.bz2"
-revision=1
+revision=2
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -20,6 +20,7 @@ long_desc="
 only_for_archs=i686
 replaces="wine>=0"
 provides="wine-$version"
+conflicts="wine>=0"
 subpackages="lib$pkgname $pkgname-devel"
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
index 641b2d267e..5c2d4d007d 100644
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ b/srcpkgs/wine-unstable/wine-unstable-devel.template
@@ -1,10 +1,16 @@
 # Template file for 'libwine-unstable'.
 #
+revision=1
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+only_for_archs=i686
+replaces="wine-devel>=0"
+provides="wine-devel-$version"
+conflicts="wine-devel>=0"
+
 Add_dependency run glibc-devel
 Add_dependency run libwine-unstable