8 files changed, 14 insertions, 21 deletions

diff --git a/meta/packages/opkg/opkg-native_svn.bb b/meta/packages/opkg/opkg-native_svn.bb
deleted file mode 100644
index a385f0df28..0000000000
--- a/meta/packages/opkg/opkg-native_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require opkg.inc
-
-DEPENDS = "curl-native"
-PROVIDES += "virtual/update-alternatives-native"
-RPROVIDES_${PN} += "update-alternatives-native"
-PR = "r5"
-
-target_libdir := "${libdir}"
-
-inherit native
-
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
diff --git a/meta/packages/opkg/opkg-nativesdk_svn.bb b/meta/packages/opkg/opkg-nativesdk_svn.bb
deleted file mode 100644
index 05f5e6f472..0000000000
--- a/meta/packages/opkg/opkg-nativesdk_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require opkg.inc
-
-DEPENDS = "curl-nativesdk"
-PR = "r3"
-
-inherit nativesdk
-
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
diff --git a/meta/packages/opkg/opkg.inc b/meta/packages/opkg/opkg.inc
index d82f6d53f2..1d1cb5c26f 100644
--- a/meta/packages/opkg/opkg.inc
+++ b/meta/packages/opkg/opkg.inc
@@ -4,6 +4,8 @@ DESCRIPTION_update-alternatives-cworth = "Update alternatives"
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "curl gpgme"
+DEPENDS_virtclass-native = "curl-native"
+DEPENDS_virtclass-nativesdk = "curl-nativesdk"
 PV = "0.0+svnr${SRCREV}"
 PE = "1"
 
@@ -14,9 +16,20 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
 
 S = "${WORKDIR}/trunk"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opkg"
+
 # Werror gives all kinds bounds issuses with gcc 4.3.3
 do_configure_prepend() {
     sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
 }
 
 inherit autotools_stage pkgconfig
+
+target_libdir := "${libdir}"
+EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_libdir} --disable-gpg"
+EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_libdir} --disable-gpg"
+
+#PROVIDES_append_virtclass-native = "virtual/update-alternatives-native"
+#RPROVIDES_${PN} += "update-alternatives-native"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/packages/opkg/files/fix_prototype.patch b/meta/packages/opkg/opkg/fix_prototype.patch
index 4be881aa7e..4be881aa7e 100644
--- a/meta/packages/opkg/files/fix_prototype.patch
+++ b/meta/packages/opkg/opkg/fix_prototype.patch
diff --git a/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch b/meta/packages/opkg/opkg/opkg-fix-gcc-warnings.patch
index 149542ed6a..149542ed6a 100644
--- a/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
+++ b/meta/packages/opkg/opkg/opkg-fix-gcc-warnings.patch
diff --git a/meta/packages/opkg/files/opkg_unarchive.patch b/meta/packages/opkg/opkg/opkg_unarchive.patch
index 9e5ccfb714..9e5ccfb714 100644
--- a/meta/packages/opkg/files/opkg_unarchive.patch
+++ b/meta/packages/opkg/opkg/opkg_unarchive.patch
diff --git a/meta/packages/opkg/files/sighandlerfix.patch b/meta/packages/opkg/opkg/sighandlerfix.patch
index b60245f581..b60245f581 100644
--- a/meta/packages/opkg/files/sighandlerfix.patch
+++ b/meta/packages/opkg/opkg/sighandlerfix.patch
diff --git a/meta/packages/opkg/opkg_svn.bb b/meta/packages/opkg/opkg_svn.bb
index 0d68939346..b84f63d540 100644
--- a/meta/packages/opkg/opkg_svn.bb
+++ b/meta/packages/opkg/opkg_svn.bb
@@ -6,7 +6,7 @@ RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
 RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
 PACKAGE_ARCH_update-alternatives-cworth = "all"
 
-PR = "r3"
+PR = "r6"
 
 PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth"