diff options
author | Serkan Kaba <serkan@gentoo.org> | 2009-04-26 18:32:54 +0000 |
---|---|---|
committer | Serkan Kaba <serkan@gentoo.org> | 2009-04-26 18:32:54 +0000 |
commit | b0c122cd487350ac462bf09fb71792e83e707dd4 (patch) | |
tree | 603a9633805de744bbb52ba64d462564e98357cc /app-pda | |
parent | Remove old versions. (diff) | |
download | historical-b0c122cd487350ac462bf09fb71792e83e707dd4.tar.gz historical-b0c122cd487350ac462bf09fb71792e83e707dd4.tar.bz2 historical-b0c122cd487350ac462bf09fb71792e83e707dd4.zip |
Revbump to add patch for respecting JAVACFLAGS. Fixes bug #267445.
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64
Diffstat (limited to 'app-pda')
-rw-r--r-- | app-pda/pilot-link/ChangeLog | 9 | ||||
-rw-r--r-- | app-pda/pilot-link/Manifest | 14 | ||||
-rw-r--r-- | app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch | 12 | ||||
-rw-r--r-- | app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild | 136 |
4 files changed, 169 insertions, 2 deletions
diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog index 5363e23e8960..89bc38bcd2cb 100644 --- a/app-pda/pilot-link/ChangeLog +++ b/app-pda/pilot-link/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-pda/pilot-link # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.47 2009/04/18 06:17:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.48 2009/04/26 18:32:54 serkan Exp $ + +*pilot-link-0.12.3-r2 (26 Apr 2009) + + 26 Apr 2009; Serkan Kaba <serkan@gentoo.org> + +files/pilot-link-0.12.3-respect-javacflags.patch, + +pilot-link-0.12.3-r2.ebuild: + Revbump to add patch for respecting JAVACFLAGS. Fixes bug #267445. 18 Apr 2009; Jeroen Roovers <jer@gentoo.org> pilot-link-0.12.3-r1: Marked ~hppa (bug #260777). diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest index 6dbdb4e43abc..47abceb6124d 100644 --- a/app-pda/pilot-link/Manifest +++ b/app-pda/pilot-link/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX pilot-link-0.11.8-gcc43.patch 315 RMD160 10883a1fc53afeeef25a98bd8a432f22c698eb94 SHA1 e61d5305141eea75cc8664a18a1f1daa615be7f9 SHA256 8672a1ddc8ef21d3b359d0148bbb3796929329f3dccfb33877313aa629ce08c1 AUX pilot-link-0.11.8-java_compile_amd64.patch 579 RMD160 7dba17a59a303154acbd640e78f9028b54de0507 SHA1 6903a1624d566733c7336735b3ddbc92c8610e6f SHA256 e2e6ce08665b39c4f945eae58c2554ad9f2bdbf13c8f19cc3cbf01f8f319bf07 AUX pilot-link-0.11.8-java_fPIC_fix.patch 580 RMD160 e6baf868f3474ee35f9de7f655c337d881e025e5 SHA1 85884951133dc58baccb3a9c0bb3e33f12b5ea73 SHA256 b6ebf250b977fa0dc33ed7c72bf9f0624a36b388cd0078159ff6c88f62c7df45 @@ -20,11 +23,20 @@ AUX pilot-link-0.12.3-glibc-open.patch 603 RMD160 dfbff4fe19f702f88f66e10be0c75d AUX pilot-link-0.12.3-int_types.patch 547 RMD160 28381f51c8d200fc65bcc9382cf06e7b1277991c SHA1 85385f31dab548e5d4549f0ee7983bdf3bc75f50 SHA256 903efdb98552f44ac0006f58b11631111b8634e1084d3122f15131af8b4c09bf AUX pilot-link-0.12.3-java-install.patch 823 RMD160 e6999723dd9a71f95f56d704ba6a1f4f1de2e77c SHA1 4bb887091f18c44b3b344d309d673ef56f4096dd SHA256 60f6c9cd3a03adcef22e598f6d497f3095c1e702ac1d4fcac91e84affbc2fe8f AUX pilot-link-0.12.3-png.patch 2166 RMD160 77fbe6b8923b37c7427d396e6b70a5fab702a1ea SHA1 05656782504d716f8bae485ef2dae3ad09f1ab15 SHA256 8f4781f1c88f374b03de28a2952eacdc0efd2d3f8d244b93b1c13cdf7293da42 +AUX pilot-link-0.12.3-respect-javacflags.patch 589 RMD160 7d6f01c53d4741ac914cc1faf99d91e69c49d1ac SHA1 33f91b8333e9525ca67eb6e95ba91f64528affc6 SHA256 6b21cbbb2bde72ca176b0c97531a67fdecb200d7fd35d9eb5c7a67eb731f2386 DIST pilot-link-0.11.8.tar.bz2 649034 RMD160 c51c069810edff6c2e38e4c81f2daa959c902ad4 SHA1 645d4bc49dd4dc4793d13b6e04dd61f24c2bf717 SHA256 952a97df5d13d926f0d5ce487e15268b1400fa0e7c43ea9303fba92818cce1cb DIST pilot-link-0.12.3.tar.bz2 960812 RMD160 938f367a38572d456b37e62ab0d309139b50403b SHA1 d459ec2626ee19367a5329e604e33b337ef37602 SHA256 f5ed3f1d70349ff5ef95e6d1aa5b2ea9ad4b4d720e7d83cacc1003a950d4c476 EBUILD pilot-link-0.11.8-r1.ebuild 2352 RMD160 6cf5e7c22d9170a9a73c3cdbeb44bea821f77e1e SHA1 822b82a957cba0502db6c5b128ee61cb718e0059 SHA256 4421ac75d75d013f726c5d3e84e202cf129c1e59204ccd50fc3b45ae5f0f0acc EBUILD pilot-link-0.11.8.ebuild 1915 RMD160 675605c1533dbae7fa0717374f03e7660d3c8cd5 SHA1 013e6c03cf25bcdc2dd6411d251a414746219a8d SHA256 94c8849b2a388f1726c10834bfcbf62f160eaed29c044437884ac54a5f3b7638 EBUILD pilot-link-0.12.3-r1.ebuild 3407 RMD160 20caaffc96670299b8e2f0d144480538cf19e8de SHA1 4be17909cb839559ae596f2d1b72f30cdf203afa SHA256 a5e24b4a8206326d5b010edaf1ce6768f43adcf1088fc8bf9268253f5a8b7d75 +EBUILD pilot-link-0.12.3-r2.ebuild 3504 RMD160 f916984577f59cc8cde7a865a8cbf210e4b1f497 SHA1 838943058f5272c8352aa66a59cb863b35cb8513 SHA256 1db4005c4008bdc5f4b07e2c8564bf73e656a3f501c527e8e07f3441e69ca6d3 EBUILD pilot-link-0.12.3.ebuild 3339 RMD160 93dcd63da376b75caeab3dc9858ab3834ab15984 SHA1 5288b5bcb9445a675884a30f74384583a7f270bc SHA256 5a80368aec1661211445084d3ba792662cc9643e677cbce8b001b9aba567f1eb -MISC ChangeLog 11157 RMD160 e11c0e2930a26187181b406c369abf02afcd7051 SHA1 8197edcb5ea63c2d159f40c694fcfc5fa720e0fc SHA256 5d164726d269c068a84cfa89e381d2f7da5eb6bce6f93be70a638e6a16117ac3 +MISC ChangeLog 11399 RMD160 0f24da9e390c9185040be46aa1b14a3c6a29b8f7 SHA1 8988da451bc0a3606f0b13bcc984e20b63fc57c3 SHA256 e17c916b960c25a3fddd342d527fdfebcf27ee904e64584b17f5cb436d0a1b65 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkn0qNsACgkQRh6X64ivZaKDNQCfRJbBXpflKo9WUMroXUwq0lCB +dm8An2j3vJP54h9yE+0tsbIGNrj8CjRJ +=hBiQ +-----END PGP SIGNATURE----- diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch new file mode 100644 index 000000000000..92cfaaabd1ab --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch @@ -0,0 +1,12 @@ +diff -Nur pilot-link-0.12.3/bindings/Java/Makefile.am pilot-link-0.12.3_patched/bindings/Java/Makefile.am +--- pilot-link-0.12.3/bindings/Java/Makefile.am 2007-11-09 16:42:41.000000000 +0200 ++++ pilot-link-0.12.3_patched/bindings/Java/Makefile.am 2009-04-26 08:03:30.000000000 +0300 +@@ -70,7 +70,7 @@ + $(java_classes): java_compile + + java_compile: $(java_files) +- $(JAVAC) -d . $(java_files) ++ $(JAVAC) $(JAVACFLAGS) -d . $(java_files) + + java_lib: libjpisock.c + $(CXX) $(INCLUDES) -fPIC $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c diff --git a/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild new file mode 100644 index 000000000000..dfe09dc89757 --- /dev/null +++ b/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild,v 1.1 2009/04/26 18:32:54 serkan Exp $ + +EAPI=2 + +inherit perl-module java-pkg-opt-2 eutils autotools distutils + +DESCRIPTION="suite of tools for moving data between a Palm device and a desktop" +HOMEPAGE="http://www.pilot-link.org/" +SRC_URI="http://pilot-link.org/source/${P}.tar.bz2" + +LICENSE="|| ( GPL-2 LGPL-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="perl java python png readline threads bluetooth usb debug" + +BOTH_DEPEND="virtual/libiconv + >=sys-libs/ncurses-5.6-r1 + >=dev-libs/popt-1.10.7 + perl? ( >=dev-lang/perl-5.8.8-r2 ) + python? ( >=dev-lang/python-2.4.4-r4 ) + png? ( >=media-libs/libpng-1.2.18-r1 ) + readline? ( >=sys-libs/readline-5.2_p4 ) + usb? ( >=dev-libs/libusb-0.1.12 ) + bluetooth? ( >=net-wireless/bluez-libs-3.10 )" + +DEPEND="${BOTH_DEPEND} + java? ( >=virtual/jdk-1.4 )" + +RDEPEND="${BOTH_DEPEND} + java? ( >=virtual/jre-1.4 )" + +src_prepare() { + # Fixing some broken configure switches and automagic deps. + epatch "${FILESDIR}/${PN}-0.12.2-readline.patch" + epatch "${FILESDIR}/${PN}-0.12.2-threads.patch" + epatch "${FILESDIR}/${P}-png.patch" + + # Upstream's check for Werror was wrong. Fixes bug 194921. + epatch "${FILESDIR}/${PN}-0.12.2-werror_194921.patch" + + # We install the Java bindings using the eclass functions so we disable + # their installation here. + use java && epatch "${FILESDIR}/${P}-java-install.patch" + + # We install the Python bindings using the eclass functions so we disable + # their makefile.am rules here + use python && epatch "${FILESDIR}/${P}-distutils.patch" + + # Upstream patch to fix 64-bit issues. + epatch "${FILESDIR}/${P}-int_types.patch" + + # Fix Glibc open without mode error + epatch "${FILESDIR}/${P}-glibc-open.patch" + + # Respect JAVACFLAGS bug #267445 + epatch "${FILESDIR}/${P}-respect-javacflags.patch" + + AT_M4DIR="m4" eautoreconf +} + +src_configure() { + # tcl/tk support is disabled as per upstream request. + econf \ + --includedir=/usr/include/libpisock \ + --enable-conduits \ + --with-tcl=no \ + --without-included-popt \ + --disable-compile-werror \ + $(use_enable threads) \ + $(use_enable usb libusb) \ + $(use_enable debug) \ + $(use_with png libpng $(libpng-config --prefix)) \ + $(use_with bluetooth bluez) \ + $(use_with readline) \ + $(use_with perl) \ + $(use_with java) \ + $(use_with python) \ + || die "econf failed" +} + +src_compile() { + # Unfortunately, parallel compilation is badly broken. cf. bug 202857. + emake -j1 || die "emake failed" + + if use perl ; then + cd "${S}/bindings/Perl" + perl-module_src_prep + perl-module_src_compile + fi + + if use python; then + cd "${S}/bindings/Python" + distutils_src_compile + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc ChangeLog README doc/README* doc/TODO NEWS AUTHORS || die "installing docs failed" + + if use java ; then + cd "${S}/bindings/Java" + java-pkg_newjar ${PN}.jar + java-pkg_doso libjpisock.so + fi + + if use perl ; then + cd "${S}/bindings/Perl" + perl-module_src_install + fi + + if use python; then + cd "${S}/bindings/Python" + distutils_src_install + fi +} + +pkg_preinst() { + perl-module_pkg_preinst + java-pkg-opt-2_pkg_preinst +} + +pkg_postinst() { + if use python; then + python_version + python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages + fi +} + +pkg_postrm() { + use python && distutils_pkg_postrm +} |