Version bumped. Respect LDFLAGS

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

4 files changed, 139 insertions, 8 deletions

diff --git a/sys-apps/ccs-tools/ChangeLog b/sys-apps/ccs-tools/ChangeLog
index f42b8822c6c7..9e81069e9c05 100644
--- a/sys-apps/ccs-tools/ChangeLog
+++ b/sys-apps/ccs-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ccs-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ChangeLog,v 1.8 2011/03/02 00:36:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ChangeLog,v 1.9 2011/09/29 21:09:25 naota Exp $
+
+*ccs-tools-1.8.3_p20110929 (29 Sep 2011)
+
+  29 Sep 2011; Naohiro Aota <naota@gentoo.org>
+  +ccs-tools-1.8.3_p20110929.ebuild,
+  +files/ccs-tools-1.8.3_p20110929-ldflags.patch:
+  Version bumped. Respect LDFLAGS
 
 *ccs-tools-1.8.0_p20110214 (02 Mar 2011)
 
diff --git a/sys-apps/ccs-tools/Manifest b/sys-apps/ccs-tools/Manifest
index 53b5f3e04b62..1d044a68f997 100644
--- a/sys-apps/ccs-tools/Manifest
+++ b/sys-apps/ccs-tools/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ccs-tools-1.6.8_p20090623-gentoo.patch 13446 RMD160 0c484fa4ebff532f8b18b3d590fe2a7ac7b18acb SHA1 ad9833b9e866073dc3596e78f4955fd512260113 SHA256 6813731520b05e84f95449db29cdaeab90324b565504677c257886f7434c21a1
 AUX ccs-tools-1.8.0_p20110214-parallel.patch 405 RMD160 cb1484bae9e44047e869b5ded3ea2ae6641daf2d SHA1 48d67bf26e0fd1102191a0046b338a5ef4f208a0 SHA256 3e055f2c175a27d32ae1fab9a903d6583133db9a398b08b9216021d0cb00a67d
+AUX ccs-tools-1.8.3_p20110929-ldflags.patch 1798 RMD160 05f03db76c7e0804562de861268f6191ef4f7459 SHA1 99ac3551bb3c4ddc8d258177ca346827a91259bc SHA256 a76c28f45919424f157c18e2f81a22ee26750575282114b8440db4fbd6945c4a
 DIST ccs-tools-1.6.8-20090623.tar.gz 144995 RMD160 41eb0bfd26c42d1eb81319d26596cfbbcab1b96e SHA1 93db999a014a4daa36ace2d5e3f4a0733cb43980 SHA256 d2e8eec17b02e7682c814ec98dd1158a00e7b5440f25f19b4d7d5b8fb0b2e78f
 DIST ccs-tools-1.6.8-20100115.tar.gz 147437 RMD160 306d967c6151c1ce14e873e07a078995c6f645b3 SHA1 7a8ae9571382201f6ec7ebd4633dc1310aced27c SHA256 8be63d4671166659c01fe76b73af382b06426c9f1ca9edbc1f2c4776f5c9cb55
 DIST ccs-tools-1.7.1-20100110.tar.gz 151821 RMD160 87603f18ecec6160ae025bb5baa85eb065955bcd SHA1 8c2df28bc98394c5f4f57ce2353b20d9a270f8ff SHA256 a185409cdd7c043c5701445e9a3df839ee0ebf4d681ea984c5ae97ccc0d01fcb
 DIST ccs-tools-1.7.2-20100401.tar.gz 154564 RMD160 2af066eb616ce853fd5ff976234b5c5a4d50b216 SHA1 86be6d3609bc741ed511766cb15c85b11da25d07 SHA256 1db7917763de1e98efa157e56c0953e20ad1526eaf3441b00c46535184ef6d54
 DIST ccs-tools-1.8.0-20110214.tar.gz 160049 RMD160 6dc7a564b4b8fd21398dbfae15b21bd9581ba3a8 SHA1 cb46cd1e7a401d519acba000e890d972e3723cc2 SHA256 4ffec375b335477b6aadb352c6a749ee09f283eb58d991420ac74e12037cc670
+DIST ccs-tools-1.8.3-20110929.tar.gz 198511 RMD160 61d29f876d2b9003c0cc10cbb4f4dad1e9e58908 SHA1 2e3d4283b6ec131a9a4bed2c839d908c80d9c9c9 SHA256 e723ea29aa0782f364a9bb110535db0ac4208ae17870f16238757de9d3b34427
 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.6.8_p20100115.ebuild 1873 RMD160 b18b19904e6d217f89eefc6c3444d23c0474e459 SHA1 ed6d5f37526020f92df5ca8d992d2628d4bafb42 SHA256 ebc8d56197077945a08f6461f674a2bad6a5aa7be5f7b386b40d8582bb84c44c
 EBUILD ccs-tools-1.7.1_p20100110.ebuild 1436 RMD160 262c90377cfc7288931cb6f65609573869a16f05 SHA1 66f47df663f89bd319cbd7448413f78740a46333 SHA256 370081833e5a8bd1e7dd12b16f1fc2c1e2472276a2ccb6c37fd55c0815aa031c
 EBUILD ccs-tools-1.7.2_p20100401.ebuild 1436 RMD160 fed568e7b1a3f549deec1e1e8e4a72c2b598e754 SHA1 152fb1af6403ca5f88e091d8e94a5ab1ee0c47c6 SHA256 7430540e03afc8da833f27eb663a9f6c07aa2a69b0f2b83a3f592ddcd123b731
 EBUILD ccs-tools-1.8.0_p20110214.ebuild 1585 RMD160 5dc6f0bce959612a102cb14de09bc8e586521c6d SHA1 28caad2640caeb1cc100cada0d123b07706f6e6d SHA256 4ef72f97f0927ea41714d8cf3de7c125a6ea28ddf6efd76e921ddc8496c6e1d0
-MISC ChangeLog 1724 RMD160 bc06fc324613bcbb9ef27f99dadb2ba90b8902a1 SHA1 d53c3310535466c77fefc1b953fe4e2773a83fdf SHA256 71538d4180d7acf767b94e95c7c1be84f4ce62e45c7b5872ff8d6f0a3a215fa1
+EBUILD ccs-tools-1.8.3_p20110929.ebuild 1563 RMD160 8323fbad581dca0afec6fb1913c32a2844e274a8 SHA1 2588444b2e4a8ccf6d06cde3ccf4912459716269 SHA256 02f47a0b7272435ec6f0140b9aa84b4d8016851274221697bd57e7b6a8bff602
+MISC ChangeLog 1934 RMD160 bc0aa714a98c1fbecde568790f230ce0b008c0d8 SHA1 bdde8bc727ba0fe92e8594307297b777e92aef5d SHA256 1d5423d1f5686d5d71779ec7e3bff53f7d98b9f32f743ba568e6d6fb1e6c73ac
 MISC metadata.xml 200 RMD160 397a9fbaf0e2d458f8d95d2415a47a671d5dda58 SHA1 714cb7b31fb311633bb0cc8ca2f24155891e342d SHA256 bb8d57cfa8edd3743459c30d264cc37cc5e20d71dca61651939a965274f23b20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sb0ACgkQfXuS5UK5QB1ehAP/aIhapUCDjKdYcx4G+Y1Wls1O
-X01cndcu7IaCNsNso88sSDmAoCRXdyvkUXzPCNrRGandbVzYMv7nlZ1337//GUY1
-cc44RY7DbTA14Qbvrdi//v4gP8aXBu7QIMahSLYLsSofwL85KkKHvm87/yeQx0lf
-afk0yBDl+Bj4OD9ebFc=
-=Bm+O
+iEYEARECAAYFAk6E3okACgkQGpDnPLSHuMAMWwCfWRRYpuvJ6+vbPA53udcrzRCf
+z0EAn1YgJRYhXkQUZ4Qb+bNtWYF7eM3H
+=v28S
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ccs-tools/ccs-tools-1.8.3_p20110929.ebuild b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20110929.ebuild
new file mode 100644
index 000000000000..0f7d80ef15f7
--- /dev/null
+++ b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20110929.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 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.8.3_p20110929.ebuild,v 1.1 2011/09/29 21:09:25 naota Exp $
+
+EAPI=3
+inherit eutils multilib toolchain-funcs
+
+MY_P="${P/_p/-}"
+DESCRIPTION="TOMOYO Linux tools"
+HOMEPAGE="http://tomoyo.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/tomoyo/49693/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="sys-libs/ncurses
+	sys-libs/readline"
+RDEPEND="${DEPEND}
+	sys-apps/which"
+
+S="${WORKDIR}/ccstools"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -i \
+		-e "s:gcc:$(tc-getCC):" \
+		-e "s/\(CFLAGS.*:=\).*/\1 ${CFLAGS}/" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-e "s:= /:= ${EPREFIX}/:g" \
+		Include.make || die
+}
+
+src_test() {
+	cd "${S}/kernel_test"
+	emake || die
+	./testall.sh || die
+}
+
+src_install() {
+	emake INSTALLDIR="${D}" install || die
+
+#	insinto /etc/ccs
+#	doins ccstools.conf || die
+
+	dodoc README.ccs
+}
+
+pkg_postinst() {
+	elog "Execute the following command to setup the initial policy configuration:"
+	elog
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog
+	elog "For more information, please visit the following."
+	elog
+	elog "For >=kernel-2.6.36:"
+	elog "http://tomoyo.sourceforge.jp/2.3/"
+	elog
+	elog "For >=kernel-2.6.30:"
+	elog "http://tomoyo.sourceforge.jp/2.2/"
+	elog
+	elog "For <kernel-2.6.30 + ccs-patch:"
+	elog "http://tomoyo.sourceforge.jp/1.8/"
+}
+
+pkg_config() {
+	/usr/$(get_libdir)/ccs/init_policy.sh
+}
diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20110929-ldflags.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20110929-ldflags.patch
new file mode 100644
index 000000000000..7d2a31c98929
--- /dev/null
+++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20110929-ldflags.patch
@@ -0,0 +1,52 @@
+diff --git a/sbin/Makefile b/sbin/Makefile
+index cc61f13..3bdb292 100644
+--- a/sbin/Makefile
++++ b/sbin/Makefile
+@@ -9,7 +9,7 @@ install: all
+ 	$(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR)
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+diff --git a/usr_lib_ccs/Makefile b/usr_lib_ccs/Makefile
+index 8181201..bee5eae 100644
+--- a/usr_lib_ccs/Makefile
++++ b/usr_lib_ccs/Makefile
+@@ -11,7 +11,7 @@ install: all
+ 	$(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(INSTALLDIR)/$(USRLIBDIR)/ccs/
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile
+index 69a8d13..cd03d76 100644
+--- a/usr_sbin/Makefile
++++ b/usr_sbin/Makefile
+@@ -15,17 +15,17 @@
+ 	sleep 10
+
+ libccstools.so: ccstools.c ccstools.h
+-	$(CC) $(CFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.3 -o libccstools.so.3.0.0
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.3 -o libccstools.so.3.0.0
+ 	ln -sf libccstools.so.3.0.0 libccstools.so
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $< -lccstools -L. 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. 
+ 
+ ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so
+-	$(CC) $(CFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON
+ 
+ ccs-queryd: ccstools.h ccs-queryd.c readline.h /usr/include/curses.h libccstools.so
+-	$(CC) $(CFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L.
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L.
+ 
+ install: all
+ 	mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR)