Remove obsolete version. Version bump - the new ebuild use custom made (from upstream svn) source tarball instead the binary RPM (see bug 127966).

(Portage version: 2.0.54)

7 files changed, 290 insertions, 51 deletions

diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog
index 064bd3c685b2..bcceb50c43d0 100644
--- a/app-mobilephone/bitpim/ChangeLog
+++ b/app-mobilephone/bitpim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-mobilephone/bitpim
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.9 2006/03/23 23:57:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.10 2006/04/22 12:52:26 mrness Exp $
+
+*bitpim-0.8.12 (22 Apr 2006)
+
+  22 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  +files/bitpim-0.8.12-gentoo.patch, -bitpim-0.8.07.ebuild,
+  +bitpim-0.8.12.ebuild:
+  Remove obsolete version. Version bump - the new ebuild use custom made
+  (from upstream svn) source tarball instead the binary RPM (see bug 127966).
 
   23 Mar 2006; Alin Nastac <mrness@gentoo.org> -bitpim-0.7.33.ebuild,
   -bitpim-0.7.34.ebuild, -bitpim-0.8.04.ebuild, bitpim-0.8.07.ebuild,
diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest
index bdd6885f86bb..cf61cca73276 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 000721a1e8ba856bd489d3e5713e6509 ChangeLog 1987
-MD5 17f43ba780ac1c3f6c9fc56c78e0ac3c bitpim-0.8.07.ebuild 887
 MD5 988001e6838973894fa89082d8bc8b01 bitpim-0.8.08.ebuild 887
-MD5 346ebc8ddd528ad678d42a777c8471f9 files/digest-bitpim-0.8.07 71
+MD5 63c0043887a7701ff2d9093fbf5331b4 bitpim-0.8.12.ebuild 4192
+MD5 60182eac75105fa28b21d105619c32ce files/bitpim-0.8.12-gentoo.patch 3865
 MD5 0a0ef0672d7c7ddda19e132a49ca1a71 files/digest-bitpim-0.8.08 71
+MD5 fcfa1e2142b56a6591a3c48b68708f4e files/digest-bitpim-0.8.12 67
 MD5 b05575cd16c40945a62bcfee6f1fce07 metadata.xml 493
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEIzYAjG8pv1lIUX4RAnfaAJ97E4v6cc6RSqOaFDe0AMTP8sZEcQCaAxI4
-dTvFIoIsR5Vt4cX9JTXi43A=
-=PC23
------END PGP SIGNATURE-----
diff --git a/app-mobilephone/bitpim/bitpim-0.8.07.ebuild b/app-mobilephone/bitpim/bitpim-0.8.07.ebuild
deleted file mode 100644
index 7316d9d681cb..000000000000
--- a/app-mobilephone/bitpim/bitpim-0.8.07.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.8.07.ebuild,v 1.6 2006/03/23 23:57:34 mrness Exp $
-
-inherit eutils rpm
-
-DESCRIPTION="BitPim is a program that allows you to view and manipulate data on selected cellular phones."
-HOMEPAGE="http://www.bitpim.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}-0.i386.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RESTRICT="nostrip"
-
-RDEPEND="=virtual/libstdc++-3.3
-	=x11-libs/gtk+-2.8.8*
-	amd64? ( app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-compat )"
-
-S="${WORKDIR}"
-
-src_install() {
-	cd "${S}/usr/bin"
-	exeinto /usr/bin
-	doexe bitfling bitpim
-
-	cd "${S}/usr/lib"
-	insinto /usr/lib
-	insopts -m0644
-	doins -r "${P}"
-
-	cd "${D}/usr/lib/${P}"
-	chmod a+x *.so *.so.* bp helpers/*
-}
diff --git a/app-mobilephone/bitpim/bitpim-0.8.12.ebuild b/app-mobilephone/bitpim/bitpim-0.8.12.ebuild
new file mode 100644
index 000000000000..8113c0e401b3
--- /dev/null
+++ b/app-mobilephone/bitpim/bitpim-0.8.12.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.8.12.ebuild,v 1.1 2006/04/22 12:52:26 mrness Exp $
+
+inherit distutils
+
+DESCRIPTION="This program allows you to view and manipulate data on LG VX4400/VX6000 and many Sanyo Sprint mobile phones"
+HOMEPAGE="http://www.bitpim.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt usb evo"
+
+DEPEND=">=dev-python/wxpython-2.6.3.2
+	>=dev-python/apsw-3
+	>=dev-python/python-dsv-1.4.0
+	>=dev-python/pyserial-2.0
+	crypt? ( >=dev-python/paramiko-1.5.4 )
+	usb? ( >=dev-lang/swig-1.3.21 >=dev-libs/libusb-0.1.10a )"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+	media-libs/netpbm"
+
+#pkg_setup() { maketarball; } #Uncomment this line when you want to make the tarball
+maketarball() { #For building the tarball. To be used only by ebuild maintainers
+	local x
+	#Fetch the source (only those directories that are needed)
+	cd "${DISTDIR}" && mkdir ${P} || return 1
+	for x in resources src ; do
+		svn export https://svn.sourceforge.net/svnroot/${PN}/releases/${PV}/${x} ${P}/${x} || return 1
+	done
+
+	#Remove unneeded stuff
+	rm resources/*.chm
+
+	#Make the tarball
+	tar -cjf ${P}.tar.bz2 ${P}
+	rm -r ${P}
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	sed -i "s/python2.3/${python}/" "${S}/src/native/usb/build.sh"
+}
+
+src_compile() {
+	# USB stuff
+	if use usb; then
+		cd "${S}/src/native/usb" || die "compilation of native/usb failed"
+		sh ./build.sh
+	fi
+
+	# strings
+	cd "${S}/src/native/strings"
+	${python} setup.py build || die "compilation of native/strings failed"
+
+	# bmp2avi
+	cd "${S}/src/native/av/bmp2avi"
+	PLATFORM=linux make || die "compilation of native/bmp2avi failed"
+}
+
+src_install() {
+	cd "${S}"
+
+	# Install files into right place
+	#
+	# BitPim is a self-contained app, so jamming it into 
+	# Python's site-packages might not be worthwhile.  We'll
+	# Put it in its own home, and add the PYTHONPATH in the 
+	# wrapper executables below.
+	distutils_python_version
+	local RLOC=/usr/lib/${P}
+
+	# Main Python source
+	insinto ${RLOC}
+	doins src/*.py
+
+	# Phone specifics
+	insinto ${RLOC}/phones
+	doins src/phones/*.py
+
+	# Native products
+	insinto ${RLOC}/native
+	doins src/native/*.py
+	insinto ${RLOC}/native/qtopiadesktop
+	doins src/native/qtopiadesktop/*.py
+	insinto ${RLOC}/native/outlook
+	doins src/native/outlook/*.py
+	insinto ${RLOC}/native/egroupware
+	doins src/native/egroupware/*.py
+	if use evo ; then
+		insinto ${RLOC}/native/evolution
+		doins src/native/evolution/*.py
+	fi
+
+	# strings
+	cd "${S}/src/native/strings"
+	${python} setup.py install --root="${D}" --no-compile "$@" || die "install of native/strings failed"
+	cd "${S}"
+	insinto $RLOC/native/strings
+	doins src/native/strings/__init__.py src/native/strings/jarowpy.py
+
+	# usb
+	if use usb; then
+		insinto ${RLOC}/native/usb
+		doins src/native/usb/*.py
+		doins src/native/usb/*.so
+	fi
+
+	# Helpers and resources
+	dobin src/native/av/bmp2avi/bmp2avi
+	insinto ${RLOC}/resources
+	doins resources/*
+
+	# Bitfling
+	if use crypt; then
+		FLINGDIR="${RLOC}/bitfling"
+		insinto $FLINGDIR
+		cd "${S}/src/bitfling"
+		doins *.py
+		cd "${S}"
+	fi
+
+	# Creating scripts
+	echo '#!/bin/sh' > "${T}/bitpim"
+	echo "export PYTHONPATH='$RLOC:$PYTHONPATH'" >> "${T}/bitpim"
+	echo "exec python ${RLOC}/bp.py bitpim" >> "${T}/bitpim"
+	dobin "${T}/bitpim"
+	if use crypt; then
+		echo '#!/bin/sh' > "${T}/bitfling"
+		echo "export PYTHONPATH='$RLOC:$PYTHONPATH'" >> "${T}/bitfling"
+		echo "exec python ${RLOC}/bp.py bitfling" >> "${T}/bitfling"
+		dobin "${T}/bitfling"
+	fi
+
+	# Desktop file
+	insinto /usr/share/applications
+	cat <<EOF > "${T}/bitpim.desktop"
+[Desktop Entry]
+Name=BitPim
+Comment=CDMA Mobile Phone Tool
+Encoding=UTF-8
+Exec=/usr/bin/bitpim
+Icon=${RLOC}/resources/bitpim.ico
+Terminal=0
+Type=Application
+Categories=Application;Calendar;ContactManagement;Utility;
+EOF
+	doins "${T}/bitpim.desktop"
+}
+
+pkg_postinst() {
+	# Optimize in installed directory
+	python_mod_optimize "${ROOT}/usr/lib/${P}"
+
+	# Helpful message re. support
+	einfo "For support information please visit http://bitpim.org/"
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup "${ROOT}/usr/lib/${P}"
+}
diff --git a/app-mobilephone/bitpim/files/bitpim-0.8.12-gentoo.patch b/app-mobilephone/bitpim/files/bitpim-0.8.12-gentoo.patch
new file mode 100644
index 000000000000..03ff947a2145
--- /dev/null
+++ b/app-mobilephone/bitpim/files/bitpim-0.8.12-gentoo.patch
@@ -0,0 +1,110 @@
+diff -Nru bitpim-0.8.12.orig/src/common.py bitpim-0.8.12/src/common.py
+--- bitpim-0.8.12.orig/src/common.py	2006-04-11 05:50:29.000000000 +0300
++++ bitpim-0.8.12/src/common.py	2006-04-20 20:13:54.116823750 +0300
+@@ -681,4 +681,4 @@
+         # windows running from exe, return as is
+         return os.path.abspath(os.path.dirname(sys.executable))
+     # running from src, up one
+-    return os.path.split(os.path.abspath(os.path.dirname(sys.argv[0])))[0]
++    return os.path.abspath(os.path.dirname(sys.argv[0]))
+diff -Nru bitpim-0.8.12.orig/src/conversions.py bitpim-0.8.12/src/conversions.py
+--- bitpim-0.8.12.orig/src/conversions.py	2006-03-04 01:37:32.000000000 +0200
++++ bitpim-0.8.12/src/conversions.py	2006-04-20 20:13:54.116823750 +0300
+@@ -20,11 +20,11 @@
+ 
+ class ConversionFailed(Exception): pass
+ 
+-helperdir=os.path.join(common.get_main_dir(), "helpers")
++helperdir="/usr/bin"
+ 
+ osext={'win32': '.exe',
+        'darwin': '.mbin',
+-       'linux2': '.lbin'} \
++       'linux2': ''} \
+        [sys.platform]
+ 
+ # This shortname crap is needed because Windows programs (including ffmpeg)
+@@ -125,14 +125,14 @@
+     p=sys.path[0]
+     if os.path.isfile(p):
+         p=os.path.dirname(p)
+-    helpersdirectory=os.path.abspath(os.path.join(p, 'helpers'))
++    helpersdirectory="/usr/bin"
+     print "Helper Directory: "+helpersdirectory
+     if sys.platform=='win32':
+         osext=".exe"
+     if sys.platform=='darwin':
+         osext=".mbin"
+     if sys.platform=='linux2':
+-        osext=".lbin"
++        osext=""
+         
+     pngtopnmbin=gethelperbinary('pngtopnm')
+     ppmquantbin=gethelperbinary('ppmquant')
+diff -Nru bitpim-0.8.12.orig/src/native/av/bmp2avi/Makefile bitpim-0.8.12/src/native/av/bmp2avi/Makefile
+--- bitpim-0.8.12.orig/src/native/av/bmp2avi/Makefile	2005-02-18 08:55:03.000000000 +0200
++++ bitpim-0.8.12/src/native/av/bmp2avi/Makefile	2006-04-20 20:15:01.029005500 +0300
+@@ -11,9 +11,6 @@
+ $(error PLATFORM not defined.  Valid PLATFORM are windows, linux, mac)
+ endif
+ 
+-CXXFLAGS=
+-LDFLAGS=
+-
+ ifeq ($(PLATFORM), windows)
+ EXT=exe
+ # define this for cygwin/mingw
+@@ -22,7 +19,7 @@
+ endif
+ 
+ ifeq ($(PLATFORM), linux)
+-EXT=lbin
++EXT=
+ endif
+ 
+ ifeq ($(PLATFORM), mac)
+@@ -31,13 +28,9 @@
+ CXXFLAGS+=-D__BIG_ENDIAN__
+ endif
+ 
+-ifeq ($(EXT),)
+-$(error PLATFORM $(PLATFORM) is invalid.  Valid PLATFORM are windows, linux, mac)
+-endif
+-
+ SRC=avi_file.cxx bmp_file.cxx b2a.cxx
+ OBJ=$(SRC:.cxx=.o)
+-EXE=bmp2avi.$(EXT)
++EXE=bmp2avi
+ CXX=g++
+ 
+ all: $(EXE)
+diff -Nru bitpim-0.8.12.orig/src/package.py bitpim-0.8.12/src/package.py
+--- bitpim-0.8.12.orig/src/package.py	2006-03-21 06:13:27.000000000 +0200
++++ bitpim-0.8.12/src/package.py	2006-04-20 20:13:54.140825250 +0300
+@@ -116,7 +116,7 @@
+         exts=exts+['*.chm', '*.manifest', '*.ico']
+         exts=exts+['helpers/*.exe','helpers/*.dll']
+     if sys.platform=='linux2':
+-        exts=exts+['helpers/*.lbin', '*.htb']
++        exts=exts+['*.htb']
+     if sys.platform=='darwin':
+         exts=exts+['helpers/*.mbin', '*.htb']
+     # list of directories to look in
+@@ -203,7 +203,7 @@
+ def copyresources(destdir):
+     import packageutils
+     packageutils.copysvndir('resources', os.path.join(destdir, 'resources'), resourcefilter)
+-    packageutils.copysvndir('helpers', os.path.join(destdir, 'helpers'), resourcefilter)
++    # packageutils.copysvndir('helpers', os.path.join(destdir, 'helpers'), resourcefilter)
+ 
+ def resourcefilter(srcfilename, destfilename):
+     exts=[ '.xy', '.png', '.ttf', '.wav', '.jpg', '.css', '.pdc', '.ids', '.ico']
+@@ -211,7 +211,7 @@
+         # on windows we also want the chm help file 
+         exts=exts+['.chm', '.exe', '.dll']
+     if sys.platform=='linux2':
+-        exts=exts+['.lbin', '.htb']
++        exts=exts+['.htb']
+     if sys.platform=='darwin':
+         exts=exts+['.mbin', '.htb']
+     if os.path.splitext(srcfilename)[1] in exts:
diff --git a/app-mobilephone/bitpim/files/digest-bitpim-0.8.07 b/app-mobilephone/bitpim/files/digest-bitpim-0.8.07
deleted file mode 100644
index f6a708e3b1bd..000000000000
--- a/app-mobilephone/bitpim/files/digest-bitpim-0.8.07
+++ /dev/null
@@ -1 +0,0 @@
-MD5 28571845d01986ea59f1befcf2b58552 bitpim-0.8.07-0.i386.rpm 13237777
diff --git a/app-mobilephone/bitpim/files/digest-bitpim-0.8.12 b/app-mobilephone/bitpim/files/digest-bitpim-0.8.12
new file mode 100644
index 000000000000..e3369bf86b30
--- /dev/null
+++ b/app-mobilephone/bitpim/files/digest-bitpim-0.8.12
@@ -0,0 +1 @@
+MD5 a74f129a435ca2d83fb5410313e3ffe4 bitpim-0.8.12.tar.bz2 3650172