summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-pda/qtopia-desktop-bin/ChangeLog11
-rw-r--r--app-pda/qtopia-desktop-bin/files/digest-qtopia-desktop-bin-1.7.02
-rw-r--r--app-pda/qtopia-desktop-bin/files/digest-qtopia-desktop-bin-2.2.03
-rw-r--r--app-pda/qtopia-desktop-bin/files/usb0.conf32
-rw-r--r--app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild14
-rw-r--r--app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild78
6 files changed, 132 insertions, 8 deletions
diff --git a/app-pda/qtopia-desktop-bin/ChangeLog b/app-pda/qtopia-desktop-bin/ChangeLog
index b90f23ea4c34..5521f8008243 100644
--- a/app-pda/qtopia-desktop-bin/ChangeLog
+++ b/app-pda/qtopia-desktop-bin/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-pda/qtopia-desktop-bin
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/ChangeLog,v 1.10 2005/01/01 15:47:30 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/ChangeLog,v 1.11 2006/07/09 05:16:20 nerdboy Exp $
+
+*qtopia-desktop-bin-2.2.0 (09 Jul 2006)
+
+ 09 Jul 2006; Steve Arnold <nerdboy@gentoo.org> +files/usb0.conf,
+ -qtopia-desktop-bin-1.6.2-r1.ebuild, +qtopia-desktop-bin-2.2.0.ebuild
+ qtopia-desktop-bin-1.7.0.ebuild:
+ Added new upstream version with multilib support and updated to modular X.
26 Nov 2004; Steve Arnold <nerdboy@gentoo.org>
qtopia-desktop-bin-1.6.2-r1.ebuild, qtopia-desktop-bin-1.7.0.ebuild:
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
index 0ad6d0051e79..c905a5fd2ca9 100644
--- 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
@@ -1 +1,3 @@
MD5 ee340a07ca1908204c4ded462f9304c4 qtopia-desktop-1.7.0-1rh9.i386.rpm 6081706
+RMD160 af4636e0c19fd6e9886722cb11f666efb5b95a38 qtopia-desktop-1.7.0-1rh9.i386.rpm 6081706
+SHA256 416ffc2bbeb6f6f382b438399ffa4b6cccc07e3e062edefa7f65a2d67ca4f919 qtopia-desktop-1.7.0-1rh9.i386.rpm 6081706
diff --git a/app-pda/qtopia-desktop-bin/files/digest-qtopia-desktop-bin-2.2.0 b/app-pda/qtopia-desktop-bin/files/digest-qtopia-desktop-bin-2.2.0
new file mode 100644
index 000000000000..e77c26d2768b
--- /dev/null
+++ b/app-pda/qtopia-desktop-bin/files/digest-qtopia-desktop-bin-2.2.0
@@ -0,0 +1,3 @@
+MD5 7db6cab2ceb71f8978d315c76754eb10 qtopia-desktop-2.2.0-1-redhat9.i386.rpm 9777987
+RMD160 23f49012c225654ca3406f0b734e2dc5a2f1c7a0 qtopia-desktop-2.2.0-1-redhat9.i386.rpm 9777987
+SHA256 28607a73bcc7d1cfedbf421508396e4cf612f9b5c10ff8bede80466b00b961e0 qtopia-desktop-2.2.0-1-redhat9.i386.rpm 9777987
diff --git a/app-pda/qtopia-desktop-bin/files/usb0.conf b/app-pda/qtopia-desktop-bin/files/usb0.conf
new file mode 100644
index 000000000000..b04fb48e347b
--- /dev/null
+++ b/app-pda/qtopia-desktop-bin/files/usb0.conf
@@ -0,0 +1,32 @@
+# Add this stanza to /etc/conf.d/net to configure the Zaurus cradle
+# with the standard static IP address. You may need to set the MTU
+# on the Zaurus side to match the usb0 interface here. If the MTU
+# shows as MTU:1494 then add the following line to /etc/network/interfaces
+# on the Zaurus in the 'iface usbd0' section:
+# up ifconfig usbd0 mtu 1494
+
+config_usb0=( "null" )
+
+postup() {
+ local iface=${1}
+ if [ ${iface} == usb0 ] ; then
+ ifconfig usb0 192.168.129.200 netmask 255.255.255.0 up
+ route add -net 192.168.129.0 usb0
+ if interface_exists "eth0" ; then
+ iptables -t nat -F
+ ip=`ifconfig eth0 | grep 'inet addr'|cut -d: -f2|cut -d' ' -f1`
+ # where ${ip} is your desktop ethernet address
+ iptables -t nat -A POSTROUTING -j SNAT -o eth0 --to ${ip}
+ echo 1 > /proc/sys/net/ipv4/ip_forward
+ fi
+ fi
+ return 0
+}
+postdown() {
+ local iface=${1}
+ if [ ${iface} == usb0 ] ; then
+ iptables -t nat -F
+ echo 0 > /proc/sys/net/ipv4/ip_forward
+ fi
+ return 0
+}
diff --git a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild
index 251af9798a3f..ef0a38e5d2db 100644
--- a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild
+++ b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# 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.7.0.ebuild,v 1.6 2005/01/01 15:47:30 eradicator Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-1.7.0.ebuild,v 1.7 2006/07/09 05:16:21 nerdboy Exp $
inherit rpm
@@ -14,12 +12,15 @@ DESCRIPTION="Qtopia Deskyop sync application for Zaurus PDA's"
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="virtual/libc"
-RDEPEND="virtual/x11"
+DEPEND=""
+RDEPEND="virtual/libc
+ || ( x11-libs/libX11 virtual/x11 )"
LICENSE="trolltech_PUL-1.0"
SLOT="0"
KEYWORDS="x86"
+IUSE=""
+
RESTRICT="nomirror nostrip"
src_install() {
@@ -36,6 +37,7 @@ src_install() {
newdoc opt/Qtopia/LICENSE.PERSONAL_USE LICENSE
dodir /etc/env.d
echo "PATH=${QD}/bin" > ${D}/etc/env.d/37qtopia-desktop-bin
+ echo "LDPATH=${QD}/lib" >> ${D}/etc/env.d/37qtopia-desktop-bin
}
pkg_postinst() {
diff --git a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild
new file mode 100644
index 000000000000..97a6400343d1
--- /dev/null
+++ b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild,v 1.1 2006/07/09 05:16:21 nerdboy Exp $
+
+inherit eutils rpm multilib
+
+REV="1"
+QD="/opt/QtopiaDesktop"
+S="${WORKDIR}"
+
+DESCRIPTION="Qtopia Deskyop sync application for Zaurus PDA's"
+SRC_URI="ftp://ftp.trolltech.com/qtopia/desktop/RedHat9.0/qtopia-desktop-${PV}-${REV}-redhat9.i386.rpm"
+HOMEPAGE="http://www.trolltech.com/developer/downloads/qtopia/desktopdownloads"
+
+LICENSE="trolltech_PUL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/libc
+ || ( x11-libs/libX11 virtual/x11 )
+ amd64? ( app-emulation/emul-linux-x86-xlibs )"
+
+RESTRICT="nomirror nostrip"
+
+pkg_setup() {
+ # This is a binary x86 package => ABI=x86
+ has_multilib_profile && ABI="x86"
+}
+
+pkg_unpack() {
+ rpm_src_unpack
+}
+
+src_compile() { :; }
+
+src_install() {
+ dodir ${QD}
+ # Too many subdirs and files for individual ebuild commands
+ # Isn't there a better way?
+ cp -a ${S}/${QD}/qtopiadesktop ${D}${QD}
+ local libdir="lib32"
+ if has_multilib_profile ; then
+ libdir=$(get_abi_LIBDIR x86)
+ fi
+ into ${QD}
+ dolib.so ${S}/${QD}/lib/lib*
+ rm -f ${S}/${QD}/lib/*.prl
+ exeinto ${QD}/bin
+ doexe ${S}/${QD}/bin/*
+ docinto /usr/share/doc/${P}
+ dodoc ${S}/${QD}/LICENSE.US
+ dodoc ${S}/${QD}/README.html
+ dodoc ${FILESDIR}/usb0.conf
+ rm -f ${S}/${QD}/LICENSE*
+ echo "PATH=${QD}/bin" > 37qtopia-desktop-bin
+ echo "LDPATH=${QD}/${libdir}" >> 37qtopia-desktop-bin
+ doenvd 37qtopia-desktop-bin
+}
+
+pkg_postinst() {
+
+ einfo " Finished installing Qtopia Desktop ${PV}-${REV} into ${QD}"
+ einfo
+ einfo " To start Qtopia Desktop, run:"
+ einfo
+ einfo " $ qtopiadesktop"
+ einfo
+ einfo "See the usb0.conf file for a static network configuration for the"
+ einfo "Zaurus cradle interface (it works with an SL-5x00). Note the old"
+ einfo "way of adding a config script to /etc/hotplug/usb also works, but"
+ einfo "depends on the desktop kernel version and module name, since the"
+ einfo "latest 2.6.16 module is cdc_ether for older models of the Zaurus"
+ einfo "(such as above) running OZ with kernel 2.4.x."
+ einfo
+}