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

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

3 files changed, 29 insertions, 13 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/Manifest b/sys-apps/ccs-tools/Manifest
index 3050d0cfda89..6d5f64f8a82a 100644
--- a/sys-apps/ccs-tools/Manifest
+++ b/sys-apps/ccs-tools/Manifest
@@ -1,8 +1,8 @@
 AUX ccs-tools-1.6.8_p20090623-gentoo.patch 13446 RMD160 0c484fa4ebff532f8b18b3d590fe2a7ac7b18acb SHA1 ad9833b9e866073dc3596e78f4955fd512260113 SHA256 6813731520b05e84f95449db29cdaeab90324b565504677c257886f7434c21a1
 DIST ccs-tools-1.6.8-20090623.tar.gz 144995 RMD160 41eb0bfd26c42d1eb81319d26596cfbbcab1b96e SHA1 93db999a014a4daa36ace2d5e3f4a0733cb43980 SHA256 d2e8eec17b02e7682c814ec98dd1158a00e7b5440f25f19b4d7d5b8fb0b2e78f
-DIST ccs-tools-1.7.0-20090903.tar.gz 144114 RMD160 d2f6195fad34fbd45664aac44b1127702f2e4a44 SHA1 620e2a2b9ab33e8894383110b6e60964d9dea53b SHA256 b8a52139e3d6ca88897097887f42f78be3efa741fb27b743a487bb9ca3141576
+DIST ccs-tools-1.6.8-20100115.tar.gz 147437 RMD160 306d967c6151c1ce14e873e07a078995c6f645b3 SHA1 7a8ae9571382201f6ec7ebd4633dc1310aced27c SHA256 8be63d4671166659c01fe76b73af382b06426c9f1ca9edbc1f2c4776f5c9cb55
 EBUILD ccs-tools-1.6.8_p20090623-r1.ebuild 1870 RMD160 88f9a4f623e76987bad24433a3dbd44a0de78089 SHA1 2e759d0303bf15f86dc6b8be6aec7e22531a9429 SHA256 0cc772be4185a68d7295b4f9d7d9c596878d6e7353545854ee0fe95e90179d3b
 EBUILD ccs-tools-1.6.8_p20090623.ebuild 1424 RMD160 bdb32f70e3642b8c5271b7e2b8e70fb197ea111e SHA1 3360e837628a9b504d56a57455f64851a02c8854 SHA256 0a57b838fa1cc08a3fd650a7853999759b45c31efc9722ba3881317cce96e600
-EBUILD ccs-tools-1.7.0_p20090903.ebuild 1438 RMD160 72cd7b9976b632088a1290901048a2055b03e9dc SHA1 fef6e01ed81fec6a28212fb24a64aaed2ef47a2d SHA256 f51efebfcf44df94b1c816443ebe4ee96b31fbfb8f3ad06a8186eb393682398f
-MISC ChangeLog 956 RMD160 69090530caa4105cd267ea3eeffb56318b9d5616 SHA1 0b8fe78927cb9c653011ce3aa004da8ce7e47819 SHA256 4478054d3330b79ae3d03cd27c98e9326419d6341af2680a522ca1e9103f4ea0
+EBUILD ccs-tools-1.6.8_p20100115.ebuild 1873 RMD160 b18b19904e6d217f89eefc6c3444d23c0474e459 SHA1 ed6d5f37526020f92df5ca8d992d2628d4bafb42 SHA256 ebc8d56197077945a08f6461f674a2bad6a5aa7be5f7b386b40d8582bb84c44c
+MISC ChangeLog 1189 RMD160 58f9a752b46c0af9602a9276689f1e7f51171cd8 SHA1 3135774707ef91f88e5a5000cf429de01d968909 SHA256 d5fda6437ede9ebb0e06b7d77a90c1cc28f8600980b73cf63ee8ad1d6e0b62df
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
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
 }