Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/dos2unix: ChangeLog dos2unix-5.3.2.ebuild dos2unix-5.3.1.ebuild dos2unix-5.3.ebuild
Date: Tue, 31 Jan 2012 06:17:55
Message-Id: 20120131061738.55E6420032@flycatcher.gentoo.org
1 polynomial-c 12/01/31 06:17:38
2
3 Modified: ChangeLog dos2unix-5.3.1.ebuild
4 Added: dos2unix-5.3.2.ebuild
5 Removed: dos2unix-5.3.ebuild
6 Log:
7 Version bump. Removed old. Fixed debug build with patch from upstream (bug #400769)
8
9 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.76 app-text/dos2unix/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.76&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.76&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/ChangeLog?r1=1.75&r2=1.76
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v
21 retrieving revision 1.75
22 retrieving revision 1.76
23 diff -u -r1.75 -r1.76
24 --- ChangeLog 24 Jan 2012 09:50:28 -0000 1.75
25 +++ ChangeLog 31 Jan 2012 06:17:38 -0000 1.76
26 @@ -1,6 +1,14 @@
27 # ChangeLog for app-text/dos2unix
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.75 2012/01/24 09:50:28 jlec Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.76 2012/01/31 06:17:38 polynomial-c Exp $
31 +
32 +*dos2unix-5.3.2 (31 Jan 2012)
33 +
34 + 31 Jan 2012; Lars Wendler <polynomial-c@g.o> -dos2unix-5.3.ebuild,
35 + dos2unix-5.3.1.ebuild, +files/dos2unix-5.3.1-fix_debug_build.patch,
36 + +dos2unix-5.3.2.ebuild, +files/dos2unix-5.3.2-fix_debug_build.patch:
37 + non-maintainer commit: Version bump. Removed old. Fixed debug build with
38 + patch from upstream (bug #400769).
39
40 24 Jan 2012; Justin Lecher <jlec@g.o> dos2unix-5.3.1.ebuild:
41 EAPI BUMP to 4
42
43
44
45 1.3 app-text/dos2unix/dos2unix-5.3.1.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/dos2unix-5.3.1.ebuild?rev=1.3&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/dos2unix-5.3.1.ebuild?rev=1.3&content-type=text/plain
49 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/dos2unix-5.3.1.ebuild?r1=1.2&r2=1.3
50
51 Index: dos2unix-5.3.1.ebuild
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.3.1.ebuild,v
54 retrieving revision 1.2
55 retrieving revision 1.3
56 diff -u -r1.2 -r1.3
57 --- dos2unix-5.3.1.ebuild 24 Jan 2012 09:50:28 -0000 1.2
58 +++ dos2unix-5.3.1.ebuild 31 Jan 2012 06:17:38 -0000 1.3
59 @@ -1,6 +1,6 @@
60 # Copyright 1999-2012 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62 -# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.3.1.ebuild,v 1.2 2012/01/24 09:50:28 jlec Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.3.1.ebuild,v 1.3 2012/01/31 06:17:38 polynomial-c Exp $
64
65 EAPI=4
66
67 @@ -26,6 +26,8 @@
68 dev-lang/perl"
69
70 src_prepare() {
71 + epatch "${FILESDIR}"/${PN}-5.3.1-fix_debug_build.patch
72 +
73 sed \
74 -e '/^LDFLAGS/s|=|+=|' \
75 -e '/^CC/s|=|?=|' \
76
77
78
79 1.1 app-text/dos2unix/dos2unix-5.3.2.ebuild
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/dos2unix-5.3.2.ebuild?rev=1.1&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/dos2unix-5.3.2.ebuild?rev=1.1&content-type=text/plain
83
84 Index: dos2unix-5.3.2.ebuild
85 ===================================================================
86 # Copyright 1999-2012 Gentoo Foundation
87 # Distributed under the terms of the GNU General Public License v2
88 # $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.3.2.ebuild,v 1.1 2012/01/31 06:17:38 polynomial-c Exp $
89
90 EAPI=4
91
92 inherit eutils toolchain-funcs
93
94 DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
95 HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
96 SRC_URI="
97 http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
98 mirror://sourceforge/${PN}/${P}.tar.gz"
99
100 LICENSE="BSD-2"
101 SLOT="0"
102 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"
103 IUSE="debug nls"
104
105 RDEPEND="
106 !app-text/hd2u
107 !app-text/unix2dos
108 virtual/libintl"
109 DEPEND="
110 ${RDEPEND}
111 dev-lang/perl"
112
113 src_prepare() {
114 epatch "${FILESDIR}"/${PN}-5.3.2-fix_debug_build.patch
115
116 sed \
117 -e '/^LDFLAGS/s|=|+=|' \
118 -e '/^CC/s|=|?=|' \
119 -e '/CFLAGS_OS \+=/d' \
120 -e '/LDFLAGS_EXTRA \+=/d' \
121 -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
122 -i "${S}"/Makefile || die
123 tc-export CC
124 use debug && sed "/DEBUG/s:0:1:g" -i Makefile
125 }
126
127 lintl() {
128 # same logic as from virtual/libintl
129 use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
130 }
131
132 src_compile() {
133 emake prefix="${EPREFIX}/usr" \
134 $(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=")
135 }
136
137 src_install() {
138 emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
139 $(use nls || echo "ENABLE_NLS=") install
140 }