Revbump to add sys-devel/flex (thanks to bay, bug 387651). EAPI-4, cleanups.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/dev-util/cutils/ChangeLog b/dev-util/cutils/ChangeLog
index 0a6844cc49eeb2b805fe37fcf177139954a1b8f0..d2f261d09a7e0fb4e888c6475f8063189cea5eef 100644 (file)
--- a/dev-util/cutils/ChangeLog
+++ b/dev-util/cutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cutils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cutils/ChangeLog,v 1.26 2009/09/23 17:42:34 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cutils/ChangeLog,v 1.27 2011/11/12 14:50:02 xmw Exp $
+
+*cutils-1.6-r4 (12 Nov 2011)
+
+  12 Nov 2011; Michael Weber <xmw@gentoo.org> -cutils-1.6-r3.ebuild,
+  +cutils-1.6-r4.ebuild:
+  Revbump to add sys-devel/flex (thanks to bay, bug 387651). EAPI-4, cleanups.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> cutils-1.6-r2.ebuild:
   Remove virtual/libc

diff --git a/dev-util/cutils/Manifest b/dev-util/cutils/Manifest
index 6817ffb6f6e9d44bb2adc6590210c4648dd03b92..a9a5cf17acd56bbdc4efab95d0f781fa202523f4 100644 (file)
--- a/dev-util/cutils/Manifest
+++ b/dev-util/cutils/Manifest
@@ -5,15 +5,13 @@ AUX cutils-1.6-r1-gentoo.diff 683 RMD160 97fa4a9a8e3797439a18b4d3795a2c4771acb2d
 AUX cutils-infopage.patch 458 RMD160 575000e216d2f1d1aad0c8fe786d9544789e603e SHA1 8974071886d8bb81a43873517050817fc8282773 SHA256 d1acd947f51cf0e294e3ddb603961aa7055c844ce0cbd664f8fe605ce9035981
 DIST cutils-1.6.tar.gz 128722 RMD160 416757ddf6c546c55d992ab494fde8b5e394a7cc SHA1 788b8b4ec478285ac129021607974657fc501fa3 SHA256 b26c22f2ca3905579273e132708094e95b4fe2a0576ce4bea8a7cbfc7a0084b8
 EBUILD cutils-1.6-r2.ebuild 1209 RMD160 653ecc68620a449a839ad9ca9e0596f509e54574 SHA1 aacf90ed8e2e720428f477562d0b194d09e17fd6 SHA256 27b6687f2b0d7199414040b462f1d1bf6afdef0abcf060301aded47ae597f0d8
-EBUILD cutils-1.6-r3.ebuild 1438 RMD160 0e7815705289814ad71648650ed2124be6c49ab9 SHA1 eb115a7b8059030e7fb9beade14045d36d9a96f5 SHA256 a410ea2c5f4022b529d48b84e3d3c039d085bcfd5612e97fa9f6ec62fdd7bd39
-MISC ChangeLog 3816 RMD160 caff807285770998bf3a09cb514d06941aea50e8 SHA1 c893fec141b7e9101f5c3cb4a4c771d39990fbf3 SHA256 b9d21f4d778dd476d0d008c99794268e13d49da88d52640e0439a6983ffb07c3
+EBUILD cutils-1.6-r4.ebuild 1283 RMD160 1ef6264b4803084c07dd5d582c24048d7f3ad892 SHA1 aa0c91ae0b694de654a602d90db5cb396235871f SHA256 6214870f376ad6d7cceb633cb9a4bdcd11da398d3739228a46ee3320cf99e600
+MISC ChangeLog 4016 RMD160 beff3ebe80bddae6f608b5e3babf92dbf8ef140c SHA1 4e8a0192109a3408fe2737fad90ed62f8de12b2b SHA256 cd4f46961217b9eb7085e5d52d0c43c7bc151222f47f0be36be83ab922295330
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59m5IACgkQfXuS5UK5QB0MNgP+O6kTFGTAzZtKuhLll2EBjzBe
-07pLL7Yq1Nz3XMDT5nKrbcgDnISFoPXlHj1C60/feqoqLJb35uzPngf950da3qSZ
-U9bmJw0oZ9qBgFwZ8eiWSKfuD4gEdm/xXka9w8LIiprl83cEt+amQ0RowJyg8jMa
-9dLHf3j9xXCjRo17SbY=
-=S+Kp
+iF4EAREIAAYFAk6+h6AACgkQknrdDGLu8JDuPQD/Y5iYjpyl2yd/MlD2jwBPgaIX
+aTLB+8jChi9QpieXAzoA/iDz1JLH1Wlw9uOYF+lZHT6fQuJG3SEBYDCYaQjmpa8E
+=WIFE
 -----END PGP SIGNATURE-----

diff --git a/dev-util/cutils/cutils-1.6-r3.ebuild b/dev-util/cutils/cutils-1.6-r3.ebuild
deleted file mode 100644 (file)
index 71573dc..0000000
--- a/dev-util/cutils/cutils-1.6-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cutils/cutils-1.6-r3.ebuild,v 1.2 2008/11/24 23:23:51 tcunha Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="C language utilities"
-HOMEPAGE="http://www.sigala.it/sandro/software.php#cutils"
-SRC_URI="http://www.sigala.it/sandro/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-src_unpack() {
-       unpack ${A}
-
-       epatch "${FILESDIR}"/${PN}-infopage.patch
-
-       mv "${S}"/src/cdecl/cdecl.1                     \
-               "${S}"/src/cdecl/cutils-cdecl.1 || die "mv cdecl failed"
-       # Force rebuild of cutils.info
-       rm -f "${S}"/doc/cutils.info
-
-       sed -i "s/cdecl/cutils-cdecl/g"                 \
-               "${S}"/doc/cutils.texi || die "sed cutils.info failed"
-       sed -i "/PROG/s/cdecl/cutils-cdecl/"    \
-               "${S}"/src/cdecl/Makefile.in || die "sed cdecl failed"
-       sed -i "/Xr/s/cdecl/cutils-cdecl/"              \
-               "${S}"/src/cundecl/cundecl.1 || die "sed cundecl.1 failed"
-       sed -i "/Nm/s/cdecl/cutils-cdecl/"              \
-               "${S}"/src/cdecl/cutils-cdecl.1 || die "sed cutils-cdecl.1 failed"
-}
-
-src_compile() {
-       econf
-       emake CC="$(tc-getCC)" -j1 || die "emake failed"
-}
-
-src_install () {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc CREDITS HISTORY NEWS README || die "dodoc failed"
-}
-
-pkg_postinst () {
-       elog "cdecl was installed as cutils-cdecl because of a naming conflict"
-       elog "with dev-util/cdecl."
-}

diff --git a/dev-util/cutils/cutils-1.6-r4.ebuild b/dev-util/cutils/cutils-1.6-r4.ebuild
new file mode 100644 (file)
index 0000000..523a846
--- /dev/null
+++ b/dev-util/cutils/cutils-1.6-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cutils/cutils-1.6-r4.ebuild,v 1.1 2011/11/12 14:50:02 xmw Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="C language utilities"
+HOMEPAGE="http://www.sigala.it/sandro/software.php#cutils"
+SRC_URI="http://www.sigala.it/sandro/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/flex"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-infopage.patch
+
+       mv "${S}"/src/cdecl/cdecl.1                     \
+               "${S}"/src/cdecl/cutils-cdecl.1 || die
+       # Force rebuild of cutils.info
+       rm -f "${S}"/doc/cutils.info || die
+
+       sed -e "s/cdecl/cutils-cdecl/g" \
+               -i "${S}"/doc/cutils.texi || die
+       sed -e "/PROG/s/cdecl/cutils-cdecl/" \
+               -i "${S}"/src/cdecl/Makefile.in || die
+       sed -e "/Xr/s/cdecl/cutils-cdecl/" \
+               -i "${S}"/src/cundecl/cundecl.1 || die
+       sed -i "/Nm/s/cdecl/cutils-cdecl/" \
+               "${S}"/src/cdecl/cutils-cdecl.1 || die
+}
+
+src_compile() {
+       emake CC="$(tc-getCC)" -j1
+}
+
+src_install () {
+       emake DESTDIR="${D}" install
+       dodoc CREDITS HISTORY NEWS README
+}
+
+pkg_postinst () {
+       elog "cdecl was installed as cutils-cdecl because of a naming conflict"
+       elog "with dev-util/cdecl."
+}