Moved to stable on x86.

5 files changed, 10 insertions, 87 deletions

diff --git a/app-pda/jpilot/ChangeLog b/app-pda/jpilot/ChangeLog
index 2416ad3ca04a..4d25d0c2b4c0 100644
--- a/app-pda/jpilot/ChangeLog
+++ b/app-pda/jpilot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/jpilot
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.9 2004/01/14 00:11:00 strider Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.10 2004/02/14 06:28:24 strider Exp $
+
+  14 Feb 2004; Adrian Almenar <strider@gentoo.org> jpilot-0.99.6-r1.ebuild,
+  jpilot-0.99.6.ebuild:
+  Moved to stable on x86.
 
   13 Jan 2003; Adrian Almenar <strider@gentoo.org> jpilot-0.99.6-r1.ebuild:
   Fixes #37633. Thanks Grant Goodyear <g2boojum@gentoo.org> for the fix. 
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index a413638da00c..efc58df682e1 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -1,10 +1,8 @@
-MD5 9a3371326540f72ceb3d1a9369c33592 jpilot-0.99.6.ebuild 2194
 MD5 58ea5fdbff8aca65b4ffbcbf53b54485 jpilot-0.99.5.ebuild 1889
-MD5 d9acac1a74aa63ff4c933110ec28d1c7 jpilot-0.99.6-r1.ebuild 2270
+MD5 f092a65fb5856c189d7187371b154aec jpilot-0.99.6-r1.ebuild 2269
 MD5 34c46453a9eaec0d549fefd4ca289d65 jpilot-0.99.2-r1.ebuild 1808
-MD5 64f7bca01c72562f212d82501e3b0b9e ChangeLog 3086
+MD5 1f27aafc10da3c633990784a014d37e8 ChangeLog 3214
 MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 MD5 fec9283977e434f78771d9dc3b05569f files/digest-jpilot-0.99.5 208
-MD5 a7d9f40520d6a14eb9e4c3368ca41785 files/digest-jpilot-0.99.6 208
 MD5 772a9edf8c450460098e6af60fee716d files/digest-jpilot-0.99.2-r1 205
 MD5 3191fb2564846c9ad2faa29463b178a6 files/digest-jpilot-0.99.6-r1 208
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.6 b/app-pda/jpilot/files/digest-jpilot-0.99.6
deleted file mode 100644
index 065d69848fe4..000000000000
--- a/app-pda/jpilot/files/digest-jpilot-0.99.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1572138321ce6759c65ecf83b8c84ef4 jpilot-0.99.6.tar.gz 1162066
-MD5 b6342df8559a53a51cf3294ac06ed992 malsync_2.1.1.src.tar.gz 171745
-MD5 fdfb0bbaaa6651f4389cc13eb44066f9 jpilot-syncmal_0.71.2.tar.gz 299645
diff --git a/app-pda/jpilot/jpilot-0.99.6-r1.ebuild b/app-pda/jpilot/jpilot-0.99.6-r1.ebuild
index deb49148384d..b4e60a5ab8f7 100644
--- a/app-pda/jpilot/jpilot-0.99.6-r1.ebuild
+++ b/app-pda/jpilot/jpilot-0.99.6-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/jpilot/jpilot-0.99.6-r1.ebuild,v 1.3 2004/01/14 00:11:00 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.6-r1.ebuild,v 1.4 2004/02/14 06:28:24 strider Exp $
 
 SYNCMAL="0.72.1"
 MALSYNC="2.2.0"
@@ -16,7 +16,7 @@ HOMEPAGE="http://jpilot.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 ~sparc ~alpha"
 IUSE="nls gtk2"
 
 RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
diff --git a/app-pda/jpilot/jpilot-0.99.6.ebuild b/app-pda/jpilot/jpilot-0.99.6.ebuild
deleted file mode 100644
index 568563775b0d..000000000000
--- a/app-pda/jpilot/jpilot-0.99.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.6.ebuild,v 1.2 2003/11/12 23:38:37 liquidx Exp $
-
-SYNCMAL="0.71.2"
-MALSYNC="2.1.1"
-DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
-SRC_URI="http://jpilot.org/${P}.tar.gz
-	http://www.tomw.org/malsync/malsync_${MALSYNC}.src.tar.gz
-	http://jasonday.home.att.net/code/syncmal/jpilot-syncmal_${SYNCMAL}.tar.gz"
-HOMEPAGE="http://jpilot.org/"
-
-# In order to use the malsync plugin you'll need to refer to the homepage
-# for jpilot-syncmal http://jasonday.home.att.net/code/syncmal/
-# And you'll also need an avangto account.
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha"
-IUSE="nls gtk2"
-
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( >=x11-libs/gtk+-1.2 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	>=app-pda/pilot-link-0.11.5"
-
-DEPEND="${RDEPEND}
-	gtk2? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack jpilot-syncmal_${SYNCMAL}.tar.gz
-	cd ${S}/jpilot-syncmal_${SYNCMAL}
-	unpack malsync_${MALSYNC}.src.tar.gz
-}
-
-src_compile() {
-	econf $(use_enable gtk2) \
-		$(use_enable nls) \
-		${myconf} || die "configure failed"
-
-	# make sure we use $CFLAGS
-	sed -i "s/-g -O2/${CFLAGS}/" Makefile
-	emake || die "make failed"
-
-	# build malsync plugin
-	cd ${S}/jpilot-syncmal_${SYNCMAL}
-	econf $(use_enable gtk2) \
-		${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	# work around for broken Makefile
-	dodir /usr/bin
-
-	einstall \
-		docdir=${D}/usr/share/doc/${PF} \
-		icondir=${D}/usr/share/doc/${PF}/icons \
-		desktopdir=${D}/usr/share/applications || die "install failed"
-
-	insinto /usr/lib/jpilot/plugins
-	doins jpilot-syncmal_${SYNCMAL}/.libs/libsyncmal.so
-
-	dodoc README TODO UPGRADING ABOUT-NLS BUGS ChangeLog COPYING INSTALL
-	doman docs/*.1
-
-	newdoc jpilot-syncmal_${SYNCMAL}/ChangeLog ChangeLog.jpilot-syncmal
-	newdoc jpilot-syncmal_${SYNCMAL}/README README.jpilot-syncmal
-	dodoc jpilot-syncmal_${SYNCMAL}/malsync/Doc/README_AvantGo
-	dodoc jpilot-syncmal_${SYNCMAL}/malsync/Doc/README_malsync
-}