Version bump. Drop old.

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

9 files changed, 50 insertions, 41 deletions

diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index 9a076c58ed8a..d45c2a118c21 100644
--- a/sys-apps/tomoyo-tools/ChangeLog
+++ b/sys-apps/tomoyo-tools/ChangeLog
@@ -1,6 +1,26 @@
 # 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.9 2011/11/14 18:50:26 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.10 2012/06/01 07:56:06 naota Exp $
+
+*tomoyo-tools-2.3.0_p20120414 (01 Jun 2012)
+*tomoyo-tools-2.4.0_p20120414 (01 Jun 2012)
+*tomoyo-tools-2.5.0_p20120414 (01 Jun 2012)
+*tomoyo-tools-2.2.0_p20120414 (01 Jun 2012)
+
+  01 Jun 2012; Naohiro Aota <naota@gentoo.org>
+  +files/tomoyo-tools-2.2.0_p20120414-gentoo.patch,
+  +files/tomoyo-tools-2.2.0_p20120414-ldflags.patch,
+  +files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch,
+  +files/tomoyo-tools-2.5.0_p20120414-flags-parallel.patch,
+  +tomoyo-tools-2.2.0_p20120414.ebuild, +tomoyo-tools-2.3.0_p20120414.ebuild,
+  +tomoyo-tools-2.4.0_p20120414.ebuild, +tomoyo-tools-2.5.0_p20120414.ebuild,
+  -files/tomoyo-tools-2.2.0_p20110211-gentoo.patch,
+  -files/tomoyo-tools-2.2.0_p20110211-ldflags.patch,
+  -files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch,
+  -files/tomoyo-tools-2.5.0_p20111025-flags-parallel.patch,
+  -tomoyo-tools-2.2.0_p20110211.ebuild, -tomoyo-tools-2.3.0_p20110929.ebuild,
+  -tomoyo-tools-2.4.0_p20111025.ebuild, -tomoyo-tools-2.5.0_p20111025.ebuild:
+  Version bump. Drop old.
 
 *tomoyo-tools-2.5.0_p20111025 (14 Nov 2011)
 
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-gentoo.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-gentoo.patch
index 33c73bc10dc8..33c73bc10dc8 100644
--- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-gentoo.patch
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-gentoo.patch
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-ldflags.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-ldflags.patch
index d0ea10af002a..d0ea10af002a 100644
--- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-ldflags.patch
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-ldflags.patch
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch
index 278e28fad6f7..54c7963a9a60 100644
--- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch
@@ -1,19 +1,11 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,12 +1,4 @@
--INSTALLDIR = /
--
--CC=gcc
--
--CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
--
--export CC
--export CFLAGS
--export INSTALLDIR
-+CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
- 
- all:
- 	$(MAKE) -C sbin/ all
+--- a/Include.make
++++ b/Include.make
+@@ -1,4 +1,4 @@
+ USRSBINDIR      := /usr/sbin
+ USRLIBDIR       := /usr/lib
+ MAN8            := /usr/share/man/man8
+-CFLAGS          := -Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
++CFLAGS          := -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
 --- a/kernel_test/Makefile
 +++ b/kernel_test/Makefile
 @@ -3,20 +3,18 @@ ALL_FILES = tomoyo_filesystem_test tomoyo_file_test tomoyo_rewrite_test newns to
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_p20120414-flags-parallel.patch
index 77e8ec85609f..55583e1ddc58 100644
--- 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_p20120414-flags-parallel.patch
@@ -67,9 +67,9 @@ index fa715b0..5b991db 100644
  	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
+-	$(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.3 -o libtomoyotools.so.3.0.1
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.3 -o libtomoyotools.so.3.0.1
+ 	ln -sf libtomoyotools.so.3.0.1 libtomoyotools.so
  
  .c:
 -	$(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. 
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20120414.ebuild
index bcf5ff2aa33f..c8c8c231b42a 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20120414.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2.0_p20110211.ebuild,v 1.2 2011/09/29 22:51:17 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20120414.ebuild,v 1.1 2012/06/01 07:56:06 naota Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -28,10 +28,10 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-ldflags.patch"
 
 	sed -i \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "/^CFLAGS=/s:-O2:${CFLAGS}:" \
-		-e "s:/usr/lib/:/usr/$(get_libdir)/:g" \
-		Makefile || die
+		-e "/^CC/s:gcc:$(tc-getCC):" \
+		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
+		-e "/^USRLIBDIR/s:/usr/lib:/usr/$(get_libdir):g" \
+		Include.make || die
 
 	echo "CONFIG_PROTECT=\"/usr/$(get_libdir)/tomoyo/conf\"" > "${T}/50${PN}"
 }
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20120414.ebuild
index c7e60fc8f662..767662fee75c 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20120414.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.3.0_p20110929.ebuild,v 1.1 2011/09/29 22:34:06 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20120414.ebuild,v 1.1 2012/06/01 07:56:06 naota Exp $
 
 EAPI="2"
 
@@ -24,15 +24,12 @@ S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-flags-parallel.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
+		"${FILESDIR}"/${PN}-2.3.0_p20110929-gentoo.patch
 
 	# Fix libdir
-	for makefile in {,*/}Makefile
-	do
-		sed -i \
-			-e "s:/usr/lib/:/usr/$(get_libdir)/:g" \
-			"${makefile}" || die
-	done
+	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}"
 }
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20111025.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20120414.ebuild
index 76781543b1ba..d819bb13e690 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20111025.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20120414.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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_p20111025.ebuild,v 1.1 2011/11/14 13:14:55 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20120414.ebuild,v 1.1 2012/06/01 07:56:06 naota Exp $
 
 EAPI="2"
 
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20111025.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20120414.ebuild
index c4e1b342c55f..07fa7db17518 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20111025.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20120414.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20120414.ebuild,v 1.1 2012/06/01 07:56:06 naota Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.0_p20111025-flags-parallel.patch
+	epatch "${FILESDIR}"/${P}-flags-parallel.patch
 
 	# Fix libdir
 	sed -i \