From 38a021cfe5ffb23e3eabbc67f654de0c9bd50730 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 15 Sep 2014 08:56:19 +0000 Subject: Clean up patches. Remove weird USE=unicode. Package-Manager: portage-2.2.12/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- app-mobilephone/yaps/ChangeLog | 7 +- app-mobilephone/yaps/Manifest | 15 +- app-mobilephone/yaps/files/yaps-0.96-gentoo.diff | 8 +- app-mobilephone/yaps/files/yaps-0.96-gentoo.patch | 443 --------------------- .../yaps/files/yaps-0.96-getline-rename.patch | 25 +- app-mobilephone/yaps/yaps-0.96-r5.ebuild | 12 +- 6 files changed, 29 insertions(+), 481 deletions(-) delete mode 100644 app-mobilephone/yaps/files/yaps-0.96-gentoo.patch (limited to 'app-mobilephone') diff --git a/app-mobilephone/yaps/ChangeLog b/app-mobilephone/yaps/ChangeLog index 6aaee4d4a02d..91b30253ee68 100644 --- a/app-mobilephone/yaps/ChangeLog +++ b/app-mobilephone/yaps/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-mobilephone/yaps # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.32 2014/09/15 08:48:46 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.33 2014/09/15 08:56:17 jer Exp $ + + 15 Sep 2014; Jeroen Roovers yaps-0.96-r5.ebuild, + files/yaps-0.96-gentoo.diff, -files/yaps-0.96-gentoo.patch, + files/yaps-0.96-getline-rename.patch: + Clean up patches. Remove weird USE=unicode. 15 Sep 2014; Jeroen Roovers yaps-0.96-r5.ebuild, +files/yaps-0.96-string.patch: diff --git a/app-mobilephone/yaps/Manifest b/app-mobilephone/yaps/Manifest index 2a65564a8c88..5c4834a5ff30 100644 --- a/app-mobilephone/yaps/Manifest +++ b/app-mobilephone/yaps/Manifest @@ -1,19 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX yaps-0.96-gentoo.diff 1554 SHA256 3ba28d9b6f527ed9fec12bb8ea35e46f33adb80bd8d5ca5bd81405bedea0574c SHA512 60dbe9b62f3fe1ee9bcc3ec43db953fe3f567ac995cb4b0c7dda4f7fa250fbf98c99e8684a6218213c46b89305df1cb5a57088bc9b56d0b143daa723d64e130d WHIRLPOOL b07af49cf0af86616a29803f6d7143b8ba8bd5a201975c01f5d8ebe9d623e268884afdce2f5b0706de06a52ebfb65f67f0492a491cf473b8a119ce6a56c3e2d8 -AUX yaps-0.96-gentoo.patch 10303 SHA256 49f90677f9b52fa2ac0335825da866c45e62c2098a1c527061e08af4c7ebbb05 SHA512 a28863e5ff942a6ab64a8746eb5f191411442e65b9be0710b3f96f6f844f710803ebf2497ef7cebdb17e5955c44f23f6d8441ea5ade0933e83a7bc976d4bac02 WHIRLPOOL c77f2b63be2e8eede53257fc82ca8aab17ebea20af3538acf30bc42a750243822264c8a3ff6f7bfede80c6d6b0c7931cc0b7e2744ecd3374afb48f71be1e4889 -AUX yaps-0.96-getline-rename.patch 2349 SHA256 ceb16d4f5c707a856fb88da1100640933e5d37a015430b2753543538bf25b47f SHA512 3708d6eb29a294a66dc90bcec47dcf046c8205afc4932a234b37c758321f1fb210b4ce2612ed89b00f8fb14c3b300607af99111854bf5fbe12ad6481ed92b2fe WHIRLPOOL 8c91921bea4d4e95abc53924f50be70acfac3317658c0ceb12d7b6d7ea7fa7aa08a348f5cb806b3eb549011558fe56acf4d7889f79f853161eed3482f6fdfbef +AUX yaps-0.96-gentoo.diff 1408 SHA256 651055dbd0b3adb1fc715f72a50aa8973a1c1adbdaa732d069046382fe407a48 SHA512 0e16bacf00058f234239caced5908e33622baea6fc5083289e0bf7da3ce9c66249826c48daf45baf5e660e8e9d730b018c22cd7a54a304bf6fc762be087d10da WHIRLPOOL cca2fcf97c45edff99fe0581aabc1737d3634d389b9f4e8d39b9eead917a529573f86ad373353e5a2f2af1ee17aac382d5d825eca9c63ad03febe94f3abca7ec +AUX yaps-0.96-getline-rename.patch 1643 SHA256 6f445b8949a7eea77fb37236382763d264c2ac36bca47b42e11be9153b7a5160 SHA512 ef8a3d73746f62c1001bcb1b549c6833385fb249b7027f04d86d3e4e29531a93ea0c43bd038ecf73131a0285c61d2dea11491ae51b6fe71ea6bd0dd9cb720b77 WHIRLPOOL 44f143e0993bd0cb61366c1f465149190f9a1a94545cf030fd8e23616cef7666590be8c81c574d42aaa749796f933a6f81d10799b54a908ee85477a3319d8715 AUX yaps-0.96-string.patch 172 SHA256 bbcf5efdc79b71633e8da553f7478a8e6e2aa1cb0bee6486237a081bb78e2479 SHA512 f3337b9a430e4995884285e3e0fedd377b3b0ecc8622e02d5d1c01e27614c677ec06632e99eaa2f087e474ef5afdcf87cc8d38194c314fd56f438f29220a4c69 WHIRLPOOL a9ddee5ce327204e2456fc91c01a656fb27239897903fdf885b6598cbda5c6cf051f5bd9cb34fc4623f996228f7aed6df6d2f7e9a7951cde7eaa8e8155f9c27d DIST yaps-0.96.c4.tgz 109682 SHA256 4afab43b8f0bed7c48d91cef56bc7aee44a1887c38efb8788be3ec761caf54c9 SHA512 16d326903c7aa54c9930f581d9ec6285fe51d52e8b03a0cff899745b41371e3ce939201f529e15c2473bb8917e3e45f0a3872355986ecd03df52079ec9c484ca WHIRLPOOL bf8e37fc2135dfb851af0e26ee508b286548e0b0b1d3d460263507585c580e5058c567013aac63283861dc79e26aa437ad2392b9061b1b083714b5d4b88a8554 DIST yaps-0.96.tar.gz 91060 SHA256 6474a507d1f3d769c80562164ad38454c73fb49be043bab1128ca9eaf20c5b98 SHA512 799559af2726b669df08ad68de1f01b5b1a6ac8b332e5f8b54d82474b183ef7714abd4482aefdd5ccff6197a9da2b051fa94b38d84eb037b262d066fffc7d145 WHIRLPOOL d7f6de6c7aca320a95afc78aad1ae1b7d27a1b4ef1f6e40dd8ad02c4ba8ecb1138ef41b507672ccbfdc197e2c7591819c58311c9cff796e56f03ebe41594dcd8 -EBUILD yaps-0.96-r5.ebuild 1764 SHA256 cec8bed3d7081e6d4d803a8cfb1cda72294b12cf477c0ade073f988df381a3a5 SHA512 737945f655fedc7995432d65aa8a72edeb404255f61aeb2e79d49183cd71d1145bdfc279d321305e90f4b21b0de632d63ccece9be15fb1a26fa4a6512f40b443 WHIRLPOOL 6ad90248a93317a4002abe962c6e1fb04775dca1d5b24a8a9b1095d16caaed208420300cf2db0f748e8d216deba7970631d2da694ad3736f14ff3c0a70449e1f -MISC ChangeLog 4588 SHA256 83d3dae911a177936d9c48d5741361702dfbfeee0aeb9b852f6e547857f9aa66 SHA512 30e1d5a1ba2be13277721e317d958094ef8710a800448b5db823ec0633cd1a77245a93d79dbf1d58d77f89b7a7225252a8c4bb19987c026af3556f3dd0fcdacb WHIRLPOOL 962732cc77daceb31c8c80a60a464f5cd6c5a276b549026bbce5506b285f49519d48e8395ee8279409f3c2859430da9a3bb5d539fc600cf8784be67b01e5e4a3 +EBUILD yaps-0.96-r5.ebuild 1509 SHA256 d4644ef5d24f0d547f486f1494d652da90b5608302b6017be31a0091e6e1cf6b SHA512 971faf3a3a65a34f6090c278a8f4d2b80d7cb3449b5a381a7bf73bd0f3b2835555e69213d9cc6d8f8f2c57cce03a193e47bca8bfc1d0730bd8f172734c5fece9 WHIRLPOOL 0e545a937452b81fbc2704f85409450cf1a74424be03b01581412286777cee7acb7a21954b94d62be409cf6ed43bd262b5db7bbc6d23ab1d404622644f1e1c2b +MISC ChangeLog 4805 SHA256 27c0864b444e2d3658da827396d42c9fd566cf0ab86c2969bc208daa7e6197d4 SHA512 d8b5d8fb8cb95d81fef80881e9eb473b68dadc7cb557e37675758738eb7825d87b3a782c3a7f48bbe17c598310633427acc6329c5bfc27378c0570a1f0747aed WHIRLPOOL 2ec0236df4e140084bec42ef76d33ba746a867d6dd21b3762962a26a5338ff1336a340d6815c89e44cca51b68734a8733a0f8f1bbd8bc74434a706d6ca752b3a MISC metadata.xml 374 SHA256 b0a1e70bdf2564573b170548a9555bba2b38a454331c040945f8cfa121ff1da5 SHA512 2bc440dca76991fa6c07b366dcf281c8922f381218e23fb52a1765d588e11055a610c5846525b09788910c8fe1ff381430e15027e138316d1d529ff6fe1cedbd WHIRLPOOL 1ce69fe10948d656f46e349e8ad657602fd48ba31989fb37c8f70e2369c865fa2c264760deade5ff27fde358a56dd2642d18323a9a191d92c4ea28d142d8a6eb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQWp/AACgkQVWmRsqeSphMj+gCeLuERWBivfiwvJQQ/0zCyMZRN -Sy0Amwd/pDDdXXAl8eyR3YWX7F4hQxCy -=pkGd +iEYEAREIAAYFAlQWqbMACgkQVWmRsqeSphNBcQCdH9k0TY+cNAT6l4bkEwFvrYA0 +tDcAni1F81a12C2Hh7JMKSve0u7njH/q +=OVV+ -----END PGP SIGNATURE----- diff --git a/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff b/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff index 98f528c30116..c77bcd5d4912 100644 --- a/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff +++ b/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff @@ -1,5 +1,5 @@ ---- Config.orig 2005-06-02 20:28:35.000000000 +0200 -+++ Config 2005-10-16 15:13:32.000000000 +0200 +--- a/Config ++++ b/Config @@ -24,9 +24,9 @@ # Name of local configuration file (location is $HOME.) YAPS_LCFGFILE = .yapsrc @@ -28,8 +28,8 @@ endif ifdef MATH LLIBS += -lm ---- Makefile.orig 2005-06-02 20:33:27.000000000 +0200 -+++ Makefile 2005-10-16 15:13:32.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -33,19 +33,19 @@ lynx -cfg=/dev/null -nolist -dump $< > $@ diff --git a/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch b/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch deleted file mode 100644 index 24929f21dccd..000000000000 --- a/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch +++ /dev/null @@ -1,443 +0,0 @@ ---- Config.orig 2005-06-02 20:28:35.000000000 +0200 -+++ Config 2005-10-16 15:13:32.000000000 +0200 -@@ -24,9 +24,9 @@ - # Name of local configuration file (location is $HOME.) - YAPS_LCFGFILE = .yapsrc - # Directory for installing the binary --YAPS_BINDIR = /usr/local/bin -+YAPS_BINDIR = /usr/bin - # Directory for optional support files --YAPS_LIBDIR = /usr/local/lib/yaps -+YAPS_LIBDIR = /usr/lib/yaps - # User/Group/Mode for yaps - YAPS_USER = bin - YAPS_GROUP = uucp -@@ -43,12 +43,12 @@ - ifdef SLANG - LDEFS += -DSCRIPT_SLANG - LLIBS += -lslang --MATH = True -+#MATH = True - endif - ifdef LUA - LDEFS += -DSCRIPT_LUA --LLIBS += -llualib -llua --MATH = True -+LLIBS += `pkg-config --libs lua` -+#MATH = True - endif - ifdef MATH - LLIBS += -lm ---- Makefile.orig 2005-06-02 20:33:27.000000000 +0200 -+++ Makefile 2005-10-16 15:13:32.000000000 +0200 -@@ -33,19 +33,19 @@ - lynx -cfg=/dev/null -nolist -dump $< > $@ - - install: $(DSTFLE) $(CFGFILE) -- if [ ! -d $(YAPS_LIBDIR) ]; then \ -- install -d -m 755 -o $(YAPS_USER) -g $(YAPS_GROUP) $(YAPS_LIBDIR) ; \ -+ if [ ! -d $(DESTDIR)$(YAPS_LIBDIR) ]; then \ -+ install -d -m 755 $(DESTDIR)$(YAPS_LIBDIR) ; \ - fi - @if [ -f contrib/Makefile ]; then \ - $(MAKE) -C contrib install ; \ - fi - - $(DSTFLE): yaps -- install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $@ -+ install -m $(YAPS_MODE) -s yaps $(DESTDIR)$@ - - $(CFGFILE): yaps.rc - @if [ ! -f $@ ]; then \ -- install -o $(YAPS_RCUSER) -g $(YAPS_RCGROUP) -m $(YAPS_RCMODE) -s yaps.rc $@ ; \ -+ install -m $(YAPS_RCMODE) -s yaps.rc $(DESTDIR)$@ ; \ - fi - - clean: ---- yaps.rc.orig 2005-06-02 20:28:35.000000000 +0200 -+++ yaps.rc 2005-10-16 15:13:32.000000000 +0200 -@@ -9,26 +9,28 @@ - # This is a comma seperated list of available services. This - # is required for autodetect the matching service for a - # pager-id --services D1,D2,E+ --+services Telmi,Telmi-Fun,Telmi-Family,Telmi-Top,Telmi-Pro --+services Skyper,Quix -+services D1-0160, D1-0170, D1-0171, D1-0175 -++services D2-0172, D2-0173, D2-0174, D2-0174 -++services E+0177, E+0178 -++services Telmi,Telmi-Fun,Telmi-Family,Telmi-Top,Telmi-Pro -++services Skyper,Quix,Cityruf - # - # This is the default caller-id. If the protocol/service allowes - # it, this is inserted in the message (and the receiver gets this - # as the sender's number) --call-id +1-(555)-1234 -+#call-id 0123-4567890 - # - # If you forget to sign your message, you can automatically append - # this string to each message. --signature (It's me!) -+#signature NAME - # - # You can either switch the use of the signature here on for all - # services or in each service section for that particular service. --use-signature True -+#use-signature True - # - # To get more verbose output when running yaps increase this value. - # Currently 4 is the highest supported value. --verbose 0 -+verbose 4 - # - # If you'd like to log every sending session define this. It should - # point to a writeable file. If you install the software setgid, then -@@ -88,12 +90,12 @@ - # - # Most services limit the length of a message to a specific length. - # Enter the value here to check valid messages --#max-size 160 -+max-size 160 - - # - # If a message is longer than max-size, you can set this to split - # it off into several single messages of allowed length --#may-split True -+may-split True - - # - # If a message is longer than max-size, you can set this to truncate -@@ -107,7 +109,7 @@ - - # - # If the service allows using your caller-id set this to True. --#use-call-id True -+use-call-id True - - # - # If the service is reachable over a phonenumber where the pager-id -@@ -186,7 +188,8 @@ - - # - # Set this to the modem device you wish to use --#device /dev/modem -+device /dev/ttyS0 -+#device /dev/ttyI5 - #device /dev/cua1 - #device /dev/cua/a - -@@ -194,7 +197,7 @@ - # Set this to the prefix of the lockfile use for the device. There - # are several places, and two common formats: - #lock-prefix /usr/spool/uucp/LCK.. --#lock-prefix /var/spool/lock/LCK.. -+lock-prefix /var/spool/lock/LCK.. - #lock-prefix /var/spool/locks/LK. - - # -@@ -223,7 +226,57 @@ - # - # D1 (by Deutsche Telekom) - # --[D1] -+[D1-0160] -+protocol tap -+valid-pid 0160|0049160|49160 -+change-pid 0160 -+convert *no-8bit,cv-d1 -+cv-d1 { -+ Ä [ -+ Ö \ -+ Ü ~ -+ ä { -+ ö | -+ ü ~ -+ ß ^] -+} -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+phone 01712092522 -+# use this number for isdn-dialin: -+# phone 01712521001 -+max-size 160 -+may-split True -+use-call-id False -+tap-old True -+# -+#---------------------------------------------------------- -+# -+[D1-0170] -+protocol tap -+valid-pid 0170|0049170|49170 -+change-pid 0170 -+convert *no-8bit,cv-d1 -+cv-d1 { -+ Ä [ -+ Ö \ -+ Ü ~ -+ ä { -+ ö | -+ ü ~ -+ ß ^] -+} -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+phone 01712092522 -+# use this number for isdn-dialin: -+# phone 01712521001 -+max-size 160 -+may-split True -+use-call-id False -+tap-old True -+# -+#---------------------------------------------------------- -+# -+[D1-0171] - protocol tap - valid-pid 0171|0049171|49171 - change-pid 0171 -@@ -239,21 +292,100 @@ - } - +cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 - phone 01712092522 -+# use this number for isdn-dialin: -+# phone 01712521001 -+max-size 160 -+may-split True -+use-call-id False -+tap-old True -+# -+#---------------------------------------------------------- -+# -+[D1-0175] -+protocol tap -+valid-pid 0175|0049175|49175 -+change-pid 0175 -+convert *no-8bit,cv-d1 -+cv-d1 { -+ Ä [ -+ Ö \ -+ Ü ~ -+ ä { -+ ö | -+ ü ~ -+ ß ^] -+} -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+phone 01712092522 -+# use this number for isdn-dialin: -+# phone 01712521001 - max-size 160 - may-split True - use-call-id False - tap-old True - # -+#---------------------------------------------------------- -+# -+ -+ -+ -+# - # D2 (by Mannesmann Mobilfunk) - # --[D2] --modem standard-d2 -+[D2-0162] -+modem standard -+protocol ucp -+valid-pid 0162|0049162|49162 -+change-pid 0162 -+convert *no-8bit,cv-default -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+# phone 01722278020 -+# use this number for isdn-dialin: -+phone 01722278010 -+max-size 160 -+may-split True -+use-call-id True -+can-delay True -+can-expire True -+can-rds True -+check-call-id >1111111111111111< -+check-pager-id >1111111111111111< -+ucp-extend True -+# -+#---------------------------------------------------------- -+# -+[D2-0172] -+modem standard - protocol ucp - valid-pid 0172|0049172|49172 - change-pid 0172 - convert *no-8bit,cv-default - +cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 --phone 01722278020 -+# phone 01722278020 -+# use this number for isdn-dialin: -+phone 01722278010 -+max-size 160 -+may-split True -+use-call-id True -+can-delay True -+can-expire True -+can-rds True -+check-call-id >1111111111111111< -+check-pager-id >1111111111111111< -+ucp-extend True -+# -+#---------------------------------------------------------- -+# -+[D2-0173] -+modem standard -+protocol ucp -+valid-pid 0173|0049173|49173|173 -+change-pid 0173 -+convert *no-8bit,cv-default -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+# phone 01722278020 -+# use this number for isdn-dialin: -+phone 01722278010 - max-size 160 - may-split True - use-call-id True -@@ -264,10 +396,39 @@ - check-pager-id >1111111111111111< - ucp-extend True - # -+#---------------------------------------------------------- -+# -+[D2-0174] -+modem standard -+protocol ucp -+valid-pid 0174|0049174|49174|174 -+change-pid 0174 -+convert *no-8bit,cv-default -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+# phone 01722278020 -+# use this number for isdn-dialin: -+phone 01722278010 -+max-size 160 -+may-split True -+use-call-id True -+can-delay True -+can-expire True -+can-rds True -+check-call-id >1111111111111111< -+check-pager-id >1111111111111111< -+ucp-extend True -+# -+#---------------------------------------------------------- -+# -+ -+ -+ -+# -+# - # E+ (by ???) - # !! UNTESTED !! - # --[E+] -+[E+0177] - protocol tap - valid-pid 0177|0049177|49177 - change-pid 0177 -@@ -278,6 +439,22 @@ - may-split True - use-call-id False - # -+#---------------------------------------------------------- -+# -+[E+0178] -+protocol tap -+valid-pid 0178|0049178|49178|0178 -+#change-pid 0178 -+convert *no-8bit,cv-default -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+phone 01771167 -+max-size 160 -+may-split True -+use-call-id False -+# -+#---------------------------------------------------------- -+# -+# - # Telmi, Telmi-* (by Deutsche Funkruf) - # !! ONLY TESTED FOR TELMI-FUN !! - # -@@ -326,6 +503,20 @@ - phone 016593 - max-size 80 - use-call-id True -+# -+# Cityruf -+# !!Used for emessage.de also!! -+# -+[Cityruf] -+protocol tap -+valid-pid 0168|0164 -+change-pid - -+convert *no-8bit,cv-default,cv-extend -+phone 016902 -+max-size 80 -+use-call-id False -+insert-pager-id False -+truncate True - - ######################################### - # modem section # -@@ -335,10 +526,10 @@ - # Locking - # - # Older Unix versions --lock-prefix /usr/spool/uucp/LCK.. -+#lock-prefix /usr/spool/uucp/LCK.. - # Newer Unix versions - #lock-prefix /var/spool/uucp/LCK.. --#lock-prefix /var/lock/LCK.. -+lock-prefix /var/lock/LCK.. - # SysV4 - #lock-prefix /var/spool/locks/LK. - #lock-method sysv4 -@@ -346,22 +537,38 @@ - # Device - # - # Typical a symbolic link to the real device --device /dev/modem -+device /dev/ttyS0 - # "normal" call-out device - #device /dev/cua1 - # Solaris convention - #device /dev/cua/a -+# use the following device for isdn-dialout: -+#device /dev/ttyI6 -+# use the following device for CAPI -+# syntax: CAPI// -+#device CAPI/1/12345 - - # -+# - # Modem talk - # --init \\r !200D ATZ\r fp = fp; fcur -> up = NULL; @@ -19,9 +18,8 @@ diff -Nru yaps-0.96.orig/cfg.c yaps-0.96/cfg.c if ((*ptr != '}') || *(ptr + 1)) { plen = strlen (ptr); if (len + plen + 2 >= siz) { -diff -Nru yaps-0.96.orig/cv.c yaps-0.96/cv.c ---- yaps-0.96.orig/cv.c 1997-06-03 20:43:52.000000000 +0200 -+++ yaps-0.96/cv.c 2009-07-12 11:31:44.000000000 +0200 +--- a/cv.c ++++ b/cv.c @@ -151,7 +151,7 @@ MCHK (c); if ((! c) || (! (fp = fopen (fname, "r")))) @@ -31,9 +29,8 @@ diff -Nru yaps-0.96.orig/cv.c yaps-0.96/cv.c for (sp = line; isspace (*sp); ++sp) ; if (*sp && (*sp != '#')) { -diff -Nru yaps-0.96.orig/pager.h yaps-0.96/pager.h ---- yaps-0.96.orig/pager.h 1997-06-12 13:59:28.000000000 +0200 -+++ yaps-0.96/pager.h 2009-07-12 11:31:33.000000000 +0200 +--- a/pager.h ++++ b/pager.h @@ -67,7 +67,7 @@ /*{{{ utility */ extern char *skip (char *str); @@ -43,9 +40,8 @@ diff -Nru yaps-0.96.orig/pager.h yaps-0.96/pager.h extern int verbose_out (char *, ...); /*}}}*/ /*{{{ string handling */ -diff -Nru yaps-0.96.orig/util.c yaps-0.96/util.c ---- yaps-0.96.orig/util.c 1997-05-31 19:20:40.000000000 +0200 -+++ yaps-0.96/util.c 2009-07-12 11:31:49.000000000 +0200 +--- a/util.c ++++ b/util.c @@ -36,7 +36,7 @@ } @@ -55,9 +51,8 @@ diff -Nru yaps-0.96.orig/util.c yaps-0.96/util.c { char *buf; int size; -diff -Nru yaps-0.96.orig/yaps.c yaps-0.96/yaps.c ---- yaps-0.96.orig/yaps.c 1997-06-14 12:25:56.000000000 +0200 -+++ yaps-0.96/yaps.c 2009-07-12 11:31:39.000000000 +0200 +--- a/yaps.c ++++ b/yaps.c @@ -1177,7 +1177,7 @@ fprintf (stderr, "Unable to open message file %s for reading\n", mfile); return NULL; diff --git a/app-mobilephone/yaps/yaps-0.96-r5.ebuild b/app-mobilephone/yaps/yaps-0.96-r5.ebuild index f25b14a2fa0c..cc0b7407b4ca 100644 --- a/app-mobilephone/yaps/yaps-0.96-r5.ebuild +++ b/app-mobilephone/yaps/yaps-0.96-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r5.ebuild,v 1.3 2014/09/15 08:48:46 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r5.ebuild,v 1.4 2014/09/15 08:56:17 jer Exp $ EAPI=5 inherit eutils toolchain-funcs @@ -13,7 +13,7 @@ SRC_URI="capi? ( ftp://ftp.melware.net/capi4yaps/${P}.c4.tgz ) LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc x86" -IUSE="+capi lua slang unicode" +IUSE="+capi lua slang" RDEPEND=" capi? ( net-dialup/capi4k-utils ) @@ -39,14 +39,6 @@ src_prepare() { if ! use capi; then epatch "${FILESDIR}"/${P}-string.patch fi - - # if specified, convert all relevant files from latin1 to UTF-8 - if use unicode; then - for i in yaps.doc; do - einfo "Converting '${i}' to UTF-8" - iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~" - done - fi } src_compile() { -- cgit v1.2.3-65-gdbad