Add patch for GCC 4.1 compatibility, thanks to Ryan Hill. (bug #135504)

(Portage version: 2.1.2_rc1-r1)

4 files changed, 98 insertions, 7 deletions

diff --git a/x11-misc/fbpager/ChangeLog b/x11-misc/fbpager/ChangeLog
index 80eb2088935a..984420ead141 100644
--- a/x11-misc/fbpager/ChangeLog
+++ b/x11-misc/fbpager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fbpager
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpager/ChangeLog,v 1.6 2006/01/30 19:46:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpager/ChangeLog,v 1.7 2006/10/31 05:42:58 omp Exp $
+
+  31 Oct 2006; David Shakaryan <omp@gentoo.org>
+  +files/fbpager-0.1.4-gcc41.patch, fbpager-0.1.4.ebuild:
+  Add patch for GCC 4.1 compatibility, thanks to Ryan Hill. (bug #135504)
 
   30 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> fbpager-0.1.4.ebuild:
   Modular-X fixes.
diff --git a/x11-misc/fbpager/fbpager-0.1.4.ebuild b/x11-misc/fbpager/fbpager-0.1.4.ebuild
index ad67310c5afc..225a0db1e4a1 100644
--- a/x11-misc/fbpager/fbpager-0.1.4.ebuild
+++ b/x11-misc/fbpager/fbpager-0.1.4.ebuild
@@ -1,21 +1,31 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpager/fbpager-0.1.4.ebuild,v 1.8 2006/01/30 19:46:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpager/fbpager-0.1.4.ebuild,v 1.9 2006/10/31 05:42:58 omp Exp $
+
+inherit eutils
 
 DESCRIPTION="A Pager for fluxbox"
 HOMEPAGE="http://fluxbox.sourceforge.net/fbpager"
 SRC_URI="http://fluxbox.org/download/${P}.tar.gz"
-LICENSE="MIT"
 
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~mips ~amd64 ppc"
 IUSE=""
-RDEPEND="|| ( ( x11-libs/libXrender x11-libs/libSM ) virtual/x11 )"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libSM"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
 src_install() {
-	einstall || die
-	dodoc AUTHORS COPYING NEWS README TODO
+	einstall || die "einstall failed"
+	dodoc AUTHORS NEWS README TODO
 }
 
 pkg_postinst() {
@@ -23,4 +33,3 @@ pkg_postinst() {
 	einfo "To run fbpager inside the FluxBox slit, use fbpager -w"
 	einfo
 }
-
diff --git a/x11-misc/fbpager/files/digest-fbpager-0.1.4 b/x11-misc/fbpager/files/digest-fbpager-0.1.4
index a9c1d7d9ebdd..890372e0f980 100644
--- a/x11-misc/fbpager/files/digest-fbpager-0.1.4
+++ b/x11-misc/fbpager/files/digest-fbpager-0.1.4
@@ -1 +1,3 @@
 MD5 89aac82e217ef366634dfd768b1b5dff fbpager-0.1.4.tar.gz 349045
+RMD160 326ad3f1800f0a45cccbc7e821f45d40263d3c08 fbpager-0.1.4.tar.gz 349045
+SHA256 1aab313d18a938d0bb8f150b4ac3ab1e965f7d21618336e0f5b07c6de999669f fbpager-0.1.4.tar.gz 349045
diff --git a/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch b/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch
new file mode 100644
index 000000000000..8f085d5a9724
--- /dev/null
+++ b/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch
@@ -0,0 +1,76 @@
+--- fbpager-0.1.4.orig/src/Resources.hh
++++ fbpager-0.1.4/src/Resources.hh
+@@ -8,8 +8,10 @@
+ #include <cstdio>
+ #include <cstring>
+ 
++namespace FbTk {
++
+ template<>
+-void FbTk::Resource<bool>::
++void Resource<bool>::
+ setFromString(char const *strval) {
+     if (strcasecmp(strval, "true") == 0 ||
+         strcasecmp(strval, "yes") == 0)
+@@ -19,38 +21,37 @@
+ }
+ 
+ template<>
+-std::string FbTk::Resource<bool>::
++std::string Resource<bool>::
+ getString() {				
+     return std::string(**this == true ? "true" : "false");
+ }
+ 
+ template <>
+-void FbTk::Resource<std::string>::setFromString(const char *str) {
++void Resource<std::string>::setFromString(const char *str) {
+     *(*this) = (str ?  str : "");
+ }
+ 
+ template <>
+-std::string FbTk::Resource<std::string>::getString() {
++std::string Resource<std::string>::getString() {
+     return *(*this);
+ }
+ 
+ template <>
+-void FbTk::Resource<int>::setFromString(const char *str) {
++void Resource<int>::setFromString(const char *str) {
+     if (str == 0)
+         return;
+     sscanf(str, "%d", &(*(*this)));
+ }
+ 
+ template <>
+-std::string FbTk::Resource<int>::getString() {
++std::string Resource<int>::getString() {
+     char buff[16];
+     sprintf(buff, "%d", (*(*this)));
+     return std::string(buff);
+ }
+ 
+-namespace FbPager {
+ template <>
+-void FbTk::Resource<FbPager::Alignment>::setFromString(const char *str) {
++void Resource<FbPager::FbPager::Alignment>::setFromString(const char *str) {
+     if (strcmp("TopToBottom", str) == 0)
+         *(*this) = FbPager::FbPager::TOP_TO_BOTTOM;
+     else
+@@ -58,7 +59,7 @@
+ }
+ 
+ template <>
+-std::string FbTk::Resource<FbPager::Alignment>::getString() {
++std::string Resource<FbPager::FbPager::Alignment>::getString() {
+     switch (*(*this)) {
+     case FbPager::FbPager::LEFT_TO_RIGHT:
+         return "LeftToRight";
+@@ -67,6 +68,6 @@
+     }
+ }
+ 
+-} // end namespace FbPager
++} // end namespace FbTk
+ 
+ #endif // RESOURCES