Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/dos2unix/
Date: Wed, 12 Apr 2017 11:10:54
Message-Id: 1491994006.eda190af0c78b6d88eecdffa8bfad7a6656bad54.radhermit@gentoo
1 commit: eda190af0c78b6d88eecdffa8bfad7a6656bad54
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 12 10:46:46 2017 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 12 10:46:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda190af
7
8 app-text/dos2unix: remove old
9
10 app-text/dos2unix/Manifest | 2 -
11 app-text/dos2unix/dos2unix-7.3-r1.ebuild | 59 -----------------------
12 app-text/dos2unix/dos2unix-7.3.3.ebuild | 82 --------------------------------
13 3 files changed, 143 deletions(-)
14
15 diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
16 index 88132279dd2..96f90334121 100644
17 --- a/app-text/dos2unix/Manifest
18 +++ b/app-text/dos2unix/Manifest
19 @@ -1,3 +1 @@
20 -DIST dos2unix-7.3.3.tar.gz 638368 SHA256 5c910aea2eae96663c67e87627998c4fe3cded403be5819b4c190e56c82ff0fb SHA512 52218ea17cc63a4b41e1bd12f200dda31e2be65167ca9c913391640c118d7122348aa2e5aec934ee17c8ea77a04cb89a1a572865645a77f6875207295c10e7af WHIRLPOOL 749cabc6d2d57caccf183082689a0d677d7d5b7822c8a92a85a5b2d722284542c95dcd46947ea05a1d2cff1d230351cacf1f0667957f18c7c02c12c6c62f2e16
21 DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5 SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710 WHIRLPOOL 46c771c63572d0d0301db5bde4734297df037654cbc71e5a8f93003fbf503399ec5026bc53fea3b3b10e346e2b59d24bdcd6d9139342354cdb1b8a6e240deaeb
22 -DIST dos2unix-7.3.tar.gz 497218 SHA256 8175f7552a72edaaa8918fdee68ce2cbc982dc25452f33d4dc611d769f4944d1 SHA512 dc70fc4cf12811794e9b33db7cc44085788450104f7beefacea5ac11af5ca76d909235232be51eb7a32ed5d75a01a86a4c6b064060b945c8a7e7968caeb51cea WHIRLPOOL 55b3990816a122c4bc2219b1f89b5d7f619901693b57349b58222166f5c3e006db08a55a26ce62493009459b9a3c6a091a07ecacabf9450a0a7475fbd9f195ae
23
24 diff --git a/app-text/dos2unix/dos2unix-7.3-r1.ebuild b/app-text/dos2unix/dos2unix-7.3-r1.ebuild
25 deleted file mode 100644
26 index f2198c45e4a..00000000000
27 --- a/app-text/dos2unix/dos2unix-7.3-r1.ebuild
28 +++ /dev/null
29 @@ -1,59 +0,0 @@
30 -# Copyright 1999-2015 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=5
34 -
35 -inherit eutils toolchain-funcs
36 -
37 -DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
38 -HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
39 -SRC_URI="
40 - http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
41 - mirror://sourceforge/${PN}/${P}.tar.gz"
42 -
43 -LICENSE="BSD-2"
44 -SLOT="0"
45 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
46 -IUSE="debug nls test"
47 -
48 -RDEPEND="
49 - !app-text/hd2u
50 - virtual/libintl"
51 -
52 -DEPEND="
53 - ${RDEPEND}
54 - nls? ( sys-devel/gettext )
55 - test? ( virtual/perl-Test-Simple )
56 - dev-lang/perl"
57 -
58 -src_prepare() {
59 - sed \
60 - -e '/^LDFLAGS/s|=|+=|' \
61 - -e '/CFLAGS_OS \+=/d' \
62 - -e '/LDFLAGS_EXTRA \+=/d' \
63 - -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
64 - -i Makefile || die
65 -
66 - if use debug ; then
67 - sed -e "/^DEBUG/s:0:1:" \
68 - -e "/EXTRA_CFLAGS +=/s:-g::" \
69 - -i Makefile || die
70 - fi
71 -
72 - tc-export CC
73 -}
74 -
75 -lintl() {
76 - # same logic as from virtual/libintl
77 - use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
78 -}
79 -
80 -src_compile() {
81 - emake prefix="${EPREFIX}/usr" \
82 - $(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
83 -}
84 -
85 -src_install() {
86 - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
87 - $(usex nls "" "ENABLE_NLS=") install
88 -}
89
90 diff --git a/app-text/dos2unix/dos2unix-7.3.3.ebuild b/app-text/dos2unix/dos2unix-7.3.3.ebuild
91 deleted file mode 100644
92 index 37598b85e65..00000000000
93 --- a/app-text/dos2unix/dos2unix-7.3.3.ebuild
94 +++ /dev/null
95 @@ -1,82 +0,0 @@
96 -# Copyright 1999-2016 Gentoo Foundation
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=6
100 -
101 -PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
102 -
103 -inherit l10n toolchain-funcs
104 -
105 -DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
106 -HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
107 -SRC_URI="
108 - http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
109 - mirror://sourceforge/${PN}/${P}.tar.gz"
110 -
111 -LICENSE="BSD-2"
112 -SLOT="0"
113 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
114 -IUSE="debug nls test"
115 -
116 -RDEPEND="
117 - !app-text/hd2u
118 - virtual/libintl"
119 -
120 -DEPEND="
121 - ${RDEPEND}
122 - nls? ( sys-devel/gettext )
123 - test? ( virtual/perl-Test-Simple )
124 - dev-lang/perl"
125 -
126 -handle_locales() {
127 - # Make sure locale list is kept up-to-date.
128 - local detected sorted
129 - detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
130 - sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
131 - if [[ ${sorted} != "${detected}" ]] ; then
132 - eerror "The ebuild needs to be kept in sync."
133 - eerror "PLOCALES: ${sorted}"
134 - eerror "po*/*.po: ${detected}"
135 - die "sync PLOCALES"
136 - fi
137 -
138 - # Deal with selective install of locales.
139 - rm_loc() { rm po*/$1.po || die; }
140 - l10n_for_each_disabled_locale_do rm_loc
141 -}
142 -
143 -src_prepare() {
144 - default
145 -
146 - handle_locales
147 -
148 - sed \
149 - -e '/^LDFLAGS/s|=|+=|' \
150 - -e '/CFLAGS_OS \+=/d' \
151 - -e '/LDFLAGS_EXTRA \+=/d' \
152 - -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
153 - -i Makefile || die
154 -
155 - if use debug ; then
156 - sed -e "/^DEBUG/s:0:1:" \
157 - -e "/EXTRA_CFLAGS +=/s:-g::" \
158 - -i Makefile || die
159 - fi
160 -
161 - tc-export CC
162 -}
163 -
164 -lintl() {
165 - # same logic as from virtual/libintl
166 - use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
167 -}
168 -
169 -src_compile() {
170 - emake prefix="${EPREFIX}/usr" \
171 - $(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
172 -}
173 -
174 -src_install() {
175 - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
176 - $(usex nls "" "ENABLE_NLS=") install
177 -}