diff options
| -rw-r--r-- | app-mobilephone/bitpim/ChangeLog | 9 | ||||
| -rw-r--r-- | app-mobilephone/bitpim/Manifest | 13 | ||||
| -rw-r--r-- | app-mobilephone/bitpim/bitpim-0.9.00.ebuild (renamed from app-mobilephone/bitpim/bitpim-0.8.12.ebuild) | 40 | ||||
| -rw-r--r-- | app-mobilephone/bitpim/files/bitpim-0.9.00-gentoo.patch | 54 | ||||
| -rw-r--r-- | app-mobilephone/bitpim/files/digest-bitpim-0.8.12 | 1 | ||||
| -rw-r--r-- | app-mobilephone/bitpim/files/digest-bitpim-0.9.00 | 1 |
6 files changed, 88 insertions, 30 deletions
diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog index 1edb68b0420e..c730790b9677 100644 --- a/app-mobilephone/bitpim/ChangeLog +++ b/app-mobilephone/bitpim/ChangeLog @@ -1,6 +1,13 @@ # 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.12 2006/04/26 16:04:41 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.13 2006/06/02 20:19:53 mrness Exp $ + +*bitpim-0.9.00 (02 Jun 2006) + + 02 Jun 2006; Alin Nastac <mrness@gentoo.org> + +files/bitpim-0.9.00-gentoo.patch, -bitpim-0.8.12.ebuild, + +bitpim-0.9.00.ebuild: + Version bump. *bitpim-0.8.13 (26 Apr 2006) diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest index d0d8708a102b..8520a1a924d6 100644 --- a/app-mobilephone/bitpim/Manifest +++ b/app-mobilephone/bitpim/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 ee478f9477ab1e24abb4ca3c4d738c58 ChangeLog 2526 +MD5 8da69896c196c2961004bbd534b8955e ChangeLog 2705 MD5 988001e6838973894fa89082d8bc8b01 bitpim-0.8.08.ebuild 887 -MD5 e194319727b4ccc10d97512676768b51 bitpim-0.8.12.ebuild 4248 MD5 4b0a09fc42a975d8b89cbb8f93b02be4 bitpim-0.8.13.ebuild 4310 +MD5 3c79ccadaaca5ce60588510678bff12e bitpim-0.9.00.ebuild 4310 MD5 60182eac75105fa28b21d105619c32ce files/bitpim-0.8.12-gentoo.patch 3865 MD5 20dd7fd8dde56060531f87cc7a6d3971 files/bitpim-0.8.13-gentoo.patch 2482 +MD5 697098050c09fa34e19f9683cfb0036a files/bitpim-0.9.00-gentoo.patch 2100 MD5 0a0ef0672d7c7ddda19e132a49ca1a71 files/digest-bitpim-0.8.08 71 -MD5 fcfa1e2142b56a6591a3c48b68708f4e files/digest-bitpim-0.8.12 67 MD5 923f2a8f3c714afebffa1c6365188579 files/digest-bitpim-0.8.13 67 +MD5 16da974e3ead39c0c577e05d1e2c2300 files/digest-bitpim-0.9.00 67 MD5 b05575cd16c40945a62bcfee6f1fce07 metadata.xml 493 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFET7lMjG8pv1lIUX4RAjFSAKCQNf1LlCDkLQfl79qAL2mzrKrBcQCfWg5H -Iv165OgDInihEotHIozv8jo= -=xqYl +iD8DBQFEgJ10jG8pv1lIUX4RAmnNAKC0u2cnktiyVVBnlgGt0Npplxa/dgCdGFg+ +lYUHn69M6JBsGOtBeylmbMA= +=XN0a -----END PGP SIGNATURE----- diff --git a/app-mobilephone/bitpim/bitpim-0.8.12.ebuild b/app-mobilephone/bitpim/bitpim-0.9.00.ebuild index 8113c0e401b3..5a34ebacbffa 100644 --- a/app-mobilephone/bitpim/bitpim-0.8.12.ebuild +++ b/app-mobilephone/bitpim/bitpim-0.9.00.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.9.00.ebuild,v 1.1 2006/06/02 20:19:53 mrness Exp $ inherit distutils @@ -23,17 +23,27 @@ RDEPEND="${DEPEND} media-video/ffmpeg media-libs/netpbm" -#pkg_setup() { maketarball; } #Uncomment this line when you want to make the tarball +#For Gentoo devs only: uncomment this line when you want to make the tarball +#then COMMENT IT BACK! +#pkg_setup() { maketarball; } maketarball() { #For building the tarball. To be used only by ebuild maintainers - local x + local x svnrev + svnrev=$(svn log -q --limit 1 https://svn.sourceforge.net/svnroot/${PN}/releases/${PV} | sed -r '/^[^r]/d;s/^r([0-9]+) .*$/\1/') + [ $? = 0 ] || return 1 + #Fetch the source (only those directories that are needed) cd "${DISTDIR}" && mkdir ${P} || return 1 - for x in resources src ; do + for x in resources packaging src ; do svn export https://svn.sourceforge.net/svnroot/${PN}/releases/${PV}/${x} ${P}/${x} || return 1 done #Remove unneeded stuff - rm resources/*.chm + rm ${P}/resources/*.chm ${P}/src/package.py + + #Freeze version and set vendor name to Gentoo + sed -i -e 's/\(^__FROZEN__="[$]Id: \).*\( $"\)/\1'${svnrev}'\2/' \ + -e 's/^vendor=".*"/vendor="Gentoo"/' \ + ${P}/src/version.py || return 1 #Make the tarball tar -cjf ${P}.tar.bz2 ${P} @@ -127,38 +137,24 @@ src_install() { # 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" + sed -i -e "s|%%INSTALLBINDIR%%|/usr/bin|" -e "s|%%INSTALLLIBDIR%%|${RLOC}|" \ + packaging/bitpim.desktop + doins packaging/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() { diff --git a/app-mobilephone/bitpim/files/bitpim-0.9.00-gentoo.patch b/app-mobilephone/bitpim/files/bitpim-0.9.00-gentoo.patch new file mode 100644 index 000000000000..ba656a7a92bb --- /dev/null +++ b/app-mobilephone/bitpim/files/bitpim-0.9.00-gentoo.patch @@ -0,0 +1,54 @@ +diff -Nru bitpim-0.9.00.orig/src/common.py bitpim-0.9.00/src/common.py +--- bitpim-0.9.00.orig/src/common.py 2006-04-13 06:13:47.000000000 +0300 ++++ bitpim-0.9.00/src/common.py 2006-06-02 22:51:56.384073500 +0300 +@@ -848,4 +848,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.9.00.orig/src/conversions.py bitpim-0.9.00/src/conversions.py +--- bitpim-0.9.00.orig/src/conversions.py 2006-03-04 01:37:32.000000000 +0200 ++++ bitpim-0.9.00/src/conversions.py 2006-06-02 22:51:56.384073500 +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.9.00.orig/src/native/av/bmp2avi/Makefile bitpim-0.9.00/src/native/av/bmp2avi/Makefile +--- bitpim-0.9.00.orig/src/native/av/bmp2avi/Makefile 2006-05-05 10:10:08.000000000 +0300 ++++ bitpim-0.9.00/src/native/av/bmp2avi/Makefile 2006-06-02 22:59:09.295128750 +0300 +@@ -13,6 +13,6 @@ + + SRC=avi_file.cxx bmp_file.cxx b2a.cxx + +-bmp2avi.lbin bmp2avi.mbin bmp2avi.exe: $(SRC) ++bmp2avi bmp2avi.mbin bmp2avi.exe: $(SRC) + $(CXX) $(EXTRADEFINES) -O2 -o $@ $(SRC) + diff --git a/app-mobilephone/bitpim/files/digest-bitpim-0.8.12 b/app-mobilephone/bitpim/files/digest-bitpim-0.8.12 deleted file mode 100644 index e3369bf86b30..000000000000 --- a/app-mobilephone/bitpim/files/digest-bitpim-0.8.12 +++ /dev/null @@ -1 +0,0 @@ -MD5 a74f129a435ca2d83fb5410313e3ffe4 bitpim-0.8.12.tar.bz2 3650172 diff --git a/app-mobilephone/bitpim/files/digest-bitpim-0.9.00 b/app-mobilephone/bitpim/files/digest-bitpim-0.9.00 new file mode 100644 index 000000000000..1f76ed2af7f0 --- /dev/null +++ b/app-mobilephone/bitpim/files/digest-bitpim-0.9.00 @@ -0,0 +1 @@ +MD5 5ebb17b25b0cf96402f6a9a367c92935 bitpim-0.9.00.tar.bz2 3795414 |