8 files changed, 97 insertions, 2 deletions
diff --git a/dev-embedded/gnap-dev/ChangeLog b/dev-embedded/gnap-dev/ChangeLog
index a1af39915fa0..78d1a5033348 100644
--- a/dev-embedded/gnap-dev/ChangeLog
+++ b/dev-embedded/gnap-dev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/gnap-dev
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap-dev/ChangeLog,v 1.1 2005/04/25 13:58:00 koon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap-dev/ChangeLog,v 1.2 2005/05/17 12:30:39 koon Exp $
+
+*gnap-dev-1.6 (17 May 2005)
+
+  17 May 2005; Thierry Carrez <koon@gentoo.org> +gnap-dev-1.6.ebuild:
+  Version 1.6 bump
 
 *gnap-dev-1.5.1 (25 Apr 2005)
 
diff --git a/dev-embedded/gnap-dev/Manifest b/dev-embedded/gnap-dev/Manifest
index df809b4d3a98..38a8e21874bc 100644
--- a/dev-embedded/gnap-dev/Manifest
+++ b/dev-embedded/gnap-dev/Manifest
@@ -1,4 +1,6 @@
 MD5 a3a1efa30800f5df29600d14c1ca388c gnap-dev-1.5.1.ebuild 1093
 MD5 64d87385c958f432f53c7a137f683595 ChangeLog 349
 MD5 1efa026a8d6a0dde12242d80980203ba metadata.xml 250
+MD5 a3a1efa30800f5df29600d14c1ca388c gnap-dev-1.6.ebuild 1093
 MD5 b119545e7ec1c86482ef226bcfcc858f files/digest-gnap-dev-1.5.1 158
+MD5 924e6479cf77442ff12a6ccca6a61455 files/digest-gnap-dev-1.6 156
diff --git a/dev-embedded/gnap-dev/files/digest-gnap-dev-1.6 b/dev-embedded/gnap-dev/files/digest-gnap-dev-1.6
new file mode 100644
index 000000000000..e4b253fa3416
--- /dev/null
+++ b/dev-embedded/gnap-dev/files/digest-gnap-dev-1.6
@@ -0,0 +1,2 @@
+MD5 81dd8f0b5f7dfb96d0f3deee0f37d6d2 gnap-sources-1.6.tar.bz2 14833
+MD5 a04b1766e4e0848c28fcda48ac5817b5 stage2-x86-uclibc-hardened-2005.0.tar.bz2 20751421
diff --git a/dev-embedded/gnap-dev/gnap-dev-1.6.ebuild b/dev-embedded/gnap-dev/gnap-dev-1.6.ebuild
new file mode 100644
index 000000000000..384e72d1574e
--- /dev/null
+++ b/dev-embedded/gnap-dev/gnap-dev-1.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap-dev/gnap-dev-1.6.ebuild,v 1.1 2005/05/17 12:30:39 koon Exp $
+
+STAGE2_VERSION="x86-uclibc-hardened-2005.0"
+
+MY_P=${P/gnap-dev/gnap-sources}
+S="${WORKDIR}/gnap-${PV}"
+DESCRIPTION="GNAP is a Gentoo-based Network Appliance building system. The gnap-dev package contains the GNAP development environment allowing to rebuild GNAP core files from scratch."
+HOMEPAGE="http://embedded.gentoo.org/gnap.xml"
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	!minimal? (	http://gentoo.osuosl.org/experimental/x86/embedded/stages/stage2-${STAGE2_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="minimal"
+
+RDEPEND="dev-util/catalyst
+	sys-fs/squashfs-tools
+	app-cdr/cdrtools"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+}
+
+src_install() {
+	dobin gnap_make
+	doman gnap_make.1
+
+	dodir /usr/lib/gnap
+	insinto /usr/lib/gnap
+	doins -r specs
+	if ! use minimal; then
+		newins ${DISTDIR}/stage2-${STAGE2_VERSION}.tar.bz2 stage2seed.tar.bz2
+	fi
+}
diff --git a/dev-embedded/gnap/ChangeLog b/dev-embedded/gnap/ChangeLog
index 4302fb979fca..6be6739e5a38 100644
--- a/dev-embedded/gnap/ChangeLog
+++ b/dev-embedded/gnap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/gnap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap/ChangeLog,v 1.1 2005/04/25 13:50:35 koon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap/ChangeLog,v 1.2 2005/05/17 12:26:52 koon Exp $
+
+*gnap-1.6 (17 May 2005)
+
+  17 May 2005; Thierry Carrez <koon@gentoo.org> +gnap-1.6.ebuild:
+  New release
 
 *gnap-1.5.1 (25 Apr 2005)
 
diff --git a/dev-embedded/gnap/Manifest b/dev-embedded/gnap/Manifest
index 11e2577abfbe..34f84582bcb2 100644
--- a/dev-embedded/gnap/Manifest
+++ b/dev-embedded/gnap/Manifest
@@ -1,4 +1,6 @@
 MD5 5cd6cc4bfae78d2a15f057f159d2a581 gnap-1.5.1.ebuild 984
 MD5 67aced69a7b81eae7f30a458af14ba7d ChangeLog 333
 MD5 1efa026a8d6a0dde12242d80980203ba metadata.xml 250
+MD5 5cd6cc4bfae78d2a15f057f159d2a581 gnap-1.6.ebuild 984
+MD5 90e463097164c37fcc018f08018c2ba7 files/digest-gnap-1.6 130
 MD5 d23a0fdb340717c3269056a9b46efa14 files/digest-gnap-1.5.1 134
diff --git a/dev-embedded/gnap/files/digest-gnap-1.6 b/dev-embedded/gnap/files/digest-gnap-1.6
new file mode 100644
index 000000000000..2866ed1f94c0
--- /dev/null
+++ b/dev-embedded/gnap/files/digest-gnap-1.6
@@ -0,0 +1,2 @@
+MD5 4e11fda840806efc596988534a073364 gnap-tools-1.6.tar.bz2 23568
+MD5 17c93fc83c45154ce163145bbac5ddbf gnap-core-1.6.tar 14837760
diff --git a/dev-embedded/gnap/gnap-1.6.ebuild b/dev-embedded/gnap/gnap-1.6.ebuild
new file mode 100644
index 000000000000..dd99196f26cd
--- /dev/null
+++ b/dev-embedded/gnap/gnap-1.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap/gnap-1.6.ebuild,v 1.1 2005/05/17 12:26:52 koon Exp $
+
+MY_P="${P/gnap/gnap-tools}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="GNAP is a Gentoo-based Network Appliance building system. Allows to build LiveCDs or bootable disks with a customized network appliance configuration in seconds."
+HOMEPAGE="http://embedded.gentoo.org/gnap.xml"
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	!minimal? ( mirror://gentoo/${PN}-core-${PV}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="minimal"
+
+RDEPEND="app-cdr/cdrtools
+	sys-fs/dosfstools
+	sys-boot/syslinux"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+}
+
+src_install() {
+	dobin gnap_overlay
+	doman gnap_overlay.1
+
+	dodoc README.upgrading
+
+	dodir /usr/lib/gnap
+	insinto /usr/lib/gnap
+	if ! use minimal; then
+		doins ${DISTDIR}/${PN}-core-${PV}.tar
+		doins -r mbr
+		doins -r examples
+	fi
+}