summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-06-24 13:20:54 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-06-24 13:20:54 +0000
commit09d2679e5532cd0866173384900829edd67f7620 (patch)
treefe1394d2e0a56b0ab885c5eff78d5aa6d04ea637 /app-pda
parentAdd patch for CVE-2014-4510 (bug #514184). (diff)
downloadhistorical-09d2679e5532cd0866173384900829edd67f7620.tar.gz
historical-09d2679e5532cd0866173384900829edd67f7620.tar.bz2
historical-09d2679e5532cd0866173384900829edd67f7620.zip
Fix building against >=sys-apps/texinfo-5.0 wrt #514772 by Patrick Lauer
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'app-pda')
-rw-r--r--app-pda/coldsync/ChangeLog8
-rw-r--r--app-pda/coldsync/Manifest19
-rw-r--r--app-pda/coldsync/coldsync-3.0_pre4.ebuild15
-rw-r--r--app-pda/coldsync/files/coldsync-3.0_pre4-texinfo-5.patch27
4 files changed, 59 insertions, 10 deletions
diff --git a/app-pda/coldsync/ChangeLog b/app-pda/coldsync/ChangeLog
index d97d9e70d77a..51884f94d3ad 100644
--- a/app-pda/coldsync/ChangeLog
+++ b/app-pda/coldsync/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-pda/coldsync
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.13 2011/04/09 13:45:06 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.14 2014/06/24 13:20:49 ssuominen Exp $
+
+ 24 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+ +files/coldsync-3.0_pre4-texinfo-5.patch, coldsync-3.0_pre4.ebuild:
+ Fix building against >=sys-apps/texinfo-5.0 wrt #514772 by Patrick Lauer
09 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> coldsync-3.0_pre4.ebuild:
Synchronize with 2.2.5-r1 ebuild. Install to perl vendor-dir instead of perl
diff --git a/app-pda/coldsync/Manifest b/app-pda/coldsync/Manifest
index 1f81960da6fc..9e634067d5c0 100644
--- a/app-pda/coldsync/Manifest
+++ b/app-pda/coldsync/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX coldsync-2.2.5-toolchain.patch 589 SHA256 70321f6b822fc16ef91620d6bef2ef6026fdc5295c920c45a3580916b592924e SHA512 ef66f4545147619653574478db876710af786a690817cfa3254d7207b4fb478f40b7e54722e8797024cd4e5a7edb1dcb379f5228a651bdb60982b2031552a2ff WHIRLPOOL 9e51358c28c9e87c30e82d40f5e4fc27423126f6ca8270fccaf45e61f108d6d9b7319ba6ec0922ef1b7ce2f27378f4b4953847259af5288b2472ac2ff906a570
+AUX coldsync-3.0_pre4-texinfo-5.patch 804 SHA256 c9f3d932abca7909a5310ce97fa86cc86d9b360d7db4728bf69c8fd46a6d59fc SHA512 ad9a757590f5717b38d2bff3330945264a572cb06a581412322f4566ac405feac71170c248c4f19c96b6c7501aeb9e1d3745657417050bad8f2a106c732f3d9e WHIRLPOOL 0f5c31eb9507f29fed19229bcee0569085f6e035b1b1d3d1b3e415c50a1872f40714c39953071d4db7a3e3800b6cc71f90437ff0c91c269c7228bfe5acc49ac2
DIST coldsync-2.2.5.tar.gz 663307 SHA256 635575e2175a865827319ad21cbfbac95a42a7256730898ae9e9104b63b4fef6 SHA512 94ca6f3cff2248563c9a179d052f1e31f9482a62bd6988baecdb0fd8d9ed376c7653eba15448a8be1585d0ab0f727597985d459fd063fe70a4b77a9ed9298a7a WHIRLPOOL 85f1fe15299f024b6bc9d86127f146298c805adfe46009f90a2ae171e1f3c217a7708bbd8111095e0102cae4bdf1c508ce0bdfe66bf118813ca14026f1f79fa8
DIST coldsync-3.0-pre4.tar.gz 657305 SHA256 ca32dbcd1b2d3cbce8ee4e34aafb1183fc09c3ead69d308e76454a9c4c4728c3 SHA512 9f8ad373b2613388dfa47c86a65c05378f66b59ce09e5c984617fbb72525a5f31f90dd09a22258ada469a29278cdd442632747c8d2f924372bfbd6e0ba4bec22 WHIRLPOOL e05cee91e61cdd979efcab168d10834f9b0fb8e19a3a488efa99b910490051857358a3c9c9c548acb62b9fcd96268b7d717549f6a9882c434446729af928ba9f
EBUILD coldsync-2.2.5-r1.ebuild 1599 SHA256 5d96205320ac759921c88fdb082d88f03ac5a92dd9ce855ef450e13c041986c6 SHA512 73a1f22d03cc5c161b3794603035f075e7de898c417acc17ca8e119fa21e640ba9aee07150514e9d4314957c0960968686457d0c56b93e794b86a1d244954757 WHIRLPOOL f57b133c1d9c2028448fa7dc3a512e310f1a0269fc5323d7179fca1bdd2ad5cadafc1f75d7f93dadbd8e2bb7c9077919b5da7b49cbd10b78450a253de715981f
-EBUILD coldsync-3.0_pre4.ebuild 1823 SHA256 2e485ff95cd14f27a775e50ed210c904295379b95a813361905db32c269ed5ea SHA512 cc66eacb16f5ee6d2cb2776bd55f92c2afec38fd2f1128b6d262d7d6f758b922be3c107d13d26865294f5280c3eb9009a2416e6beea56356d23238b27b8dee66 WHIRLPOOL 29f8aae9fce79ad8e2eb764a097f7936fc493408258a192d41b1ba2ba74ae4271e77a8b570a62f36c96c82beeb723078289dcb8daa0da7bf818219ca67946d99
-MISC ChangeLog 2371 SHA256 e9934698cf03601a4c6cebfe52e63823b4ff9f35a5d5fa0107f12383bc29e08c SHA512 f90a209a84f926cbe0f33b96d2d92144fb0e6361ee1da043dbc40c972526553b30a79df52120d6cd902e14274bf87d13d325dab72fd781d086bc04441fa5c02e WHIRLPOOL 2f150a3a69955373ae499564780437c03f8f70cae1708426846835e1413a670a96906abd42bc62f0dc2f93dbe5eb3fb975d0ca0076d96f0376975db1808c6141
+EBUILD coldsync-3.0_pre4.ebuild 1878 SHA256 4488d0096c91da25d936636e0147945d93432dad2da85106be361a730bb20c0e SHA512 4655d4bd250592278c6c1dc4bd7891dedfec8b67d013f67c3353de5f9afb60d619124a3c7436227a94b97ad0cce04544c3db5b14065d8f0c739c92d006f33ab3 WHIRLPOOL 38d9680e62711b6f158bced0e385b396f2a125b642bc70fa3b7b4acf6830d1836bc3ec2fe7311e019e1221a9bd41e5f51bff7564f50871ca2514b797091c65d0
+MISC ChangeLog 2571 SHA256 409e25370206063dadc3f28a4025c27cbe2d99ce946aaccb33c8d4d6bbc78c8d SHA512 1ee61fba171c15107e6cc161efcd81a9f43c6979ab51d399b83cddfb3feef2d401f150a6d28e316e87269e42ddd9e657a9d752a8942cc33488d2d7b9f88acab9 WHIRLPOOL d67a1a33f546c632b4f1fc7a36b7c19d64fe20b1e77368a8fb2e84a8f2ed52f86cd6f585f39bd6f5320f522c8871b63cfcb8bba1614265e16b39c9e51d7d629c
MISC metadata.xml 156 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb SHA512 c07d56b6668ae429bd774f35ecae73eb324423aa863c7cc327a511de84d24f099668029fde69132110676115b4763ee96e3e1a7ef1a9db6248d606e65df11d4b WHIRLPOOL 4364f66f79aa67bc6b1762698b41683da5018d08602f509f525bc3e4a3521f2100e0ea92d84bb30617bef9beda48a3cc0ef9b1b9a4219fe05a54559d7423b6d1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTqXpZAAoJEEdUh39IaPFNxdwH/RvJp4VJtTO4bZ3h2YNSXLUs
+cO0v3lqe4iIMBo7FRxT/ax1ZN86sQp643ltD7+QiAevZlv9EfI9EVykS0a+reVrj
+Ar0fSuspU8XBP/d+pMceIAHcAoV4r83oRcT6dc3ljRm6ok2Bd6yk6y062FBzM54z
+5iAOn8SI70cJ5FL/lUFFn5RcXgt5KyOlX6xhZt74FzDRyOFx5bFkEA1WIHyqCN2D
+M+EJeTbB1Dx7uv0RfC+c67a8+tQ2OXVYhFW0ehXsCfArQ6XV03nEvNLoaKvv0k4Z
+rPmxRREbeai+lEuAiwYZxb5KzasOdW+ZqjwWrdDS2OyYbXylnWhvYpvl/sV+n54=
+=M4Ju
+-----END PGP SIGNATURE-----
diff --git a/app-pda/coldsync/coldsync-3.0_pre4.ebuild b/app-pda/coldsync/coldsync-3.0_pre4.ebuild
index 9bf1c37bd83b..3218caeace03 100644
--- a/app-pda/coldsync/coldsync-3.0_pre4.ebuild
+++ b/app-pda/coldsync/coldsync-3.0_pre4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild,v 1.7 2011/04/09 13:52:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild,v 1.8 2014/06/24 13:20:49 ssuominen Exp $
-EAPI=2
-inherit flag-o-matic perl-module toolchain-funcs
+EAPI=5
+inherit flag-o-matic eutils perl-module toolchain-funcs
MY_P=${PN}-${PV/_/-}
@@ -20,11 +20,14 @@ RDEPEND="caps? ( sys-libs/libcap )
perl? ( dev-lang/perl )
usb? ( virtual/libusb:0 )"
DEPEND="${RDEPEND}
+ sys-apps/texinfo
nls? ( sys-devel/gettext )"
S=${WORKDIR}/${MY_P}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-texinfo-5.patch
+
if use perl; then
pushd perl/ColdSync
perl-module_src_prepare
@@ -52,7 +55,7 @@ src_configure() {
}
src_compile() {
- emake -j1 || die #279292
+ emake -j1 #279292
if use perl; then
pushd perl/ColdSync
@@ -72,7 +75,7 @@ src_install() {
INSTALLSITEMAN3DIR="${D}"/usr/share/man/man3 \
INSTALLVENDORMAN3DIR="${D}"/usr/share/man/man3 \
EXTRA_INFOFILES="" \
- install || die
+ install
if use perl; then
pushd perl/ColdSync
diff --git a/app-pda/coldsync/files/coldsync-3.0_pre4-texinfo-5.patch b/app-pda/coldsync/files/coldsync-3.0_pre4-texinfo-5.patch
new file mode 100644
index 000000000000..0579a9fb854e
--- /dev/null
+++ b/app-pda/coldsync/files/coldsync-3.0_pre4-texinfo-5.patch
@@ -0,0 +1,27 @@
+Fix building against texinfo >= 5.0
+
+http://bugs.gentoo.org/514772
+http://www.gnu.org/software/texinfo/manual/texinfo/texinfo.html#g_t_0040copyright
+
+--- doc/conduits.texi
++++ doc/conduits.texi
+@@ -33,7 +33,7 @@
+
+ @page
+ @vskip 0pt plus 1filll
+-Copyright @copyright 2000 Andrew Arensburger.
++Copyright @copyright{} 2000 Andrew Arensburger.
+
+ Permission is granted to make and distribute verbatim copies of
+ this manual provided the copyright notice and this permission notice
+--- doc/libpalm.texi
++++ doc/libpalm.texi
+@@ -57,7 +57,7 @@
+
+ @page
+ @vskip 0pt plus 1filll
+-Copyright @copyright 1999 Andrew Arensburger.
++Copyright @copyright{} 1999 Andrew Arensburger.
+
+ Permission is granted to make and distribute verbatim copies of
+ this manual provided the copyright notice and this permission notice