public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-text/dos2unix: ChangeLog dos2unix-5.0.ebuild
@ 2010-03-20 19:34 Fabian Groffen (grobian)
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen (grobian) @ 2010-03-20 19:34 UTC (permalink / raw
  To: gentoo-commits

grobian     10/03/20 19:34:56

  Modified:             ChangeLog dos2unix-5.0.ebuild
  Log:
  Fix USE=nls for platforms that do not have libintl in libc, fix for Prefix
  (Portage version: 2.2.00.15838-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.42                 app-text/dos2unix/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	20 Mar 2010 16:07:47 -0000	1.41
+++ ChangeLog	20 Mar 2010 19:34:55 -0000	1.42
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/dos2unix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.41 2010/03/20 16:07:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.42 2010/03/20 19:34:55 grobian Exp $
+
+  20 Mar 2010; Fabian Groffen <grobian@gentoo.org> dos2unix-5.0.ebuild:
+  Fix USE=nls for platforms that do not have libintl in libc, fix for Prefix
 
 *dos2unix-5.0 (20 Mar 2010)
 



1.2                  app-text/dos2unix/dos2unix-5.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?r1=1.1&r2=1.2

Index: dos2unix-5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dos2unix-5.0.ebuild	20 Mar 2010 16:07:47 -0000	1.1
+++ dos2unix-5.0.ebuild	20 Mar 2010 19:34:55 -0000	1.2
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v 1.1 2010/03/20 16:07:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v 1.2 2010/03/20 19:34:55 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit toolchain-funcs
 
@@ -17,7 +17,9 @@
 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"
 IUSE="nls"
 
+DEPEND="virtual/libintl"
 RDEPEND="
+	${DEPEND}
 	!app-text/hd2u
 	!app-text/unix2dos"
 
@@ -25,11 +27,25 @@
 	sed \
 		-e '/^LDFLAGS/s|=|+=|' \
 		-e '/^CC/s|=|?=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
 		-i "${S}"/Makefile
 	tc-export CC
 }
 
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc? && use !elibc_uclibc? && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}"/usr \
+		$(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=") \
+		|| die
+}
+
 src_install() {
-	emake DESTDIR="${D}" $(use nls || echo "ENABLE_NLS=") install \
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+		$(use nls || echo "ENABLE_NLS=") install \
 		|| die "emake install failed"
 }






^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/dos2unix: ChangeLog dos2unix-5.0.ebuild
@ 2010-03-22  7:36 Justin Lecher (jlec)
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher (jlec) @ 2010-03-22  7:36 UTC (permalink / raw
  To: gentoo-commits

jlec        10/03/22 07:36:29

  Modified:             ChangeLog dos2unix-5.0.ebuild
  Log:
  HOMEPAGE fixed per 310643
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.44                 app-text/dos2unix/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	21 Mar 2010 08:13:13 -0000	1.43
+++ ChangeLog	22 Mar 2010 07:36:28 -0000	1.44
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/dos2unix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.43 2010/03/21 08:13:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.44 2010/03/22 07:36:28 jlec Exp $
+
+  22 Mar 2010; <justin@gentoo.org> dos2unix-5.0.ebuild:
+  HOMEPAGE fixed per 310643
 
   21 Mar 2010; Fabian Groffen <grobian@gentoo.org> dos2unix-5.0.ebuild:
   Remove stray ? from use conditionals, bug #310455



1.4                  app-text/dos2unix/dos2unix-5.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?r1=1.3&r2=1.4

Index: dos2unix-5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dos2unix-5.0.ebuild	21 Mar 2010 08:13:13 -0000	1.3
+++ dos2unix-5.0.ebuild	22 Mar 2010 07:36:28 -0000	1.4
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v 1.3 2010/03/21 08:13:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v 1.4 2010/03/22 07:36:28 jlec Exp $
 
 EAPI="3"
 
 inherit toolchain-funcs
 
 DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/ http://sourceforge.net/projects/dos2unix/"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
 SRC_URI="
 	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
 	mirror://sourceforge/${PN}/${P}.tar.gz"






^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/dos2unix: ChangeLog dos2unix-5.0.ebuild
@ 2010-03-21  8:13 Fabian Groffen (grobian)
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen (grobian) @ 2010-03-21  8:13 UTC (permalink / raw
  To: gentoo-commits

grobian     10/03/21 08:13:14

  Modified:             ChangeLog dos2unix-5.0.ebuild
  Log:
  Remove stray ? from use conditionals, bug #310455, too much copy 'n' paste :(
  (Portage version: 2.2.00.15838-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.43                 app-text/dos2unix/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	20 Mar 2010 19:34:55 -0000	1.42
+++ ChangeLog	21 Mar 2010 08:13:13 -0000	1.43
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/dos2unix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.42 2010/03/20 19:34:55 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.43 2010/03/21 08:13:13 grobian Exp $
+
+  21 Mar 2010; Fabian Groffen <grobian@gentoo.org> dos2unix-5.0.ebuild:
+  Remove stray ? from use conditionals, bug #310455
 
   20 Mar 2010; Fabian Groffen <grobian@gentoo.org> dos2unix-5.0.ebuild:
   Fix USE=nls for platforms that do not have libintl in libc, fix for Prefix



1.3                  app-text/dos2unix/dos2unix-5.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?r1=1.2&r2=1.3

Index: dos2unix-5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dos2unix-5.0.ebuild	20 Mar 2010 19:34:55 -0000	1.2
+++ dos2unix-5.0.ebuild	21 Mar 2010 08:13:13 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v 1.2 2010/03/20 19:34:55 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v 1.3 2010/03/21 08:13:13 grobian Exp $
 
 EAPI="3"
 
@@ -35,7 +35,7 @@
 
 lintl() {
 	# same logic as from virtual/libintl
-	use !elibc_glibc? && use !elibc_uclibc? && echo "-lintl"
+	use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
 }
 
 src_compile() {






^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/dos2unix: ChangeLog dos2unix-5.0.ebuild
@ 2010-03-20 16:07 Justin Lecher (jlec)
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher (jlec) @ 2010-03-20 16:07 UTC (permalink / raw
  To: gentoo-commits

jlec        10/03/20 16:07:48

  Modified:             ChangeLog
  Added:                dos2unix-5.0.ebuild
  Log:
  Version bump per 296379, Thanks Lars Wendler for the updated ebuild
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.41                 app-text/dos2unix/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/ChangeLog?r1=1.40&r2=1.41

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ChangeLog	15 Jan 2010 04:02:22 -0000	1.40
+++ ChangeLog	20 Mar 2010 16:07:47 -0000	1.41
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/dos2unix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.40 2010/01/15 04:02:22 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.41 2010/03/20 16:07:47 jlec Exp $
+
+*dos2unix-5.0 (20 Mar 2010)
+
+  20 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org> +dos2unix-5.0.ebuild:
+  Version bump per 296379, Thanks Lars Wendler for the updated ebuild
 
   15 Jan 2010; Jonathan Callen <abcd@gentoo.org> dos2unix-3.1-r2.ebuild:
   Add prefix keywords



1.1                  app-text/dos2unix/dos2unix-5.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild?rev=1.1&content-type=text/plain

Index: dos2unix-5.0.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.0.ebuild,v 1.1 2010/03/20 16:07:47 jlec Exp $

EAPI="2"

inherit toolchain-funcs

DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
HOMEPAGE="http://www.xs4all.nl/~waterlan/ http://sourceforge.net/projects/dos2unix/"
SRC_URI="
	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
	mirror://sourceforge/${PN}/${P}.tar.gz"

LICENSE="BSD-2"
SLOT="0"
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"
IUSE="nls"

RDEPEND="
	!app-text/hd2u
	!app-text/unix2dos"

src_prepare() {
	sed \
		-e '/^LDFLAGS/s|=|+=|' \
		-e '/^CC/s|=|?=|' \
		-i "${S}"/Makefile
	tc-export CC
}

src_install() {
	emake DESTDIR="${D}" $(use nls || echo "ENABLE_NLS=") install \
		|| die "emake install failed"
}






^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-03-22  7:36 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-20 19:34 [gentoo-commits] gentoo-x86 commit in app-text/dos2unix: ChangeLog dos2unix-5.0.ebuild Fabian Groffen (grobian)
  -- strict thread matches above, loose matches on Subject: below --
2010-03-22  7:36 Justin Lecher (jlec)
2010-03-21  8:13 Fabian Groffen (grobian)
2010-03-20 16:07 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox