diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-03-20 19:34:55 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-03-20 19:34:55 +0000 |
| commit | 92825ff48b2c466c726a080e58df057c7b0c8e04 (patch) | |
| tree | 2c7693ff1c993e43e9ffe0bc0ce8dacc5fd12a00 /app-text | |
| parent | Improve usage of python eclass (bug 308301): use PYTHON_DEPEND, set active py... (diff) | |
| download | historical-92825ff48b2c466c726a080e58df057c7b0c8e04.tar.gz historical-92825ff48b2c466c726a080e58df057c7b0c8e04.tar.bz2 historical-92825ff48b2c466c726a080e58df057c7b0c8e04.zip | |
Fix USE=nls for platforms that do not have libintl in libc, fix for Prefix
Package-Manager: portage-2.2.00.15838-prefix/cvs/Darwin powerpc
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/dos2unix/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/dos2unix/Manifest | 14 | ||||
| -rw-r--r-- | app-text/dos2unix/dos2unix-5.0.ebuild | 22 |
3 files changed, 25 insertions, 16 deletions
diff --git a/app-text/dos2unix/ChangeLog b/app-text/dos2unix/ChangeLog index af398fe652f1..d57d9a04a310 100644 --- a/app-text/dos2unix/ChangeLog +++ b/app-text/dos2unix/ChangeLog @@ -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) diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest index 4e305ad6a004..d315decd577a 100644 --- a/app-text/dos2unix/Manifest +++ b/app-text/dos2unix/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX dos2unix-3.1-includes.patch 238 RMD160 76098e5d0e00f250995275cead77b9b951eb243c SHA1 159fe1a9fb41df6a7984f8fca364779ac5124b47 SHA256 6fbde8e506e3f21d49d9b95195a29b7ea4e5251bedecdd833057e1316b7494e5 AUX dos2unix-3.1-manpage-update.patch 4120 RMD160 92772ca4fd68e4e1e117773551c1f8f9e8d8c7e7 SHA1 ff19ce5d80442005bb66b2d30bc8fa638178dc6a SHA256 3ead9e9886b0acdfa516f9bd57c3241a0cfe521505f1ec72103def46435c077b AUX dos2unix-3.1-preserve-file-modes.patch 790 RMD160 5d12d9b74347709a042c3e13b52ca3d534ab7209 SHA1 33ef0e91571d57827a2e3087df6e93f438582901 SHA256 e9462d9c2c3395f179ee2cd9dcb326246a5d8e5762219676c400f0014d4bda4b @@ -11,13 +8,6 @@ AUX dos2unix-3.1.patch 364 RMD160 0f54e32288ac308dbaa978c9166197e9c172c066 SHA1 DIST dos2unix-3.1.tar.bz2 13400 RMD160 20bc2db591ced448fb8f2f9dda4894e02bc9233f SHA1 4724288671cb71e1ecd46151bcb53f8fa7c9e502 SHA256 6e571d6f334809cecf064da32e8be95132e69a30020e7f3009bb80455f093a94 DIST dos2unix-5.0.tar.gz 61617 RMD160 5e05919c38883bab3218ddbcb6acb78f1c448982 SHA1 9870cb9b79e07609b5f8370178433b9094b7a981 SHA256 0e7ef835f4bcb6b61bc8f280affb953d84c78cd5c9df9aa0e056ffdb4894c028 EBUILD dos2unix-3.1-r2.ebuild 1283 RMD160 6f1f2a58e9a32de804e0a7a755d45391bf05ea67 SHA1 53193cff0b698fa814951f6f22405992995b7da2 SHA256 585e50adbd4e888b15d6cdd2073de5c69193a679fef82e18f4fda99c08607cde -EBUILD dos2unix-5.0.ebuild 983 RMD160 8ae00b6dbbe6f12a27c7172954d1bd4eb19f99b1 SHA1 ac59fcf520f1492d8a741a45ba90c71f05bf3484 SHA256 84ed112c6915850a9d6c57ed2d891cc9935067bd01f2356763b747d28c878aa4 -MISC ChangeLog 4679 RMD160 d0ac2d7ac38c0c4db205754d331db307e4053810 SHA1 79e0c868c3f9e44d4162c2b04ace1a009688deb2 SHA256 c22859240849f56aad36f007b112491e43a8f70f9ae0e339ac0dd1b980b7532f +EBUILD dos2unix-5.0.ebuild 1346 RMD160 5698218b568b4cb8a72d29bcdde9c6efe13660f0 SHA1 45a10cff4c2cd2b508ba416e4bd2f878ae800b65 SHA256 ba507e52aefe0a9178f7a59f54233774b60f063d9a412a60edae0edbf2bb3bba +MISC ChangeLog 4832 RMD160 d4a6c68ffae601636973a136e2163e24095e11f9 SHA1 9bb9669806ada7812de3634a834f91ab2b08a479 SHA256 d9854c9d04c752d86fa8f6bf114373f474f49edfd16abbb3f76c7de4b7623604 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuk8tkACgkQgAnW8HDreRZVHQCghLHgvuQigc0etTxHZ0yceCw9 -dMUAoJvCr9WQfaXo78919Hz9KeyW5U6O -=c0Zf ------END PGP SIGNATURE----- diff --git a/app-text/dos2unix/dos2unix-5.0.ebuild b/app-text/dos2unix/dos2unix-5.0.ebuild index 0aafcc6e4f40..9606bf6c4bac 100644 --- a/app-text/dos2unix/dos2unix-5.0.ebuild +++ b/app-text/dos2unix/dos2unix-5.0.ebuild @@ -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 @@ 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" +DEPEND="virtual/libintl" RDEPEND=" + ${DEPEND} !app-text/hd2u !app-text/unix2dos" @@ -25,11 +27,25 @@ src_prepare() { 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" } |