diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-12-28 16:31:14 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-12-28 16:31:14 +0000 |
| commit | d9899fe7b320afb4aa1d947d6e957f3e7ed37238 (patch) | |
| tree | fcf4de073a66c4d67ad0bc21cd8ee970aa8567c9 /sys-apps | |
| parent | changed HOMEPAGE , added a patch that I missed last (fixes USE="-esd" and clo... (diff) | |
| download | gentoo-2-d9899fe7b320afb4aa1d947d6e957f3e7ed37238.tar.gz gentoo-2-d9899fe7b320afb4aa1d947d6e957f3e7ed37238.tar.bz2 gentoo-2-d9899fe7b320afb4aa1d947d6e957f3e7ed37238.zip | |
Move pgawk and igawk to /usr/bin, bug #36453.
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/gawk/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/gawk/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/gawk/gawk-3.1.3-r1.ebuild | 26 |
3 files changed, 26 insertions, 9 deletions
diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog index 7f21c72ceacb..682f31ad32d8 100644 --- a/sys-apps/gawk/ChangeLog +++ b/sys-apps/gawk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/gawk # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.33 2003/12/28 11:04:56 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.34 2003/12/28 16:30:39 azarah Exp $ + + 28 Dec 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.3-r1.ebuild: + Move pgawk and igawk to /usr/bin, bug #36453. *gawk-3.1.3-r1 (28 Dec 2003) diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest index a83788789bbe..7ffddb9f79b8 100644 --- a/sys-apps/gawk/Manifest +++ b/sys-apps/gawk/Manifest @@ -1,8 +1,8 @@ MD5 f584968328fea7b81492ac5f1ae89578 gawk-3.1.1-r2.ebuild 2432 -MD5 4acb26a94fa0a3601bc216ef9c3aa38b ChangeLog 5974 +MD5 d2efa0a079cdc1e4d578968a4f53f25d ChangeLog 6097 MD5 d924ee1f9db16fb2f21235b6d08a27c3 gawk-3.1.2-r3.ebuild 2946 MD5 6fc76e8486bf32d6c5a66a22c62d5517 gawk-3.1.3.ebuild 2580 -MD5 2f9236a62060fead62b2b81a2bb4fbbe gawk-3.1.3-r1.ebuild 2740 +MD5 94a3e6390c399990b7240b6dca6637d1 gawk-3.1.3-r1.ebuild 3078 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 9ee5f35f388bc0943f9f1df199bdd64d files/digest-gawk-3.1.1-r2 63 MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3 63 diff --git a/sys-apps/gawk/gawk-3.1.3-r1.ebuild b/sys-apps/gawk/gawk-3.1.3-r1.ebuild index 1da270aa411f..9bc74160655c 100644 --- a/sys-apps/gawk/gawk-3.1.3-r1.ebuild +++ b/sys-apps/gawk/gawk-3.1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r1.ebuild,v 1.1 2003/12/28 11:04:56 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r1.ebuild,v 1.2 2003/12/28 16:30:39 azarah Exp $ IUSE="nls build" @@ -30,7 +30,7 @@ src_unpack() { } src_compile() { - local myconf="" + local myconf= use nls || myconf="${myconf} --disable-nls" einfo "Building gawk ..." @@ -65,20 +65,34 @@ src_install() { AWKINCDIR=${S} \ install || die + dodir /usr/bin # In some rare cases, (p)gawk gets installed as (p)gawk- and not # (p)gawk-${PV} .. Also make sure that /bin/(p)gawk is a symlink # to /bin/(p)gawk-${PV}. - for x in gawk pgawk + for x in gawk pgawk igawk do + local binpath="/bin" + + case ${x} in + igawk|pgawk) + binpath="/usr/bin" + ;; + esac + if [ -f "${D}/bin/${x}" -a ! -f "${D}/bin/${x}-${PV}" ] then - mv -f ${D}/bin/${x} ${D}/bin/${x}-${PV} + mv -f ${D}/bin/${x} ${D}/${binpath}/${x}-${PV} elif [ -f "${D}/bin/${x}-" -a ! -f "${D}/bin/${x}-${PV}" ] then - mv -f ${D}/bin/${x} ${D}/bin/${x}-${PV} + mv -f ${D}/bin/${x}- ${D}/${binpath}/${x}-${PV} + elif [ "${binpath}" = "/usr/bin" -a -f "${D}/bin/${x}-${PV}" ] + then + mv -f ${D}/bin/${x}-${PV} ${D}/${binpath}/${x}-${PV} fi + rm -f ${D}/bin/${x} - dosym ${x}-${PV} /bin/${x} + dosym ${x}-${PV} ${binpath}/${x} + [ "${binpath}" = "/usr/bin" ] && dosym ../usr/bin/${x}-${PV} /bin/${x} done rm -f ${D}/bin/awk |