Overhauled these ebuilds to use RESTRICT=fetch so that digests can be generated properly

8 files changed, 97 insertions, 147 deletions

diff --git a/dev-lang/palmos-sdk/ChangeLog b/dev-lang/palmos-sdk/ChangeLog
index f11cbb4df356..b7f0f066021c 100644
--- a/dev-lang/palmos-sdk/ChangeLog
+++ b/dev-lang/palmos-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/palmos-sdk
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/ChangeLog,v 1.2 2004/03/02 09:25:00 aliz Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/ChangeLog,v 1.3 2004/06/07 20:34:54 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> palmos-sdk-3.5.ebuild,
+  palmos-sdk-4.0.ebuild, palmos-sdk-5.0-r3.ebuild:
+  Overhauled these ebuilds to use RESTRICT=fetch so that digests can be
+  generated properly
 
 *palmos-sdk-5.0-r3 (25 Dec 2003)
 *palmos-sdk-3.5 (25 Dec 2003)
diff --git a/dev-lang/palmos-sdk/Manifest b/dev-lang/palmos-sdk/Manifest
index b37debd0b8b7..7aca0eb08505 100644
--- a/dev-lang/palmos-sdk/Manifest
+++ b/dev-lang/palmos-sdk/Manifest
@@ -1,8 +1,8 @@
-MD5 f9e8c36cb6f3fac77a1760ff09d35092 ChangeLog 513
+MD5 d1164a324fc3c8f67b56dacb1e01a349 palmos-sdk-3.5.ebuild 1222
+MD5 e975a7c3b4fc5113952b7c196ba93c7a palmos-sdk-5.0-r3.ebuild 1412
+MD5 6abcb8005ac6670490c3f72fc99ded72 palmos-sdk-4.0.ebuild 1562
+MD5 f90cb01769a2d0cf8aa8c1cb929122c0 ChangeLog 734
 MD5 8b0f876da8fa70f6ebcbaf281e5720d6 metadata.xml 224
-MD5 9417b650907ad42af99993f443ade162 palmos-sdk-4.0.ebuild 1797
-MD5 030b69a510ebfa7cbcffadb4b987be47 palmos-sdk-3.5.ebuild 1657
-MD5 40ea34b9c75684b2522659a4dda6238d palmos-sdk-5.0-r3.ebuild 1718
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-palmos-sdk-5.0-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-palmos-sdk-4.0 0
-MD5 7ae70463e1a00f092dc628949d2a91ab files/digest-palmos-sdk-3.5 121
+MD5 049be22eaab9d00e53069d6f9dd4ab4a files/digest-palmos-sdk-3.5 250
+MD5 d41b4ef294deebb3f9551cf7f474a403 files/digest-palmos-sdk-4.0 246
+MD5 80c7fa4e6439b882ca7185f7d3048210 files/digest-palmos-sdk-5.0-r3 151
diff --git a/dev-lang/palmos-sdk/files/digest-palmos-sdk-3.5 b/dev-lang/palmos-sdk/files/digest-palmos-sdk-3.5
index 03e09f6552f3..fb42a32b09ec 100644
--- a/dev-lang/palmos-sdk/files/digest-palmos-sdk-3.5
+++ b/dev-lang/palmos-sdk/files/digest-palmos-sdk-3.5
@@ -1,2 +1,4 @@
 MD5 6a515f9435f78689f1637438962b1585 sdk35.tar.gz 284047
-MD5 29b002c4b4733d18ba0061c302886b44 sdk35-update1.tar.gz 14043
+MD5 9ab5edf2de54cc735e0204b8e154d1b8 sdk35-update1.tar.gz 8399
+MD5 f3ec5b40bce9d958368299a3bbbf3aa3 sdk35-docs.tar.gz 7509001
+MD5 2cf2e75900cd1d6a3729ef1a0986d6a1 sdk35-examples.tar.gz 1160217
diff --git a/dev-lang/palmos-sdk/files/digest-palmos-sdk-4.0 b/dev-lang/palmos-sdk/files/digest-palmos-sdk-4.0
index e69de29bb2d1..4fcfcf2bff79 100644
--- a/dev-lang/palmos-sdk/files/digest-palmos-sdk-4.0
+++ b/dev-lang/palmos-sdk/files/digest-palmos-sdk-4.0
@@ -0,0 +1,4 @@
+MD5 366b17f99471ec1d3cee43f7beb14948 sdk40.tar.gz 406547
+MD5 cc74b0476d4105b23330df042bd9d915 sdk40upd1.tar.gz 357300
+MD5 7d505fa83f439eb52a4c0c50198ed793 sdk40-docs.zip 13476347
+MD5 52733267275ce5581a27b9ecaae87b8d sdk40-examples.tar.gz 1101393
diff --git a/dev-lang/palmos-sdk/files/digest-palmos-sdk-5.0-r3 b/dev-lang/palmos-sdk/files/digest-palmos-sdk-5.0-r3
index e69de29bb2d1..d58cfebbef72 100644
--- a/dev-lang/palmos-sdk/files/digest-palmos-sdk-5.0-r3
+++ b/dev-lang/palmos-sdk/files/digest-palmos-sdk-5.0-r3
@@ -0,0 +1,2 @@
+MD5 56647bd079f9c23b4df491c165caf7ca palmos-sdk-5.0r3-1.tar.gz 467607
+MD5 78dba4d5d775fea6a443f28d0d23b203 PalmOS_5_SDK_68K_R3_no-install.zip 19703650
diff --git a/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild b/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild
index 418ab7566a05..7cbebaf7d839 100644
--- a/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild
+++ b/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild,v 1.3 2004/06/01 11:17:06 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild,v 1.4 2004/06/07 20:34:54 agriffis Exp $
 
 DESCRIPTION="The static libraries and header files needed for developing PalmOS applications."
 HOMEPAGE="http://www.palmos.com/"
@@ -9,63 +9,37 @@ LICENSE="Palm-SDK"
 SLOT="3.5"
 KEYWORDS="~x86"
 DEPEND="dev-lang/prc-tools"
-
-A1="sdk35.tar.gz"
-A2="sdk35-update1.tar.gz"
-AD1="sdk35-docs.tar.gz"
-AD2="sdk35-examples.tar.gz"
-AX="${A1} ${A2}"
-
+SRC_URI="sdk35.tar.gz sdk35-update1.tar.gz
+	doc? ( sdk35-docs.tar.gz sdk35-examples.tar.gz )"
 IUSE="doc"
-BASE="/opt/palmdev/sdk-${SLOT}"
-RESTRICT="nostrip"
+RESTRICT="nostrip fetch"
 S=${WORKDIR}
 
-pkg_setup() {
-
-	if ! ( [ -f ${DISTDIR}/${A1} ] && [ -f ${DISTDIR}/${A2} ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk35.cgi"; \
-		eerror "and download ${A1} and ${A2} and place them"; \
-		eerror "in ${DISTDIR} and emerge this package again."
-		die
-	fi
-
-	if ( ( [ ! -f ${DISTDIR}/${AD1} ] || [ ! -f ${DISTDIR}/${AD2} ] ) && [ `use doc` ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk35.cgi"
-		eerror "and download ${AD1} and ${AD2} and place them in"
-		eerror "${DISTDIR} and emerge this package again or disable the \`doc'"
-		eerror "USE flag."
-		die
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${AX}
-	if use doc; then
-		unpack ${AD1}
-		unpack ${AD2}
-	fi
+pkg_nofetch() {
+	typeset a
 
+	einfo "Please download the following files from"
+	einfo "http://www.palmos.com/cgi-bin/sdk35.cgi"
+	einfo "and put them in ${DISTDIR}, then emerge this package again."
+	for a in ${A}; do
+		einfo "  ${a}"
+	done
 }
 
 src_install() {
+	typeset base=/opt/palmdev/sdk-${SLOT}
 
-	dodir ${BASE}
-	mv Palm\ OS\ 3.5\ Support/GCC\ Libraries ${D}/${BASE}/lib
-	mv Palm\ OS\ 3.5\ Support/Incs ${D}/${BASE}/include
+	dodir ${base} || die
+	mv Palm\ OS\ 3.5\ Support/GCC\ Libraries ${D}/${base}/lib || die
+	mv Palm\ OS\ 3.5\ Support/Incs ${D}/${base}/include || die
 
 	if use doc; then
-		mv docs ${D}/${BASE}/Documentation
-		mv Examples ${D}/${BASE}/Documentation
+		mv docs ${D}/${base}/Documentation || die
+		mv Examples ${D}/${base}/Documentation || die
 	fi
 
 }
 
-pkg_postinst()
-{
-	palmdev-prep || eerror "Could not run \`palmdev-prep'!"
+pkg_postinst() {
+	palmdev-prep || eerror "Error running palmdev-prep :-("
 }
diff --git a/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild b/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild
index 82a189e7dcbe..6cebc73c63b5 100644
--- a/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild
+++ b/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild,v 1.3 2004/06/01 11:17:06 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild,v 1.4 2004/06/07 20:34:54 agriffis Exp $
 
 inherit rpm
 
@@ -11,64 +11,50 @@ LICENSE="Palm-SDK"
 SLOT="4.0"
 KEYWORDS="~x86"
 DEPEND="dev-lang/prc-tools"
-
-A1="sdk40.tar.gz"
-A2="sdk40upd1.tar.gz"
-AD1="sdk40-docs.zip"
-AD2="sdk40-examples.tar.gz"
-AX="${A1} ${A2}"
-
+# Note: There is an sdk40-docs.tar.gz but it's actually a zip file, so
+# might as well just get the zip file.
+SRC_URI="sdk40.tar.gz sdk40upd1.tar.gz
+	doc? ( sdk40-docs.zip sdk40-examples.tar.gz )"
 IUSE="doc"
-BASE="/opt/palmdev/sdk-${SLOT}"
-RESTRICT="nostrip"
+RESTRICT="nostrip fetch"
 S=${WORKDIR}
 
-pkg_setup() {
-
-	if ! ( [ -f ${DISTDIR}/${A1} ] && [ -f ${DISTDIR}/${A2} ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk40.cgi"; \
-		eerror "and download ${A1} and ${A2} and place them"; \
-		eerror "in ${DISTDIR} and emerge this package again."
-		die
-	fi
-
-	if ( ( [ ! -f ${DISTDIR}/${AD1} ] || [ ! -f ${DISTDIR}/${AD2} ] ) && [ `use doc` ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk40.cgi"
-		eerror "and download ${AD1} and ${AD2} and place them in"
-		eerror "${DISTDIR} and emerge this package again or disable the \`doc'"
-		eerror "USE flag."
-		die
-	fi
+pkg_nofetch() {
+	typeset a
 
+	einfo "Please download the following files from"
+	einfo "http://www.palmos.com/cgi-bin/sdk40.cgi"
+	einfo "and put them in ${DISTDIR}, then emerge this package again."
+	for a in ${A}; do
+		einfo "  ${a}"
+	done
 }
 
 src_unpack() {
-
-	unpack ${AX}
+	unpack ${A}
 	rpm_unpack *.rpm
-	rm *.rpm
-
-	if use doc; then
-		unpack ${AD1}
-		unpack ${AD2}
-	fi
-
 }
 
 src_install() {
+	typeset base=/opt/palmdev/sdk-${SLOT}
 
-	dodir ${BASE}
-	cp -Rf PalmOS-4.0-SDK-Update-1/PalmOS-Unix/PalmOS-Support/* opt/palmdev/sdk-4
-	cp -Rf PalmOS-4.0-SDK-Update-1/PalmOS-Unix/Documentation/* opt/palmdev/sdk-4
-	cp -PRf opt/palmdev/sdk-4/* ${D}/opt/palmdev/sdk-${SLOT}
-	mv Documentation ${D}/opt/palmdev/sdk-${SLOT}
-	mv Examples ${D}/opt/palmdev/sdk-${SLOT}/Documentation
+	# Copy the updates over top of the existing files
+	cp -Rf PalmOS-4.0-SDK-Update-1/PalmOS-Unix/PalmOS-Support/* \
+		opt/palmdev/sdk-4 || die
+	if use doc; then
+		cp -Rf PalmOS-4.0-SDK-Update-1/PalmOS-Unix/Documentation/* \
+			Documentation || die
+	fi
 
+	# Now install
+	dodir ${base%/*} || die
+	mv opt/palmdev/sdk-4 ${D}${base} || die
+	if use doc; then
+		mv Documentation ${D}${base} || die
+		mv Examples ${D}${base}/Documentation || die
+	fi
 }
 
-pkg_postinst()
-{
-	palmdev-prep || eerror "Could not run \`palmdev-prep'!"
+pkg_postinst() {
+	palmdev-prep || eerror "Error running palmdev-prep :-("
 }
diff --git a/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild b/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild
index c86c986d2a02..66c57b110e2a 100644
--- a/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild
+++ b/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild,v 1.3 2004/06/01 11:17:06 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild,v 1.4 2004/06/07 20:34:54 agriffis Exp $
 
 DESCRIPTION="The static libraries and header files needed for developing PalmOS applications."
 HOMEPAGE="http://www.palmos.com/"
@@ -9,61 +9,38 @@ LICENSE="Palm-SDK"
 SLOT="5.0R3"
 KEYWORDS="~x86"
 DEPEND="dev-lang/prc-tools"
-
-AX="palmos-sdk-5.0r3-1.tar.gz"
-AD="PalmOS_5_SDK_68K_R3_no-install.zip"
-
+SRC_URI="palmos-sdk-5.0r3-1.tar.gz PalmOS_5_SDK_68K_R3_no-install.zip"
 IUSE="doc"
-BASE="/opt/palmdev/sdk-${SLOT}"
-RESTRICT="nostrip"
+RESTRICT="nostrip fetch"
 S=${WORKDIR}
 
-pkg_setup() {
-
-	if [ ! -f ${DISTDIR}/${AX} ]; then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk50.cgi"
-		eerror "and download ${AX} and place it in ${DISTDIR}"
-		eerror "and emerge this package again."
-		die
-	fi
-
-	if ( [ ! -f ${DISTDIR}/${AD} ] && [ `use doc` ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk50.cgi"
-		eerror "and download ${AD} and place it in"
-		eerror "${DISTDIR} and emerge this package again or disable the \`doc'"
-		eerror "USE flag."
-		die
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${AX}
-	if use doc; then
-		unpack ${AD}
-	fi
+pkg_nofetch() {
+	typeset a
 
+	einfo "Please download the following files from"
+	einfo "http://www.palmos.com/cgi-bin/sdk50.cgi"
+	einfo "and put them in ${DISTDIR}, then emerge this package again."
+	for a in ${A}; do
+		einfo "  ${a}"
+	done
 }
 
 src_install() {
+	typeset base=/opt/palmdev/sdk-${SLOT}
 
-	dodir ${BASE}
-	rm -rf sdk-5r3/CodeWarrior\ Support
+	rm -rf sdk-5r3/CodeWarrior\ Support || die
 	if use doc; then
-		rm -rf PalmOS_5_SDK_68K_R3_no-install/CodeWarrior\ Support/\(Project\ Stationery\)/
-		rm -rf PalmOS_5_SDK_68K_R3_no-install/CodeWarrior\ Support/Plugins/
-		rm -rf PalmOS_5_SDK_68K_R3_no-install/Palm\ OS\ Support/
-		rm -rf PalmOS_5_SDK_68K_R3_no-install/Palm\ Tools/
-		cp -Rf PalmOS_5_SDK_68K_R3_no-install/* sdk-5r3/
+		rm -rf "PalmOS_5_SDK_68K_R3_no-install/CodeWarrior Support/(Project Stationery)" || die
+		rm -rf "PalmOS_5_SDK_68K_R3_no-install/CodeWarrior Support/Plugins" || die
+		rm -rf "PalmOS_5_SDK_68K_R3_no-install/Palm OS Support" || die
+		rm -rf "PalmOS_5_SDK_68K_R3_no-install/Palm Tools" || die
+		cp -Rf PalmOS_5_SDK_68K_R3_no-install/* sdk-5r3 || die
 	fi
-	cp -PRf sdk-5r3/* ${D}/opt/palmdev/sdk-${SLOT}
 
+	dodir ${base%/*} || die
+	mv sdk-5r3 ${D}${base} || die
 }
 
-pkg_postinst()
-{
-	palmdev-prep || eerror "Could not run \`palmdev-prep'!"
+pkg_postinst() {
+	palmdev-prep || eerror "Error running palmdev-prep :-("
 }