Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-text/dos2unix
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-01-08 18:40:40 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-01-08 18:40:40 +0000
commitbcc3f8dead63e163e443ccb6d168384e1e0f2dd8 (patch)
tree906d109daf5b21bb8e044b918c2d5b224bcd5f32 /app-text/dos2unix
parentconverted to vdr-plugin-2.eclass, fixed qouting (diff)
downloadhistorical-bcc3f8dead63e163e443ccb6d168384e1e0f2dd8.tar.gz
historical-bcc3f8dead63e163e443ccb6d168384e1e0f2dd8.tar.bz2
historical-bcc3f8dead63e163e443ccb6d168384e1e0f2dd8.zip
Possible fix for bad pod encoding (bug #497548)
Package-Manager: portage-2.2.8/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'app-text/dos2unix')
-rw-r--r--app-text/dos2unix/ChangeLog6
-rw-r--r--app-text/dos2unix/Manifest25
-rw-r--r--app-text/dos2unix/dos2unix-6.0.4.ebuild6
-rw-r--r--app-text/dos2unix/files/dos2unix-6.0.4-pod-encoding.patch28
4 files changed, 53 insertions, 12 deletions
diff --git a/app-text/dos2unix/ChangeLog b/app-text/dos2unix/ChangeLog
index 48ade8cf4028..d5e0071aaf48 100644
--- a/app-text/dos2unix/ChangeLog
+++ b/app-text/dos2unix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/dos2unix
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.135 2014/01/01 00:39:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.136 2014/01/08 18:40:39 polynomial-c Exp $
+
+ 08 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> dos2unix-6.0.4.ebuild,
+ +files/dos2unix-6.0.4-pod-encoding.patch:
+ Possible fix for bad pod encoding (bug #497548).
*dos2unix-6.0.4 (01 Jan 2014)
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 520e5f33fa27..9528607959a7 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -3,20 +3,27 @@ Hash: SHA256
AUX dos2unix-5.2-makefile.patch 675 SHA256 dab1edb13438d598f77e8b73ac2a34def74756accc9a330687d4a1ac0187ba74 SHA512 d63367c24f1e28d63bb3d7ff10d39c42ad0a4054c2d592c5c53c077dd2b20b1c439634bbf837a9b4e7f618ad5dde663890ff4589073ccc8b546f7660599efa26 WHIRLPOOL 6619456e20d1bce651488849b74b63826cd7fe85e7ef3c3e674ed49aa6e076ee850d843d3246ec24b6f40dbe8d34e0daa676acf082b4a9eb1879adca97c8e5b5
AUX dos2unix-5.3.1-fix_debug_build.patch 912 SHA256 459c06a2a12c8c5db20fcc7ec62bdfef42473db941c092447beba63503b96857 SHA512 c23b670704df16866838dc25d214e4b187839813a889b0366da6186d9f253a51e4324956867ed996105a03abc6b076befdc693db4fe84e714f43236f2a73a6c2 WHIRLPOOL 6558020da91d24115ea137c3dfc6f1f097b77bc49d849828767d7002fba4ce049789d3172a157941c5f32b3cbd1fbf5206c1aba0ca69c641ed9fa0428b3a2597
+AUX dos2unix-6.0.4-pod-encoding.patch 881 SHA256 bf24c886989fc82d6f45175e3b974485e871014926ade7ab37c6cc6519df6a6a SHA512 9cfec00be898f63608031cd8306783143c1fceda715041cbc1e65795fae867cd096cd6d5ff122cc75f85493817a757acd6a405860dc1a8f66c8ec15dea684b12 WHIRLPOOL dff3e02f740b9ee45190c1da0e8655fcf06bfd0d7e88cc93e775a40553583d452598768b8feb50d762571e39968a084ccadfd1186248a16c174c4bebc47d9f67
DIST dos2unix-6.0.3.tar.gz 77227 SHA256 f5268c5b28a1983537210c72b3fd43f4aad17a8dacb6727b615b56dca2ef9a04 SHA512 00cce5d7fe7c1fcb81b973a1119aa956a0dd648b775a0cc1692270acec7e9b4caefb1c179e5bdf2834cad60622ffdf2a93ff4db5634f39f0545d63e394a03af2 WHIRLPOOL 925082691597946dce07f2b3bfbcae7bd0d944a4868d3d489cf7025fd5a055965fc76c269a62b025eaedb61741a5cc3c70612de547e47030034ea94d79bf9940
DIST dos2unix-6.0.4.tar.gz 84848 SHA256 66bd224d4a7fbe13a3b61aa7083b5ef74cf6448a3670606c669f46a84bb9b37a SHA512 6b7e84e42325462205439cb347c14b287be708d6ea5a776ab0875ff00cfb95b9a0379a99c23764e098931dad6b725f064561f433f60e7621eec1b07571cbc651 WHIRLPOOL 2274bad6393a4544e984f3e30afa81c2d880833a465157ced2c95c6f392b7fcca61f41db4ddc1f1421a2067c89726304d129272db13a82032fff96ca5d205329
EBUILD dos2unix-6.0.3.ebuild 1496 SHA256 e1d7ebb511a4ac9ca45cdcb4ddf35aa390e2fa31106474f4c71137ff7220c115 SHA512 252c45d6baf1f0bf8fb522231ce1fdea1db529ff5bf2cae9d1030f06c8fc5164c45664da2c64f664d8a560da35bafcfc0225297127b0089c463c1044947299d0 WHIRLPOOL ed8852917aa690becf6bbf339eed9c94f6604b02675c1ece829d3ea52b136ba9e8d2fc816d424b8b4fffd2cdeed8275717b789aa66b323d0baaf1a4f08d8282f
-EBUILD dos2unix-6.0.4.ebuild 1490 SHA256 4b5e1384de7c36d060ee365f6c970b37a53d4080beed7fbcb264830be236049b SHA512 dfdd5856b13f2b0c11551726eb3dea558cb9e46d2b4475fb2af67315cccaf6bd0b4b63f373f7d9ba465ea7d8defb35f2798dc96d2fceabaf8209b50a6fe3006d WHIRLPOOL 8ed0f4cd711848d9054d35686f66ee93006a950e48b347506eab44c172787b093336ceb1396da01858a9f46e7f695658b6ff8f8ec0cc3e09480aaf230cae1b2d
-MISC ChangeLog 16111 SHA256 dce526d1150707e3d9fa8049a043c39a8944e650ce251450610bc0c3f7b592d4 SHA512 b61658c3139b201f2f97655eaf8572564189f409cf01e856f3a54f92d687e6d916d09ee6cf9dd13a638f4c764a1a95df0034fd9d2c719b66ea4776491f1e7557 WHIRLPOOL cfc43fc181d600d8d79152693e33dd2ddf98a56698ed10df9349f45830fb574bf1443840e4ee0176c1f935a8c9cec42ea6406df8d2bcf4b6c4ddb4f2fb24bc02
+EBUILD dos2unix-6.0.4.ebuild 1547 SHA256 31d3b5f0d50819b27a2ad5ca2a0018ad68f87861f046a2a17ffb0b90444ded25 SHA512 f65ea53cd583dcb407dc1a6d72bf2cea7576736c0f6c94d4b65fad1aa85bc8302fc0c1b6880327ecdd3cc48aeefa5ab713f3034fef1657e5010978c04aeb5cf6 WHIRLPOOL fe601e710d8170de6649fdd1f95591cd99a608653f899dd59a9501024e2ad9bf1182c5e272a0b395f6973c9d8fb7938b054394d34741a6d8992c7874b7535978
+MISC ChangeLog 16287 SHA256 efeec1d2d239d1be2a70588a5b416590a1e848ca8a38dcaa4497c48a7f6b5416 SHA512 5582382c38b562ab4007297cfbcbde036563288465236dadf85a47abbbef97f9bf9e14d0d48cedcb7c3240c8c36431e77c6f10f0126af215ccd522f9b51bf2ee WHIRLPOOL c17005f9ecdb5d4df0c789e9b8cd02044241c3de20895919092713466971cceea7d30047e24432b7bd37e7297428fc8bba8ba5cb9d2c6edc5707b8f56afeba32
MISC metadata.xml 166 SHA256 064eb80cc86913e2a47d1088f1b0ebd5b64b5dab1c73d38b8501cd77891cfbbf SHA512 3fc05bf28a906b223e9bb5baeac755dd7e4edb755b5a6c054c3e4d46d294f28df948e1195e71d5a836783daefafa53fe1417aacc0ba17dd49e9b10d51e99c275 WHIRLPOOL 814a3f6a650e4373ac90ba43969b8dab3215f5da936ef5e180fe134adc05a571dc1390c80be173797c421de7f22488b19979353f7aa52536bbfcf6e0541bf748
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJSw2OsAAoJEEqz6FtPBkyj0r4H/j7MdJGyhjxTl8dl9urBrztM
-6RThLW4Y63ANLz0JMk+E1gHoYo7tfvO1wA6CbAeAhliziI+/4oTz/Sci0Dksi86n
-a6MzZ31ydCE0ejPvC6k6uEVF7r9LkXts06jZAgYVFCs9UvlBhT962GFBsOfULuQr
-qv7fisJ2ALH/nU0ZgUnxz6o6xLAfiLMkLZ+UJjIzLMBlGaMgDPUwqVmGxm+Wrpni
-XUbFWA5pAXoyanodmxxeSMfqtOXN1BSnJLM8+ehkxiR+A0UYIbs6mdcA843HCFPF
-mAgDKZWFkAdb8zvOOaNqmDzAWzYvwy6T/IZLW8CGBvDXiYrAWeEFrCp1dZ8xUds=
-=yybs
+iQIcBAEBCAAGBQJSzZuoAAoJEPiazRVxLXTFyYMP/iATbngrG0sfgS9qpqhwaoDd
+ZlPhXCX7MhPVa3YL5zncmBCNgBtmtSkfWm0k9GzEu7tkZWk/Eiak+knKqBOSzVvz
+64VKD/+3CiQWk+s7b7v+oEceCkKE1xsu34HJnqIIMq964cjqQVQMCvpNRV9gCMXt
+kM4MfD8u9Tri+4UnVMnGq5SHpOcVNADrEQgQH/a9jZEKKrho6oGvyJ0/EALwoB3D
+FZR6nFpa9W1iT5wtJwjd9lQhNFfw4haTPAJ6K+/qNgmmxgjnVTy301rmdPVBiy8U
+XHSBgdhJJTD21CuhQwcTVR2/zM+L7ZibBwcTetykuCR/fhkfmz+5eljn+mZRz7ic
+l4Sb8p2fSjwBZkyAUsJbRbG2gCY3sYWd4G5Cdr2veM10mns2fYOpwVrnN8juNniA
+tJRJ1svSGoAXQXbVDAbA/iNdViGWBTGug4+cdDKbaAUV6tyUXnXvjySR0blGA3zF
+h/k6Tr4lHqnSbkvMvlq7t36S2/ef5LbQfnQS33c0uXa9q5wHy9kG9rHiOfQfJeJM
+KOM53T+jbNIwdkw2bZL20CgvrVGMqfDs/L/XF4+R+RrdiWOkbUeAIDLugmR2lo5p
+NeDfhI2qHB2VkJqaKCA7XMQ3jJDwkSWEy7gOqY1nrCQ9qE2vbGq7F/Wp3HlUzdpn
+Bq4ALoErn54ai0X+Oo2N
+=P30X
-----END PGP SIGNATURE-----
diff --git a/app-text/dos2unix/dos2unix-6.0.4.ebuild b/app-text/dos2unix/dos2unix-6.0.4.ebuild
index 68b9290e3ac9..361b54eacc2b 100644
--- a/app-text/dos2unix/dos2unix-6.0.4.ebuild
+++ b/app-text/dos2unix/dos2unix-6.0.4.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.4.ebuild,v 1.1 2014/01/01 00:39:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.4.ebuild,v 1.2 2014/01/08 18:40:39 polynomial-c Exp $
EAPI=4
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
@@ -27,6 +27,8 @@ DEPEND="
dev-lang/perl"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-pod-encoding.patch
+
sed \
-e '/^LDFLAGS/s|=|+=|' \
-e '/CFLAGS_OS \+=/d' \
diff --git a/app-text/dos2unix/files/dos2unix-6.0.4-pod-encoding.patch b/app-text/dos2unix/files/dos2unix-6.0.4-pod-encoding.patch
new file mode 100644
index 000000000000..2781b96735a6
--- /dev/null
+++ b/app-text/dos2unix/files/dos2unix-6.0.4-pod-encoding.patch
@@ -0,0 +1,28 @@
+diff -c -r dos2unix-6.0.4.orig/man/es/man1/dos2unix.pod dos2unix-6.0.4/man/es/man1/dos2unix.pod
+*** dos2unix-6.0.4.orig/man/es/man1/dos2unix.pod 2013-07-27 20:08:12.000000000 +0200
+--- dos2unix-6.0.4/man/es/man1/dos2unix.pod 2014-01-02 14:19:52.944130621 +0100
+***************
+*** 50,55 ****
+--- 50,57 ----
+
+ =pod
+
++ =encoding latin1
++
+ =head1 NOMBRE
+
+ dos2unix - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa
+diff -c -r dos2unix-6.0.4.orig/man/nl/man1/dos2unix.pod dos2unix-6.0.4/man/nl/man1/dos2unix.pod
+*** dos2unix-6.0.4.orig/man/nl/man1/dos2unix.pod 2013-07-27 20:08:12.000000000 +0200
+--- dos2unix-6.0.4/man/nl/man1/dos2unix.pod 2014-01-02 14:19:36.510059975 +0100
+***************
+*** 46,51 ****
+--- 46,53 ----
+ */
+ =pod
+
++ =encoding latin1
++
+ =head1 NAAM
+
+ dos2unix - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter