fix #214377

Package-Manager: portage-2.1.5.2

4 files changed, 88 insertions, 11 deletions

diff --git a/www-apache/anyterm/ChangeLog b/www-apache/anyterm/ChangeLog
index 557fb211f848..dd65a20e72b3 100644
--- a/www-apache/anyterm/ChangeLog
+++ b/www-apache/anyterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/anyterm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/ChangeLog,v 1.13 2008/03/23 12:08:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/ChangeLog,v 1.14 2008/06/01 09:29:03 hollow Exp $
+
+  01 Jun 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/anyterm-1.1.22-respect-flags.patch, anyterm-1.1.22.ebuild:
+  fix #214377
 
   23 Mar 2008; Benedikt Böhm <hollow@gentoo.org> anyterm-1.1.16.ebuild:
   fix depend.apache usage wrt #208033
diff --git a/www-apache/anyterm/Manifest b/www-apache/anyterm/Manifest
index 13abe585c0fa..7c005d9e76b5 100644
--- a/www-apache/anyterm/Manifest
+++ b/www-apache/anyterm/Manifest
@@ -4,16 +4,17 @@ Hash: SHA1
 AUX 50_anyterm.conf 98 RMD160 6868b4ac9c930caacdab74a70fff70e1ddadac2d SHA1 7c156d998dd92bc70f687777dca14d2aef663147 SHA256 42f96e8066ff95c0ae51337d460fbf7b5ec24d9c4c0e6114b5ee33f48c6d7ec7
 AUX anyterm-1.1.15-browser-gentoo.patch 2100 RMD160 e3aa724b79bc52fe682864adf819df2ef68f1655 SHA1 8dbf94e35e18fa4375481d51f93c910fe29838a0 SHA256 b7cf110f80e8e18bbb18eff8801dc90f77f9a919439e3c7afce114f3964965c7
 AUX anyterm-1.1.15-postinst-en.txt 1984 RMD160 d372d26bcdbc8e092858306bb51bbe56be082b4b SHA1 e88e548caf193d450002ded43176a86ee31c40a9 SHA256 e193a5d51d121e2f16ca1fa6758029c173997cc9806593e4fffb022fefdc9f48
+AUX anyterm-1.1.22-respect-flags.patch 1818 RMD160 0299dff3775b9fbb7cf35445e94b50fd6db61cd5 SHA1 a08de2faa44f94fe3982b37b4f6b32c4db6e3964 SHA256 6c40f717adcdbdfef62e475d9b29b9629f5c82458d74fb3477a374d856ae8054
 DIST anyterm-1.1.16.tbz2 234458 RMD160 e9a871f864bb260d2e0bb762d00235c936febb66 SHA1 f45fe1991ed5725b3c387def9ad6b27eb2b94cb6 SHA256 3d9bb4158b6e67a14d6044473474549553db11566f59da64efb354522aa463e7
 DIST anyterm-1.1.22.tbz2 267401 RMD160 1ed5089e3a590f1ac5f7aaec38a041440df6df8a SHA1 59fa5ac44751f2c8bbac02fff9af47b9e01d48f9 SHA256 ff3c75e8fa825ea77ecea08cc9771c239fda06168505b394b42d90e28ffbdd51
 EBUILD anyterm-1.1.16.ebuild 2427 RMD160 c24578b5cae5bb1c4916af75f729a8b388611479 SHA1 8dcb107ec298e13f88e3c97563a5e4f8efea61a8 SHA256 50dcb8f81667ce0830d81f9f28ca8c8d89f5c88bc3df6d58a93c6923d4a3ae02
-EBUILD anyterm-1.1.22.ebuild 2431 RMD160 5932f851280b122b9b88a5363008fd0c248ad5ac SHA1 4c4b30272e64c158a54a5999d78d3d2d5c29df72 SHA256 d76cb0191ec5fc1c97718cc09d32476b5c6b1139d621cf11850ad52997fd5628
-MISC ChangeLog 2983 RMD160 d9ec2f3f7861f3d78d2ae990cf6d4f21e94c6634 SHA1 a06589ebf229452ecf90d02a591895f026dca7cf SHA256 d59340eb470ef2cae8900dbeda02376e7b1745a7cea7b40c56dc7ecd9324b1cb
+EBUILD anyterm-1.1.22.ebuild 2659 RMD160 403973e88d80896c41629d3387dd33dcf7a7d9fa SHA1 9999c26c20df8767a81f60a67871cef98c53d86f SHA256 bb272e12cbcfb4ef80d8f9e57120909e4aac6f39a9d89add5d42c0b20aaf265a
+MISC ChangeLog 3116 RMD160 e42169fca099d1f80fabaac90eeac738fdc07227 SHA1 1d44000c93b00377f48d74154951bf3fdd63c7ba SHA256 b62b0d970930a097ca321869d318e451d776ac115103fa969390a2d143c05c42
 MISC metadata.xml 183 RMD160 0e64ed9d85dd9d4ca990131047e926413a224843 SHA1 c2d94faa8692a93322354d824fd271dcf36afb8f SHA256 b842f68294faf221aa36e479d4275079ec6831ad215f59d3d446de08b410df49
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH5kg2mPFBzbX68WERAh7yAJ0Y59ATHw4gf6MRqFJ4RWqxR2OkXwCdFIeB
-NQw7gYdsdaBj8oJczza8p1g=
-=pb4Y
+iEYEARECAAYFAkhCa+kACgkQmPFBzbX68WE9GgCcDF4EMOjg098Ji12F7kQEKTiV
+gNIAn1SQtPnPP4sl0bUJJdQEY4Xy1pLG
+=Gdki
 -----END PGP SIGNATURE-----
diff --git a/www-apache/anyterm/anyterm-1.1.22.ebuild b/www-apache/anyterm/anyterm-1.1.22.ebuild
index 8224a819e04c..381445ceb0d0 100644
--- a/www-apache/anyterm/anyterm-1.1.22.ebuild
+++ b/www-apache/anyterm/anyterm-1.1.22.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/anyterm-1.1.22.ebuild,v 1.1 2008/03/22 16:35:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/anyterm-1.1.22.ebuild,v 1.2 2008/06/01 09:29:03 hollow Exp $
 
 inherit apache-module eutils toolchain-funcs webapp
 
-KEYWORDS="~x86"
-
 DESCRIPTION="A terminal anywhere."
 HOMEPAGE="http://anyterm.org/"
 SRC_URI="http://anyterm.org/download/${P}.tbz2"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86"
 IUSE="opera pam ssl"
 
 DEPEND="dev-libs/boost
 		>=dev-libs/rote-0.2.8
 		>=sys-devel/gcc-3
 		virtual/ssh
-		pam? ( www-apache/mod_auth_pam )"
+		pam? ( || ( www-apache/mod_authn_pam www-apache/mod_auth_pam ) )"
 RDEPEND="${DEPEND}"
 
 APACHE2_MOD_CONF="50_${PN}"
@@ -48,10 +48,18 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-1.1.15-browser-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-1.1.22-respect-flags.patch
 	sed -i -e "s:apr-config:apr-1-config:g" apachemod/Makefile
 }
 
 src_compile() {
+	local my_LDFLAGS
+	for flag in ${LDFLAGS} ; do
+		my_LDFLAGS="${my_LDFLAGS} -Wl,${flag}"
+	done
+	unset flag
+	export LDFLAGS="${my_LDFLAGS# }"
+
 	cd apachemod
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "Apachemod make failed"
 	cd ..
diff --git a/www-apache/anyterm/files/anyterm-1.1.22-respect-flags.patch b/www-apache/anyterm/files/anyterm-1.1.22-respect-flags.patch
new file mode 100644
index 000000000000..6dae0a41d41a
--- /dev/null
+++ b/www-apache/anyterm/files/anyterm-1.1.22-respect-flags.patch
@@ -0,0 +1,64 @@
+--- apachemod/Makefile
++++ apachemod/Makefile
+@@ -85,7 +85,7 @@
+ 	-DUSE_SHMEM \
+ 	-I../boost_shmem
+ 
+-COMPILE_FLAGS=$(CPP_FLAGS) $(shell $(APR_CONFIG) --cflags) -Wall -O0 -g
++COMPILE_FLAGS=$(CPP_FLAGS) $(shell $(APR_CONFIG) --cflags) -Wall
+ 
+ C_COMPILE_FLAGS=$(COMPILE_FLAGS) -std=gnu99
+ 
+@@ -108,23 +108,23 @@
+ OBJS=$(addsuffix .lo,$(basename $(C_SRCS) $(CC_SRCS)))
+ 
+ %.lo: %.cc
+-	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CC_COMPILE_FLAGS) -o $@ -c $<
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CC_COMPILE_FLAGS) -o $@ -c $<
+ 
+ %.lo: %.c
+-	$(LIBTOOL) --mode=compile $(CC) $(C_COMPILE_FLAGS) -o $@ -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(C_COMPILE_FLAGS) -o $@ -c $<
+ 
+ 
+ compile: $(OBJS) $(LIBPBE_LIB)
+-	$(APXS) -c -o anyterm.la $(OBJS) $(LINK_FLAGS)
++	$(APXS) $(LDFLAGS) -c -o anyterm.la $(OBJS) $(LINK_FLAGS)
+ 
+ install: FORCE
+ 	$(APXS) -n anyterm -i anyterm.la
+ 
+ %.d: %.cc
+-	$(CXX) -MM -MG -MT $@ -MT $(<:%.cc=%.lo) $(CPP_FLAGS) -o $@ $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM -MG -MT $@ -MT $(<:%.cc=%.lo) $(CPP_FLAGS) -o $@ $<
+ 
+ %.d: %.c
+-	$(CC) -MM -MG -MT $@ -MT $(<:%.c=%.lo) $(CPP_FLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -MM -MG -MT $@ -MT $(<:%.c=%.lo) $(CPP_FLAGS) -o $@ $<
+ 
+ DEPENDS=$(addsuffix .d,$(basename $(OBJS)))
+ 
+--- libpbe/build/Makefile
++++ libpbe/build/Makefile
+@@ -53,7 +53,7 @@
+ 
+ WARN_FLAGS=-W -Wall
+ 
+-OPTIMISE_FLAGS=-O
++OPTIMISE_FLAGS=
+ 
+ DEBUG_FLAGS=
+ 
+@@ -71,10 +71,10 @@
+ 	$(AR) ruv $(LIBRARY) $(OBJS)
+ 
+ %.o: %.cc
+-	$(CXX) $(COMPILE_FLAGS) -c $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMPILE_FLAGS) -c $<
+ 
+ %.d: %.cc
+-	$(CXX) -pthread -MM -MT $@ -MT $(notdir $(<:%.cc=%.o)) $(INC_FLAGS) -o $@ $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread -MM -MT $@ -MT $(notdir $(<:%.cc=%.o)) $(INC_FLAGS) -o $@ $<
+ 
+ all: $(EXECUTABLE)
+