version bump, license update, and general tidiness

5 files changed, 27 insertions, 29 deletions

diff --git a/app-pda/qtopia-desktop-bin/ChangeLog b/app-pda/qtopia-desktop-bin/ChangeLog
index fdbb3948dcd6..c6d8148280d2 100644
--- a/app-pda/qtopia-desktop-bin/ChangeLog
+++ b/app-pda/qtopia-desktop-bin/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for app-pda/qtopia-desktop-bin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/ChangeLog,v 1.3 2004/01/12 20:06:55 nerdboy Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/ChangeLog,v 1.4 2004/04/07 06:15:34 nerdboy Exp $
 
-  12 Jan 2004; <sarnold@gentoo.org> metadata.xml,
+  06 Apr 2004; <nerdboy@gentoo.org> qtopia-desktop-bin-1.7.0.ebuild,
+  qtopia-desktop-bin-1.6.2-r1.ebuild, qtopia-desktop-bin-16.2.ebuild:
+  version bump, license update, and general tidiness
+
+  12 Jan 2004; <nerdboy@gentoo.org> metadata.xml,
   qtopia-desktop-bin-1.6.2-r1.ebuild:
   bumped r1 to x86 and closed bug #18175 (also updated metadata)
 
diff --git a/app-pda/qtopia-desktop-bin/Manifest b/app-pda/qtopia-desktop-bin/Manifest
index 696408ed37e2..ba9219901c93 100644
--- a/app-pda/qtopia-desktop-bin/Manifest
+++ b/app-pda/qtopia-desktop-bin/Manifest
@@ -1,6 +1,6 @@
 MD5 d6edd91c507e86466efbe9509c037c4c metadata.xml 398
-MD5 95179d1c1bb61676f875f1735928503e qtopia-desktop-bin-1.6.2.ebuild 1800
-MD5 e47a43c75654152d973020a5532a4497 ChangeLog 743
-MD5 30e61c5d9d3b9421faeeec427f5adde1 qtopia-desktop-bin-1.6.2-r1.ebuild 1623
+MD5 2b92b784ce56791e88a0f21c08fcbf37 ChangeLog 936
+MD5 da1ebc0064ae06c4c4180235454fdeee qtopia-desktop-bin-1.6.2-r1.ebuild 1637
+MD5 013c6bf5078f5d595d5e6439e92b13e1 qtopia-desktop-bin-1.7.0.ebuild 1646
+MD5 14e671ebc4605282b1a4743f4e38e42a files/digest-qtopia-desktop-bin-1.7.0 80
 MD5 e47d4ed2b1a7b1876057de337ae540a4 files/digest-qtopia-desktop-bin-1.6.2-r1 80
-MD5 e47d4ed2b1a7b1876057de337ae540a4 files/digest-qtopia-desktop-bin-1.6.2 80
diff --git a/app-pda/qtopia-desktop-bin/files/digest-qtopia-desktop-bin-1.7.0 b/app-pda/qtopia-desktop-bin/files/digest-qtopia-desktop-bin-1.7.0
new file mode 100644
index 000000000000..0ad6d0051e79
--- /dev/null
+++ b/app-pda/qtopia-desktop-bin/files/digest-qtopia-desktop-bin-1.7.0
@@ -0,0 +1 @@
+MD5 ee340a07ca1908204c4ded462f9304c4 qtopia-desktop-1.7.0-1rh9.i386.rpm 6081706
diff --git a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2-r1.ebuild b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2-r1.ebuild
index 7a740ff04778..d407fe660c81 100644
--- a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2-r1.ebuild
+++ b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2-r1.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/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2-r1.ebuild,v 1.2 2004/01/12 20:06:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2-r1.ebuild,v 1.3 2004/04/07 06:15:34 nerdboy Exp $
 
 IUSE="X"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.trolltech.com/download/qtopia/"
 DEPEND="virtual/glibc"
 RDEPEND="virtual/x11"
 
-LICENSE="QPL"
+LICENSE="trolltech_PUL-1.0"
 SLOT="0"
 KEYWORDS="x86"
 RESTRICT="nomirror nostrip"
diff --git a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2.ebuild b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild
index 17e6078c77a0..84f901cd7597 100644
--- a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2.ebuild
+++ b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild
@@ -1,46 +1,39 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.6.2.ebuild,v 1.2 2004/01/12 20:06:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild,v 1.1 2004/04/07 06:15:34 nerdboy Exp $
 
 IUSE="X"
 
-inherit virtualx
+inherit rpm
 
-BV=1.6.2-1
+REV=-1
 QD="/opt/Qtopia"
 S="${WORKDIR}"
 
 DESCRIPTION="Qtopia Deskyop sync application for Zaurus PDA's"
-SRC_URI="ftp://ftp.trolltech.com/qtopia/desktop/RedHat9.0/qtopia-desktop-${BV}rh9.i386.rpm"
+SRC_URI="ftp://ftp.trolltech.com/qtopia/desktop/RedHat9.0/qtopia-desktop-${PV}${REV}rh9.i386.rpm"
 HOMEPAGE="http://www.trolltech.com/download/qtopia/"
 
-DEPEND="app-arch/rpm2targz
-virtual/glibc"
+DEPEND="virtual/glibc"
 RDEPEND="virtual/x11"
 
-LICENSE="QPL"
+LICENSE="trolltech_PUL-1.0"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 RESTRICT="nomirror nostrip"
 
-src_unpack() {
-
-	cd ${WORKDIR}
-	TMPDIR=${T} rpm2targz ${DISTDIR}/qtopia-desktop-${BV}rh9.i386.rpm
-	tar xvzf qtopia-desktop-${BV}rh9.i386.tar.gz || die
-}
-
 src_install() {
-
 	dodir ${QD}
-	insinto ${QD}/qtopiadesktop/bin ; doins opt/Qtopia/qtopiadesktop/bin/*
+	exeinto ${QD}/qtopiadesktop/bin ; doexe opt/Qtopia/qtopiadesktop/bin/assistant
 	insinto ${QD}/qtopiadesktop/doc/en ; doins opt/Qtopia/qtopiadesktop/doc/en/*
 	insinto ${QD}/qtopiadesktop/doc/de ; doins opt/Qtopia/qtopiadesktop/doc/de/*
-	insinto ${QD}/qtopiadesktop/doc ; doins opt/Qtopia/qtopiadesktop/doc/*
 	insinto ${QD}/qtopiadesktop/etc ; doins opt/Qtopia/qtopiadesktop/etc/*
-	insinto ${QD}/qtopiadesktop/plugins ; doins opt/Qtopia/qtopiadesktop/plugins/*
+	insinto ${QD}/qtopiadesktop/pics ; doins opt/Qtopia/qtopiadesktop/pics/*
+	exeinto ${QD}/qtopiadesktop/plugins ; doexe opt/Qtopia/qtopiadesktop/plugins/*
 	insinto ${QD}/lib ; doins opt/Qtopia/lib/*
 	exeinto ${QD}/bin ; doexe opt/Qtopia/bin/qtopiadesktop
+	newdoc /opt/Qtopia/qtopiadesktop/bin/README README.assistant
+	newdoc opt/Qtopia/LICENSE.PERSONAL_USE LICENSE
 	dodir /etc/env.d
 	echo "PATH=${QD}/bin" > ${D}/etc/env.d/37qtopia-desktop-bin
 }
@@ -48,7 +41,7 @@ src_install() {
 pkg_postinst() {
 
 	einfo "******************************************************************"
-	einfo " Finished installing Qtopia Desktop into ${QD}"
+	einfo " Finished installing Qtopia Desktop ${PV}${REV} into ${QD}"
 	einfo
 	einfo " To start Qtopia Desktop, run:"
 	einfo