Fix complaints from append-flags, drop old

Package-Manager: portage-2.2.01.20271-prefix/cvs/SunOS i386

4 files changed, 23 insertions, 102 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index c339e1471e4d..23c489eccdf1 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.111 2012/03/02 20:52:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.112 2012/03/08 11:48:40 grobian Exp $
+
+  08 Mar 2012; Fabian Groffen <grobian@gentoo.org> -tcsh-6.16.ebuild,
+  tcsh-6.18.01.ebuild:
+  Fix complaints from append-flags, drop old
 
   02 Mar 2012; Brent Baude <ranger@gentoo.org> tcsh-6.17-r1.ebuild:
   Marking tcsh-6.17-r1 ppc64 for bug 389013
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 0dc8a33d8c50..d3dac0531284 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,16 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tcsh-6.14-makefile.patch 482 RMD160 ef0aa8ec9a43218532588bc1b755e2c2f69c9ea8 SHA1 b26685966259b02d5a1f0f8994c0741e50841a31 SHA256 7036e1d68ce181405800d78b33f9884da6e36f590f5287190911ddec65a540ce
 AUX tcsh-6.14-use-ncurses.patch 365 RMD160 aa7be416f14a16481130666a8b477a756282baf7 SHA1 3644fdf121c7d23cbf16fa7602d7abf789fa6145 SHA256 8c335f04db220b01235a7a2c8158231d3295ec6572c1bcecfc78c61743facd58
 AUX tcsh-6.14.00-debian-dircolors.patch 444 RMD160 8ab4e49fbfd979aed6cfdd5bd45c5e37fa810394 SHA1 a7ccadc40cb4d6e9dcfc9672c5bf7f547ed0bd83 SHA256 a9568a2a474ef662a665c87c52983fea7999e5cf2bc4920d45baa2558c9dc32a
 AUX tcsh-6.15.00-normalize-command-fix.patch 399 RMD160 5b99c58b08402b5e0b65b9f2ad7c39cf2faa8012 SHA1 f49464f1622cdf72639e48a45e8ac7ee27c2fb80 SHA256 e22acf90d146927b261c00bbeb6f7f9ca86ff8c77d017027308ca2a54aeb1b04
-DIST tcsh-6.16.00.tar.gz 886468 RMD160 ed23351273bb737c184658235f33869488e64696 SHA1 3d3536bbb9201abdf39b8b364b95e0a218970a5c SHA256 7603b8d67553e0a83159f0f463b642e3679a878a70743285bb7b288b314517d4
 DIST tcsh-6.17.00.tar.gz 890084 RMD160 2cc41a895799ade6d62640f877bb626f136dac35 SHA1 9bf67d5ce1b406178e9ba535ecd34553fe0d4d36 SHA256 575266122bc2bc351c84a7f858020c0e6b6f95a64ad4de3ce95e340f57e4a9a9
 DIST tcsh-6.17.06.tar.gz 919999 RMD160 34e92c7f2af089313c9c416b305e164b684b0f76 SHA1 f3754b0ac8bbccc655b5e4d247fff2c853cc7cc2 SHA256 c9eff6aa782ecec5c6719954b529fadac97c32f3ba4c56fa07c40d425c2d91df
 DIST tcsh-6.18.01.tar.gz 926872 RMD160 ea18bb6d4d6dca2700d74daa2940f67d45a18cb9 SHA1 eee2035645737197ff8059c84933a75d23cd76f9 SHA256 d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8
 DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 RMD160 d2ac41730bbbdfb8db77a67a0104edc08bb4570e SHA1 9059e209f433a023f264907d84d55824ec6854f0 SHA256 77fa4ae60090ad5a6ec50185eec9070757eedb798b1c29327d27fc582cb59f37
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 RMD160 60abc2583e2ee0706558d4171756a07da31df6c9 SHA1 fcb945bb77afbd49687545da8b62239739583a08 SHA256 6375f48d78b64fd97fc2cb07e8117e41459521a8de3919d174eec321a98af483
-EBUILD tcsh-6.16.ebuild 2606 RMD160 510ed6f0b2e0d7d4c0de6726ae0e238f31c20234 SHA1 35692fd2bf23a451272ebe9cd8010038122b474f SHA256 bebfd92ea8bdd8fe4fa1f91cdeec4620562bbc2849273247e4df48375fe1ca97
 EBUILD tcsh-6.17-r1.ebuild 2672 RMD160 cb661befdcb66baac18d4aac3fddb674e7d76764 SHA1 f92d3797e053fb532c666e53e10b8a33e488a032 SHA256 12edb6822d2fe4e60dfd6f6f2a2d3fe6dd436dbb953a52bb5efd3acf53761b63
 EBUILD tcsh-6.17.06.ebuild 2625 RMD160 7b29088320938d4bf870eba06552c217721440dd SHA1 274297f581382bbf784e60e5dfb39ae5ca7661c7 SHA256 e15163a06c72b6f6376d6fa5e4d439adccb4b7df690931cb093bc30c152327cb
-EBUILD tcsh-6.18.01.ebuild 2620 RMD160 8edbefdb66463d7a09f1d3a3a9c7fb4f3f20439b SHA1 a2b2cb033b18274dcc09e145bd1c0346b0f4930d SHA256 dc48a45fc718214697cdfca0553261eabea58fa9d6e23eacad2dd3b5dcc935ea
-MISC ChangeLog 16391 RMD160 dec6c232fb33ecb41b8ee64c235c659aff7e691b SHA1 60404cbd824c889a7c36a18cbc98b3bfbfa291c8 SHA256 23d4a7e4870cf3f66e6ea4ad71a1ff929ca10662901c203a4cf2e3cbeb2c16b1
+EBUILD tcsh-6.18.01.ebuild 2635 RMD160 45b1a12d6babe82e1c412a61420247ff8baa5423 SHA1 6563afe90726aac30a14199548d55b409b0aed66 SHA256 bfc6b4035678e07db09621d3eee465b11d96cc539e691c9dfb5c18c2d0630eaa
+MISC ChangeLog 16531 RMD160 c907c67de54711931c3d29b2b5eb4f9688bc259d SHA1 1da01026ceeb700a78573ac6c28583838722d543 SHA256 66db19ecea362011bf4c01545dedd49043bc7c66c0c1fd99b59d5449894f861c
 MISC metadata.xml 706 RMD160 cd6d706bee1e966787f5de57fdb791cf92863b3d SHA1 a14ef481c73cbf514f117331625a499f84c26965 SHA256 318990e6f93f738cc70e956b6b00831079b273215eb994da7ec80f03aaa0db59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (SunOS)
+
+iEYEARECAAYFAk9YnJ4ACgkQX3X2B8XHTokucwCfY4A35wfzkZNqIkCseCRhzmna
+PPgAn23dz5kaMslYPN5HtckRVXs9PENL
+=IW/J
+-----END PGP SIGNATURE-----
diff --git a/app-shells/tcsh/tcsh-6.16.ebuild b/app-shells/tcsh/tcsh-6.16.ebuild
deleted file mode 100644
index 14e1f2e096d0..000000000000
--- a/app-shells/tcsh/tcsh-6.16.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v 1.12 2011/04/22 07:17:44 grobian Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic autotools prefix
-
-CONFVER="1.8"
-
-MY_P="${P}.00"
-DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
-HOMEPAGE="http://www.tcsh.org/"
-SRC_URI="ftp://ftp.astron.com/pub/tcsh/old/${MY_P}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="perl catalogs"
-RESTRICT="test"
-
-# we need gettext because we run autoconf
-RDEPEND=">=sys-libs/ncurses-5.1
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	perl? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
-
-src_prepare() {
-	epatch "${FILESDIR}/${MY_P/16/14}"-debian-dircolors.patch # bug #120792
-	epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
-	epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
-	eautoreconf
-
-	if use catalogs ; then
-		einfo "enabling NLS catalogs support..."
-		sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \
-			config_f.h || die
-		eend $?
-	fi
-
-	# unify ECHO behaviour
-	echo "#undef ECHO_STYLE" >> config_f.h
-	echo "#define ECHO_STYLE      BOTH_ECHO" >> config_f.h
-
-	eprefixify "${CONFDIR}"/*
-	# activate the right default PATH
-	if [[ -z ${EPREFIX} ]] ; then
-		sed -i \
-			-e 's/^#MAIN//' -e '/^#PREFIX/d' \
-			"${CONFDIR}"/csh.login || die
-	else
-		sed -i \
-			-e 's/^#PREFIX//' -e '/^#MAIN/d' \
-			"${CONFDIR}"/csh.login || die
-	fi
-}
-
-src_configure() {
-	# make tcsh look and live along the lines of the prefix
-	append-flags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
-	append-flags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
-	append-flags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
-	append-flags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
-	append-flags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
-
-	econf --prefix="${EPREFIX:-/}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man || die
-
-	if use perl ; then
-		perl tcsh.man2html tcsh.man || die
-		dohtml tcsh.html/*.html
-	fi
-
-	insinto /etc
-	doins \
-		"${CONFDIR}"/csh.cshrc \
-		"${CONFDIR}"/csh.login
-
-	dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
-	# bug #119703: add csh -> tcsh symlink
-	dosym /bin/tcsh /bin/csh
-}
diff --git a/app-shells/tcsh/tcsh-6.18.01.ebuild b/app-shells/tcsh/tcsh-6.18.01.ebuild
index 5553eabc6cef..1df7ef91147b 100644
--- a/app-shells/tcsh/tcsh-6.18.01.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01.ebuild,v 1.1 2012/03/01 16:30:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01.ebuild,v 1.2 2012/03/08 11:48:40 grobian Exp $
 
 EAPI="3"
 
@@ -57,11 +57,11 @@ src_prepare() {
 
 src_configure() {
 	# make tcsh look and live along the lines of the prefix
-	append-flags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
-	append-flags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
-	append-flags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
-	append-flags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
-	append-flags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
+	append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
+	append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
+	append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
+	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
+	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
 
 	econf \
 		--prefix="${EPREFIX:-/}" \