Version bump. Add myself as a maintainer.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 186 insertions, 1 deletions

diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index a3f3b975930e..0ae456676b95 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.2 2011/01/17 22:44:30 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.3 2011/09/16 04:13:25 naota Exp $
+
+*tomoyo-tools-2.4.0_p20110820 (16 Sep 2011)
+
+  16 Sep 2011; Naohiro Aota <naota@gentoo.org>
+  +tomoyo-tools-2.4.0_p20110820.ebuild,
+  +files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch, metadata.xml:
+  Version bump. Add myself as a maintainer.
 
 *tomoyo-tools-2.3.0_p20100820 (17 Jan 2011)
 
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch
new file mode 100644
index 000000000000..8dbc35467666
--- /dev/null
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch
@@ -0,0 +1,113 @@
+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,25 +10,23 @@ all: $(ALL_FILES)
+ 
+ $(ALL_FILES): include.h
+ 
+-CC=gcc
+-
+-CFLAGS=-Wall -O2
++CFLAGS += -Wall -O2
+ 
+ #
+ # Tools for kernel testing.
+ #
+ 
+ tomoyo_capability_test: tomoyo_capability_test.c
+-	$(CC) $(CFLAGS) -o tomoyo_capability_test tomoyo_capability_test.c -lutil
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_capability_test tomoyo_capability_test.c -lutil
+ 
+ tomoyo_new_capability_test: tomoyo_new_capability_test.c
+-	$(CC) $(CFLAGS) -o tomoyo_new_capability_test tomoyo_new_capability_test.c -lutil
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_capability_test tomoyo_new_capability_test.c -lutil
+ 
+ tomoyo_new_test: tomoyo_new_test.c include.h
+-	$(CC) $(CFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil
+ 
+ .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
+@@ -4,9 +4,13 @@ BUILD_FILES := tomoyo-auditd tomoyo-checkpolicy tomoyo-diffpolicy tomoyo-domainm
+ 	tomoyo-editpolicy tomoyo-findtemp tomoyo-loadpolicy tomoyo-notifyd tomoyo-patternize \
+ 	tomoyo-pstree tomoyo-queryd tomoyo-savepolicy tomoyo-selectpolicy tomoyo-setlevel \
+ 	tomoyo-setprofile tomoyo-sortpolicy
++SIMPLE = tomoyo-domainmatch tomoyo-pstree tomoyo-checkpolicy tomoyo-findtemp tomoyo-ld-watch tomoyo-loadpolicy tomoyo-patternize tomoyo-savepolicy tomoyo-setlevel tomoyo-setprofile tomoyo-sortpolicy tomoyo-diffpolicy tomoyo-selectpolicy
+ 
+ all: libtomoyotools.so $(BUILD_FILES)
+ 
++$(SIMPLE): % : %.c libtomoyotools.so
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L.
++
+ $(BUILD_FILES): libtomoyotools.so
+ 
+ /usr/include/curses.h:
+@@ -15,17 +19,17 @@ $(BUILD_FILES): libtomoyotools.so
+ 	sleep 10
+ 
+ libtomoyotools.so: tomoyotools.c tomoyotools.h
+-	$(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.2 -o libtomoyotools.so.2.0.1
++	$(CC) $(CFLAGS) -fPIC $(LDFLAGS) tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.2 -o libtomoyotools.so.2.0.1
+ 	ln -sf libtomoyotools.so.2.0.1 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/metadata.xml b/sys-apps/tomoyo-tools/metadata.xml
index 5b14597b8ad0..1c946afa1b86 100644
--- a/sys-apps/tomoyo-tools/metadata.xml
+++ b/sys-apps/tomoyo-tools/metadata.xml
@@ -5,5 +5,8 @@
 <maintainer>
 <email>matsuu@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>naota@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
 
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20110820.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20110820.ebuild
new file mode 100644
index 000000000000..cf8d075f31d8
--- /dev/null
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20110820.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.4.0_p20110820.ebuild,v 1.1 2011/09/16 04:13:25 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/52848/${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}"/${P}-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
+}