From 387a0ad011929c68cc8b9f575796914152e81999 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 4 Apr 2007 16:20:39 +0000
Subject: zip: updated to 2.32 (from OE) and cleaned

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1437 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/zip/zip-native_2.31.bb |  9 ---------
 meta/packages/zip/zip-native_2.32.bb | 10 ++++++++++
 meta/packages/zip/zip.inc            | 19 +++++++++++++++++++
 meta/packages/zip/zip_2.31.bb        | 17 -----------------
 meta/packages/zip/zip_2.32.bb        |  3 +++
 5 files changed, 32 insertions(+), 26 deletions(-)
 delete mode 100644 meta/packages/zip/zip-native_2.31.bb
 create mode 100644 meta/packages/zip/zip-native_2.32.bb
 create mode 100644 meta/packages/zip/zip.inc
 delete mode 100644 meta/packages/zip/zip_2.31.bb
 create mode 100644 meta/packages/zip/zip_2.32.bb

diff --git a/meta/packages/zip/zip-native_2.31.bb b/meta/packages/zip/zip-native_2.31.bb
deleted file mode 100644
index fde61efcb..000000000
--- a/meta/packages/zip/zip-native_2.31.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "console/utils"
-inherit native
-require zip_${PV}.bb
-S = "${WORKDIR}/zip-${PV}"
-
-do_stage() {
-	install -d ${STAGING_BINDIR}
-	install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}
-}
diff --git a/meta/packages/zip/zip-native_2.32.bb b/meta/packages/zip/zip-native_2.32.bb
new file mode 100644
index 000000000..cfa427237
--- /dev/null
+++ b/meta/packages/zip/zip-native_2.32.bb
@@ -0,0 +1,10 @@
+require zip_${PV}.bb
+
+inherit native
+
+S = "${WORKDIR}/zip-${PV}"
+
+do_stage() {
+	install -d ${STAGING_BINDIR}
+	install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}
+}
diff --git a/meta/packages/zip/zip.inc b/meta/packages/zip/zip.inc
new file mode 100644
index 000000000..8d04bd5f6
--- /dev/null
+++ b/meta/packages/zip/zip.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Archiver for .zip files"
+SECTION = "console/utils"
+LICENSE = "Info-ZIP"
+
+SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
+
+EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
+		'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
+		'BINFLAGS=0755' 'INSTALL_D=install -d'"
+
+do_compile() {
+	oe_runmake -f unix/Makefile generic
+}
+
+do_install() {
+	oe_runmake -f unix/Makefile prefix=${D}${prefix} \
+		   BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
+		   install
+}
diff --git a/meta/packages/zip/zip_2.31.bb b/meta/packages/zip/zip_2.31.bb
deleted file mode 100644
index 6c588a55e..000000000
--- a/meta/packages/zip/zip_2.31.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "console/utils"
-SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz"
-LICENSE = "Info-ZIP"
-EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
-		'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
-		'BINFLAGS=0755' 'INSTALL_D=install -d'"
-
-do_compile() {
-	oe_runmake -f unix/Makefile generic
-}
-
-do_install() {
-	oe_runmake -f unix/Makefile prefix=${D}${prefix} \
-		   BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
-		   install
-}
-
diff --git a/meta/packages/zip/zip_2.32.bb b/meta/packages/zip/zip_2.32.bb
new file mode 100644
index 000000000..4e01db84c
--- /dev/null
+++ b/meta/packages/zip/zip_2.32.bb
@@ -0,0 +1,3 @@
+require zip.inc
+
+PR="r1"
-- 
cgit v1.2.3