Update to EAPI 4 and other minor fixes (fixes bug #387261).

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

diff --git a/dev-util/ctags/ChangeLog b/dev-util/ctags/ChangeLog
index 679cc15736fa7c739f1e0302fa28df6e874051e1..7448e1c1f5e3430ffa5a537c5f2d40da4b66c68c 100644 (file)
--- a/dev-util/ctags/ChangeLog
+++ b/dev-util/ctags/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/ctags
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ChangeLog,v 1.74 2010/10/19 05:23:53 leio Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ChangeLog,v 1.75 2011/10/16 06:02:51 radhermit Exp $
+
+  16 Oct 2011; Tim Harder <radhermit@gentoo.org> ctags-5.8.ebuild:
+  Update to EAPI 4 and other minor fixes (fixes bug #387261).
 
   19 Oct 2010; Mart Raudsepp <leio@gentoo.org> ctags-5.5.4-r2.ebuild:
   Drop to ~mips

diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index cb54a29cb3a76e2ac45f33ab0774d2df44435c64..7449182331ede2e5ec51ed403d07525699406d2c 100644 (file)
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX ctags-5.5.4-ebuilds.patch 835 RMD160 dd337274148ef60c8f525ebaf6c0f13593cd0bf0 SHA1 9c6b64c694857217ca49898badb409ea24aec625 SHA256 cf4081cee70409e58ddf6939d7f4ab8a7f0e122fdcdbb4ba6c573372bc4b58b6
 AUX ctags-5.5.4-ruby-classes.patch 601 RMD160 aa5386b41b40e2078fda694018a60f4716e92ebb SHA1 dec9958c0ca212ee72265bef33e3c149a20bf6ef SHA256 bdf76301ebb238de1571f77d8b1a9681c9c6e554814e5b4665cf45bc5083058d
 AUX ctags-5.6-ebuilds.patch 822 RMD160 fc477e7d5a4c912a273ac3177cefb8bb5dec2910 SHA1 e70f4a372d9c3e48d954d02c654c55ead78de400 SHA256 86930711593e7a2a88043bc9a8d5863c2b62514b256d3e9a81f7929951f17e07
@@ -20,6 +23,17 @@ EBUILD ctags-5.6-r3.ebuild 1706 RMD160 2d77aa2335a7b32776712d5feec0e3b92693ac19
 EBUILD ctags-5.7-r1.ebuild 1727 RMD160 5b6dcfcea98feb1c724fea4812506da392da3a7c SHA1 92bc34d7531a9420893eee9a26e47d7e7a5bc8d6 SHA256 cab6d2fe683460dd411d3f7155ec9f7b0287730f28b83b9ed9aa9e217097bdef
 EBUILD ctags-5.7-r2.ebuild 1742 RMD160 42b25406fa31bc50f9c9ac18a433d15ecbcf9632 SHA1 4f06bf36df29c3debbed307040852e908bab4a79 SHA256 059af6e90a9620d5df0f114d1e6f0338bd59376ba0de01ecf9bdf667acd638f7
 EBUILD ctags-5.7.ebuild 1589 RMD160 e57f6b9402ed609a2d9a02e848d0def57f04960a SHA1 a260d5779d4e1672d94129bd04cef2f21e55efc7 SHA256 2731cb122337cebb837b562ca8051a16b1208fbf2617be3244d08b2df328d686
-EBUILD ctags-5.8.ebuild 1758 RMD160 4eccf9d97447b4eb95cc0ff2461d422883c39c73 SHA1 ce64ccd2ef23f22deeb99f0162d163d5a21db90d SHA256 c3693b80293fffad7517fa00b47b5feb5de2c67c4849a5743a67ae78a83da50f
-MISC ChangeLog 9752 RMD160 504b3b3257d2a3b6b8ec739d0337f2a62135c234 SHA1 80b11da358a38d46447f9b0725c2097535d422b8 SHA256 2f87c39ecf01653d7cee2c6082387174bc12c91156ef19d59db363f7247e0614
+EBUILD ctags-5.8.ebuild 1770 RMD160 15158665507fed6fa3973969d0c17442951ca0ee SHA1 2b38308581195c2f82746b8e4d7ca8db38ae416f SHA256 feedb8d9494e1675c2938b32c378019adcc547b8795ffdb5e71f9d1c455592b5
+MISC ChangeLog 9887 RMD160 3fe0d09b1b81737cbfe269d18771cf7867a2a93a SHA1 c229a269dbf8a667229d91ba456e50a2148f960c SHA256 2545d7440205ec739f9f6f6a5d7e2c8588fdb37fe028b69b64a0f3cc62b86368
 MISC metadata.xml 222 RMD160 5123b6991f513049f25fd2a60c5bcc4b7deda1d0 SHA1 d51b39ab79072ab08651ca47eb968960d29f50bc SHA256 3621ccd9c8460be7054a186c326ed9077b42eb25b48252dd0672986b5b0fd12b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOmnOXAAoJEEqz6FtPBkyjQOgH/i2+gg6gqIucCX493sVvJv8I
+BopIaHXnkpV7ZzMWkzHDPs0bmm5NxjeFPI4/HX7dScdaIqOTmC4rPAFA5ZZVmzM5
+9hT2KWEw/vcTFpOQdn652A6H0TOxmSfBPR2Llx6e4MW88cJLAfygdWTL8VDtAtQ8
+PwxxXN2bxvVU3SOI4TlGZuOU8Qx1J+pyMwF2r0PQ0BZ2aGObKG9r5sJdX4/QoCjz
+uKs0cqyIRJou/djcLzGh+GJ0iLsxPu6VKfYMjOFSwQTADPCJn83u5IvFcI3RM01e
+7vs4mqxb1kaZgjHXYpQTKg6tbhGnQADpHUgA5ragH4L4pIFxr9AyNL/KPgWAZf8=
+=Hl9g
+-----END PGP SIGNATURE-----

diff --git a/dev-util/ctags/ctags-5.8.ebuild b/dev-util/ctags/ctags-5.8.ebuild
index f8175aaf30d3fceac39b0af6f725f982dd972fc1..348019766d2344b266364abefb2fb9823432fb84 100644 (file)
--- a/dev-util/ctags/ctags-5.8.ebuild
+++ b/dev-util/ctags/ctags-5.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ctags-5.8.ebuild,v 1.1 2009/11/16 21:59:58 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ctags-5.8.ebuild,v 1.2 2011/10/16 06:02:51 radhermit Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils
 
@@ -27,8 +27,8 @@ src_prepare() {
        epatch "${FILESDIR}/${P}-f95-pointers.patch"
 
        # enabling Ada support
-       if use ada; then
-               cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}"
+       if use ada ; then
+               cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}" || die
                epatch "${FILESDIR}/${P}-ada.patch"
        fi
 }
@@ -38,20 +38,19 @@ src_configure() {
                --with-posix-regex \
                --without-readlib \
                --disable-etags \
-               --enable-tmpdir=/tmp \
-               || die "econf failed"
+               --enable-tmpdir=/tmp
 }
 
 src_install() {
-       einstall || die "einstall failed"
+       emake prefix="${D}"/usr mandir="${D}"/usr/share/man install
 
        # namepace collision with X/Emacs-provided /usr/bin/ctags -- we
        # rename ctags to exuberant-ctags (Mandrake does this also).
-       mv "${D}"/usr/bin/{ctags,exuberant-ctags}
-       mv "${D}"/usr/share/man/man1/{ctags,exuberant-ctags}.1
+       mv "${D}"/usr/bin/{ctags,exuberant-ctags} || die
+       mv "${D}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
 
-       dodoc FAQ NEWS README || die
-       dohtml EXTENDING.html ctags.html || die
+       dodoc FAQ NEWS README
+       dohtml EXTENDING.html ctags.html
 }
 
 pkg_postinst() {