Incorporating multiple QA fixes from Jakub (Bug #206858)

(Portage version: 2.1.4_rc14)

4 files changed, 138 insertions, 2 deletions

diff --git a/rox-base/oroborox/ChangeLog b/rox-base/oroborox/ChangeLog
index 10e62a65602f..fe505b043fc0 100644
--- a/rox-base/oroborox/ChangeLog
+++ b/rox-base/oroborox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for rox-base/oroborox
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/ChangeLog,v 1.13 2007/10/30 17:44:23 fmccor Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/ChangeLog,v 1.14 2008/01/22 15:13:00 lack Exp $
+
+*oroborox-0.9.8-r1 (22 Jan 2008)
+
+  22 Jan 2008; Jim Ramsay <lack@gentoo.org>
+  +files/oroborox-0.9.8-respectflags.patch, +oroborox-0.9.8-r1.ebuild:
+  Incorporating multiple QA fixes from Jakub (Bug #206858)
 
   30 Oct 2007; Ferris McCormick <fmccor@gentoo.org> oroborox-0.9.8.ebuild:
   Add ~sparc, fix quoting (bookkeeping); it starts up, at least.
diff --git a/rox-base/oroborox/files/digest-oroborox-0.9.8-r1 b/rox-base/oroborox/files/digest-oroborox-0.9.8-r1
new file mode 100644
index 000000000000..b6c84ea2504f
--- /dev/null
+++ b/rox-base/oroborox/files/digest-oroborox-0.9.8-r1
@@ -0,0 +1,3 @@
+MD5 e9fc30e4219300306ab678f9800888bd OroboROX-0.9.8.tar.bz2 463443
+RMD160 e1175bbbe20275be4f3440077832eaca470b7afa OroboROX-0.9.8.tar.bz2 463443
+SHA256 b9ca46928c48eca7659191ce213fe346e48baae44878146cdcb6a236910b817b OroboROX-0.9.8.tar.bz2 463443
diff --git a/rox-base/oroborox/files/oroborox-0.9.8-respectflags.patch b/rox-base/oroborox/files/oroborox-0.9.8-respectflags.patch
new file mode 100644
index 000000000000..4307bc8210a6
--- /dev/null
+++ b/rox-base/oroborox/files/oroborox-0.9.8-respectflags.patch
@@ -0,0 +1,53 @@
+--- OroboROX/AppRun.orig	2006-03-04 22:19:16.000000000 +0100
++++ OroboROX/AppRun	2008-01-21 12:51:26.000000000 +0100
+@@ -77,16 +77,6 @@
+ 		rm -f "$APP_DIR/src/config.cache"
+ 		[ ! -d "$APP_DIR/=build" ] && mkdir "$APP_DIR/=build"
+ 		
+-		CFLAGS="-Os"
+-		COMPILER=`cc -dumpversion` 2>/dev/null	
+-		if [ "$ARCH" = ix86 ] && [ ! x"$COMPILER" = x ] ; then			
+-			MAJOR=${COMPILER%.?.?}
+-			if [ "$MAJOR" = 4 ] ; then
+-				CFLAGS="$CFLAGS -march=i486 -mtune=i686 -m32"
+-			else
+-				CFLAGS="$CFLAGS -march=i486 -mcpu=i686 -m32"
+-			fi
+-		fi
+ 		export CFLAGS
+ 
+ 		cd "$APP_DIR/=build" && "$APP_DIR/src/configure" --enable-rox --disable-startup-notification --with-platform="$PLATFORM" \
+--- OroboROX/src/Makefile.in.orig	2006-03-04 22:19:13.000000000 +0100
++++ OroboROX/src/Makefile.in	2008-01-21 13:05:41.000000000 +0100
+@@ -3,7 +3,7 @@
+ VPATH = @srcdir@
+ PLATFORM = @with_platform@
+ PLATFORM_DIR = $(srcdir)/../${PLATFORM}
+-CC = @CC@
++CC ?= @CC@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+ 
+@@ -12,9 +12,9 @@
+ USE_LIBS= @USE_LIBS@
+ #PROF = -fprofile-arcs -pg
+ 
+-CFLAGS = -g -I. -I${srcdir} ${PROF} @CFLAGS@  \
++CFLAGS += -I. -I${srcdir} ${PROF} @CFLAGS@  \
+ 	 `${PKG_CONFIG} --cflags glib-2.0 `
+-LDFLAGS = ${PROF} @LDFLAGS@ `${PKG_CONFIG} --libs glib-2.0 ${USE_LIBS}` ${LIBS}
++LDFLAGS += ${PROF} @LDFLAGS@ `${PKG_CONFIG} --libs glib-2.0 ${USE_LIBS}` ${LIBS}
+ EXEC = ${PLATFORM_DIR}/${PROG}
+ 
+ ############ Things to change for different programs
+@@ -35,10 +35,6 @@
+ 	${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS}
+ 	[ -d "${PLATFORM_DIR}" ] || mkdir "${PLATFORM_DIR}"
+ 	mv "${PROG}" "${PLATFORM_DIR}"
+-	-(cd "${PLATFORM_DIR}" && \
+-	 objcopy --only-keep-debug OroboROX OroboROX.dbg && \
+-	 strip OroboROX && \
+-	 objcopy --add-gnu-debuglink=OroboROX.dbg OroboROX)
+ 
+ clean:
+ 	rm -f *.o Makefile.bak
diff --git a/rox-base/oroborox/oroborox-0.9.8-r1.ebuild b/rox-base/oroborox/oroborox-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..d95f6047d598
--- /dev/null
+++ b/rox-base/oroborox/oroborox-0.9.8-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.8-r1.ebuild,v 1.1 2008/01/22 15:13:00 lack Exp $
+
+ROX_LIB_VER=1.9.14
+inherit rox eutils toolchain-funcs autotools
+
+MY_PN="OroboROX"
+
+DESCRIPTION="OroboROX is a small window manager for the ROX Desktop."
+HOMEPAGE="http://rox.sourceforge.net/"
+SRC_URI="http://roxos.sunsite.dk/dev-contrib/guido/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~sparc ~x86"
+# startup-notification support is disabled by default, probably because it
+# doesn't work.
+# Also, there is no way to explicitly disable xinerama - It is always detected
+# if it's there.
+IUSE="xinerama" #startup-notification
+
+DEPEND="
+	>=media-libs/freetype-2.0
+	virtual/xft
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-proto/xineramaproto )
+	"
+	#startup-notification? ( x11-libs/startup-notification )
+
+RDEPEND="
+	>=media-libs/freetype-2.0
+	virtual/xft
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	xinerama? ( x11-libs/libXinerama )
+	"
+	#startup-notification? ( x11-libs/startup-notification )
+
+S=${WORKDIR}
+SET_PERM=TRUE
+
+APPNAME=${MY_PN}
+
+# OroboROX causes sandbox violations if CHOICESPATH is set to any path.
+# see bug #124133
+unset CHOICESPATH
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-respectflags.patch
+	cd ${MY_PN}/src
+	eautoreconf
+	tc-export CC
+}
+
+src_compile() {
+	rox_src_compile
+
+	# Remove the leftover '=build' directory
+	cd "${S}/${APPNAME}"
+	rm -rf '=build'
+}