Version bumped. ccs-tools-1.7* was moved to sys-apps/tomoyo-tools.

(Portage version: 2.1.7.16/cvs/Linux x86_64)

2 files changed, 26 insertions, 10 deletions

diff --git a/sys-apps/ccs-tools/ChangeLog b/sys-apps/ccs-tools/ChangeLog
index 38befb5d0e0b..b7b65a94b4ec 100644
--- a/sys-apps/ccs-tools/ChangeLog
+++ b/sys-apps/ccs-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/ccs-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ChangeLog,v 1.4 2009/11/07 16:27:31 matsuu Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ChangeLog,v 1.5 2010/01/23 06:49:05 matsuu Exp $
+
+*ccs-tools-1.6.8_p20100115 (23 Jan 2010)
+
+  23 Jan 2010; MATSUU Takuto <matsuu@gentoo.org>
+  +ccs-tools-1.6.8_p20100115.ebuild, -ccs-tools-1.7.0_p20090903.ebuild:
+  Version bumped. ccs-tools-1.7* was moved to sys-apps/tomoyo-tools.
 
 *ccs-tools-1.7.0_p20090903 (07 Nov 2009)
 
diff --git a/sys-apps/ccs-tools/ccs-tools-1.7.0_p20090903.ebuild b/sys-apps/ccs-tools/ccs-tools-1.6.8_p20100115.ebuild
index 8fb2ebe706c2..e07c8548fa23 100644
--- a/sys-apps/ccs-tools/ccs-tools-1.7.0_p20090903.ebuild
+++ b/sys-apps/ccs-tools/ccs-tools-1.6.8_p20100115.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ccs-tools-1.7.0_p20090903.ebuild,v 1.1 2009/11/07 16:27:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ccs-tools-1.6.8_p20100115.ebuild,v 1.1 2010/01/23 06:49:05 matsuu Exp $
 
+EAPI="2"
 inherit eutils multilib toolchain-funcs
 
 MY_P="${P/_p/-}"
 DESCRIPTION="TOMOYO Linux tools"
 HOMEPAGE="http://tomoyo.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/tomoyo/43376/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge.jp/tomoyo/30298/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,15 +24,20 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/ccstools"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.6.8_p20090623-gentoo.patch"
 
 	sed -i \
 		-e "/^CC=/s:gcc:$(tc-getCC):" \
 		-e "/^CFLAGS=/s:-O2:${CFLAGS}:" \
 		-e "s:/usr/lib/:/usr/$(get_libdir)/:g" \
 		Makefile || die
+
+	sed -i \
+		-e "s:/usr/lib/ccs:/usr/$(get_libdir)/ccs:g" \
+		init_policy.sh tomoyo_init_policy.sh || die
+
+	echo "CONFIG_PROTECT=\"/usr/$(get_libdir)/ccs/conf\"" > "${T}/50${PN}" || die
 }
 
 src_test() {
@@ -43,8 +49,12 @@ src_test() {
 src_install() {
 	emake INSTALLDIR="${D}" install || die
 
-	insinto /etc/ccs
+	rm "${D}"/usr/$(get_libdir)/ccs/{COPYING.ccs,README.ccs,ccstools.conf} || die
+	insinto /usr/$(get_libdir)/ccs/conf
 	doins ccstools.conf || die
+	dosym conf/ccstools.conf /usr/$(get_libdir)/ccs/ccstools.conf || die
+
+	doenvd "${T}/50${PN}" || die
 
 	dodoc README.ccs
 }
@@ -64,5 +74,5 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	/usr/$(get_libdir)/ccs/init_policy.sh
+	/usr/$(get_libdir)/ccs/tomoyo_init_policy.sh
 }