Version bump

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

4 files changed, 174 insertions, 15 deletions

diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index 7b2bdedecfb5..9a076c58ed8a 100644
--- a/sys-apps/tomoyo-tools/ChangeLog
+++ b/sys-apps/tomoyo-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/tomoyo-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.8 2011/11/14 13:14:55 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.9 2011/11/14 18:50:26 naota Exp $
+
+*tomoyo-tools-2.5.0_p20111025 (14 Nov 2011)
+
+  14 Nov 2011; Naohiro Aota <naota@gentoo.org>
+  +tomoyo-tools-2.5.0_p20111025.ebuild,
+  +files/tomoyo-tools-2.5.0_p20111025-flags-parallel.patch:
+  Version bump
 
 *tomoyo-tools-2.4.0_p20111025 (14 Nov 2011)
 
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index f72dc8dcaa54..ab771a6c0835 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -6,28 +6,31 @@ AUX tomoyo-tools-2.2.0_p20110211-ldflags.patch 560 RMD160 e9139af35409591d2aaa01
 AUX tomoyo-tools-2.3.0_p20110929-flags-parallel.patch 3060 RMD160 9db2e8941cc6b80a363799a03b6eaa9358763599 SHA1 8840cca8978379c376450ab0a6e7827b5cd37fd3 SHA256 4a358394d49bdc83a710f90e40bd504c9695212c45ffc2385fab900d31d6c97e
 AUX tomoyo-tools-2.3.0_p20110929-gentoo.patch 724 RMD160 8b20b0fdc821ba72fa2495b8f48b086c1f7eb71d SHA1 4dbbe71e0f78bd51272ae4271093302e1403246d SHA256 864aeee12e99961b7ee7706cbc74db7de149177ddaca20da4a627fa71c6026c6
 AUX tomoyo-tools-2.4.0_p20110929-flags-parallel.patch 2676 RMD160 1b8ba9d0406bc436b1cdc63a599522b4cea36e55 SHA1 14224fe1c45ef5884b55fb48e6e36191286f3c4d SHA256 9d8157d6365739009901e2ef8b8e20b14901564cb1c2211f69be0fac39cfc5ad
+AUX tomoyo-tools-2.5.0_p20111025-flags-parallel.patch 2676 RMD160 1fd50d1fa21a547a60939d4943fa834ba2530a17 SHA1 08c46aaf33025871d00e9938ea81d796edeaff4b SHA256 99037bd4db8e3b08793831efa1535e56967c1387c366a09db13035871ab67e3f
 DIST tomoyo-tools-2.2.0-20110211.tar.gz 78043 RMD160 39d9578bdda4bb206880f00b95c390fa5a301a35 SHA1 f593b101d105ee5d9b53670ed58944199a6190aa SHA256 9788d5e61430ab8b1c990baabe640b43807366e121723f7b3bb0d88589bf1e9e
 DIST tomoyo-tools-2.3.0-20110929.tar.gz 115875 RMD160 2c5584039b181e25b25e7700ec72fa3014316eda SHA1 3e76e585ce897608e3f1004d8cbfe0dfebe9f744 SHA256 484a41d48c358c117757b8ad6af6a4fe85bc6b0cfe6dd6565bb92d3d9daee70e
 DIST tomoyo-tools-2.4.0-20111025.tar.gz 174080 RMD160 083122f95c4a9ce85e8072ef2860d88876c1964a SHA1 8d6ca5336c4d11e5eb4152843dfe02cebc879546 SHA256 570afe29ae3bcff41b3d99b409cd22ae9e89260eb3eee9cc401cbe21667ccbb0
+DIST tomoyo-tools-2.5.0-20111025.tar.gz 194560 RMD160 638568cea43075960c51366217b0b0ae73e99b04 SHA1 00b04ab060753d4bf1d8f70f5117ebe080b4e8e0 SHA256 1c6ed703a11c6ff27f4c9bb2d2c5497e28d67f0b4e2198c80f05dd94920b5f32
 EBUILD tomoyo-tools-2.2.0_p20110211.ebuild 1598 RMD160 46569b6927a172a2b8264fd91a1d4a0afd6faf44 SHA1 f421e0b3f9046b1591059d8bee48afe927712457 SHA256 60c0e099e022644c78fdc41dfed17878043cf8a85bca4bfaae336b3bc134dcd7
 EBUILD tomoyo-tools-2.3.0_p20110929.ebuild 1760 RMD160 56ecfe9a088a53a13e6f38020ef6ef283f9f5e48 SHA1 1db52ef6ac1df12dcc19254f399905cdec479d0d SHA256 33105558ef288e4711ce13d3f194589274b01e9ad06c13b307da546c23766e75
 EBUILD tomoyo-tools-2.4.0_p20111025.ebuild 1449 RMD160 9f6d760d52c833fef2e9c8443c70edf35332b76a SHA1 1ecf1f31ee28b7a71d51afeb74536a6c2f3bbb3d SHA256 a6dc679501372a091f79a41e520af226741ba520152a4b6808bee8882faa340f
-MISC ChangeLog 2495 RMD160 2220577ed5c24a80ab5e87b4217d069df49e7dba SHA1 9d833f0b00b004579ce6460ff0d7f5e3d4bd9037 SHA256 63e6f55695820fa6c2f065b61cc3e38b58172f3b7e1f6221ba206ee387aa64a7
+EBUILD tomoyo-tools-2.5.0_p20111025.ebuild 1449 RMD160 3219a1d95df8d54e3ef6bc1f31e76b1b033da703 SHA1 09dfa1a1feec84ccb26472134512d831ed9bf972 SHA256 e496569faccc8c91bc2680a800280fbf589759a9c297f81cf4d13efb92abd9a9
+MISC ChangeLog 2703 RMD160 b7a58a8ef53de432e3982d8cfc41636f05c117af SHA1 8f5fb7ab69ccb64c72d3cb4ff763c1a09b7a0893 SHA256 eacff87156565a2d9d4c8de5a4d341cde16a96e1f93b08142f28669b85b30bf1
 MISC metadata.xml 259 RMD160 22f85d140355c094c3aee2a5c5a823bd0f3fe888 SHA1 09eb7d683c41add3d3fc85fc6c283c0619e61ed3 SHA256 5afc0793a91f3fc43b4d21375ad710fac25f1296ea782c453e512c9363f60187
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOwRRkAAoJEDYO1FT4VRUU3DMP/13Kdkl/njxRR8gZ8sY6OGJS
-AQp2dFhRDeG3OI8iL9Mvb5UkjuP3FGUKpudZKoc39ixa4qZVsz6A9MIG2nEOtuvR
-PHsdsnIAaASBFqrbTf43qicNXqwKStYIt+jHkInLjYc2bF0CKpTNACq6eXJ1DRaD
-xVr8wXVUV4GuP/NzWU4ShAvIuW4mhaqszLdpJ9QcxCjE8w/v2v9VYpAljwjGDP8K
-BUmcSSAT2yiWEowt82wUeWhx3kb4zLCGDP/YRcdkcR2d38DHdbviuXchp3JTSXjl
-0N7ntfesBDdUDSz23O/97XA+Cgcgshoqvsp08JZBE/kgj5jCCa9JTinZrJKh+o4x
-vqcr/5OUb1twedJc+4KL9vOIqPkr/eFc8WZMZVteHj6pAwPvuUoN38nINn9fooBw
-5ybmVdxDJZ+JiYzfDTMEJOAMRa1WkkHtlGmDfVXow7NcwEFTaMQqMcfGVWiWE1Xm
-y05jz7Blk0hdaj+ZqQe1dPLzrF9lKdQLyWoedyjKRP8msSA8llQ8Xo7u0LNmOi4i
-3J79pIb+tRLNqyEMO0dXfxQXO9Q+p1D7W4zINlrWyeDoB9tS9s79AYI/0Q1/vYAZ
-RINcn4iVSCvjkrmxeDsJ2iNHIFKoxFSb4e/svjqKg8/562f6xWhwbp+LlahKNHZH
-lV1uF89XQhFjhBT5A34M
-=/3eg
+iQIcBAEBCAAGBQJOwWL3AAoJEDYO1FT4VRUUtyYP/AizfKBf8heI1FLnnKOKGbO/
+1/qECkZ5caTQVnGZhaQuLmltus4cJjo4tnMaqLxTH4L+cuZ3EqSAV5/qoWk3QgJk
+SagmmDbiC0pW6WGI1HYhRXyZt1v1ucka6lx0ftCMV68kpBqpko/7c828O8O3aNEd
+NdbxkDedYVqJiJ+3wDxyQYPtj1n6GapKz2bDc+xYz5G3vqs6V5SRX0ZLURtdttrq
+CwG1U/HQKG+gJzyJ821w516wgu5YozThheJeSag4nXXFHx+kcPyCKAXpLRhWltXC
+a5pKEsMs7CPUWup+rCtT2nsNoRW54GBEn9OW9XSEFLJ2c0D9fujy1yrnztbarzun
+82cdUH4m9ozqu1qJl2m9cT3M4OTa4FMN1pp/aOBReWpxGqsWUPHnJYS6yBOlIFjj
+HDeQNjuZZ1FG2vIebkwg3odjmKlzTF09Yj4/aX3e0M/YpSek012BOZUoA4UezbXC
+75pNqXWk3I2CBw/Z9r7G5ncirTu2fknccEXXKeD6Tbaaw20p+V6a2KXKqzVffZBa
+Hufl4UtpAiBemzaNIUEXmSh0wqFhUgarMg8ZYKgnk+qaXHxVbWOj8ZOBUuA7UIwo
+cSIAD2REqEsAkUPwbT6z/jKE2GuIo4wJ2hIT7UnAenSXn0KJdsjeGumgGlWk712i
+KuHOsJLCrbtiPALMFEmN
+=ZHJL
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.5.0_p20111025-flags-parallel.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.5.0_p20111025-flags-parallel.patch
new file mode 100644
index 000000000000..77e8ec85609f
--- /dev/null
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.5.0_p20111025-flags-parallel.patch
@@ -0,0 +1,87 @@
+diff --git a/Include.make b/Include.make
+index 3f85e61..c34ba28 100644
+--- a/Include.make
++++ b/Include.make
+@@ -1,7 +1,5 @@
+-CC              := gcc
+ INSTALL         := install
+ SBINDIR         := /sbin
+ USRSBINDIR      := /usr/sbin
+ USRLIBDIR       := /usr/lib
+ MAN8            := /usr/share/man/man8
+-CFLAGS          := -Wall -O2
+diff --git a/kernel_test/Makefile b/kernel_test/Makefile
+index 2559b4b..ef599a2 100644
+--- a/kernel_test/Makefile
++++ b/kernel_test/Makefile
+@@ -10,16 +10,14 @@ all: $(ALL_FILES)
+ 
+ $(ALL_FILES): include.h
+ 
+-CC=gcc
+-
+-CFLAGS=-Wall -O2
++CFLAGS += -Wall -O2
+ 
+ #
+ # Tools for kernel testing.
+ #
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ #
+ # Delete all test programs.
+diff --git a/sbin/Makefile b/sbin/Makefile
+index 0f53bc6..0e8e42e 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_tomoyo/Makefile b/usr_lib_tomoyo/Makefile
+index 94020ee..f20ae40 100644
+--- a/usr_lib_tomoyo/Makefile
++++ b/usr_lib_tomoyo/Makefile
+@@ -11,7 +11,7 @@ install: all
+ 	$(INSTALL) -m 0644 ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/$(USRLIBDIR)/tomoyo/
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile
+index fa715b0..5b991db 100644
+--- a/usr_sbin/Makefile
++++ b/usr_sbin/Makefile
+@@ -15,17 +15,17 @@ $(BUILD_FILES): libtomoyotools.so
+ 	sleep 10
+ 
+ libtomoyotools.so: tomoyotools.c tomoyotools.h
+-	$(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.3 -o libtomoyotools.so.3.0.0
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.3 -o libtomoyotools.so.3.0.0
+ 	ln -sf libtomoyotools.so.3.0.0 libtomoyotools.so
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. 
+ 
+ tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so
+-	$(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON
+ 
+ tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so
+-	$(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L.
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L.
+ 
+ install: all
+ 	mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR)
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20111025.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20111025.ebuild
new file mode 100644
index 000000000000..c4e1b342c55f
--- /dev/null
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20111025.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20111025.ebuild,v 1.1 2011/11/14 18:50:26 naota 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/53357/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	!sys-apps/ccs-tools"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.5.0_p20111025-flags-parallel.patch
+
+	# Fix libdir
+	sed -i \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		Include.make || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/usr/$(get_libdir)/tomoyo/conf\"" > "${T}/50${PN}"
+
+	tc-export CC
+}
+
+src_install() {
+	dodir /usr/"$(get_libdir)" || die
+
+	emake INSTALLDIR="${D}" install || die
+
+	doenvd "${T}/50${PN}" || die
+
+	# Fix out-of-place readme and license
+	rm "${D}"/usr/$(get_libdir)/tomoyo/{COPYING.tomoyo,README.tomoyo} || die
+	dodoc README.tomoyo || die
+}
+
+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 "http://tomoyo.sourceforge.jp/"
+}
+
+pkg_config() {
+	/usr/$(get_libdir)/tomoyo/init_policy
+}