Incorporating multiple QA fixes from Jakub (Bug #206858)

Package-Manager: portage-2.1.4_rc14

5 files changed, 153 insertions, 6 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/Manifest b/rox-base/oroborox/Manifest
index 4b8061dce40c..1e80fdf3054f 100644
--- a/rox-base/oroborox/Manifest
+++ b/rox-base/oroborox/Manifest
@@ -1,17 +1,25 @@
+AUX oroborox-0.9.8-respectflags.patch 1775 RMD160 6f45f050aed986d225ef733d37362be7d0d14340 SHA1 b5cbe68480b04a0ad0f835f6549ca206e89e4670 SHA256 f185144307b7542472233b7fbc86928e4f95bb4faa96d57457169e6bdc83e93e
+MD5 0af9f114e8af5427b5d8acb53c43a289 files/oroborox-0.9.8-respectflags.patch 1775
+RMD160 6f45f050aed986d225ef733d37362be7d0d14340 files/oroborox-0.9.8-respectflags.patch 1775
+SHA256 f185144307b7542472233b7fbc86928e4f95bb4faa96d57457169e6bdc83e93e files/oroborox-0.9.8-respectflags.patch 1775
 DIST OroboROX-0.9.7.9.tar.bz2 464642 RMD160 4ed9fab12c555c18bc3611845d69ad596e967b67 SHA1 952fdab316cd158e82a78d44791d7fafc7bac8f1 SHA256 e550d3a35c20f916f57d8930860d793192c6cd4ddbba1674b46394f33058a8d6
 DIST OroboROX-0.9.8.tar.bz2 463443 RMD160 e1175bbbe20275be4f3440077832eaca470b7afa SHA1 73b4565fce7c178a0a458cd432fcd6d4e65fec6e SHA256 b9ca46928c48eca7659191ce213fe346e48baae44878146cdcb6a236910b817b
 EBUILD oroborox-0.9.7.9.ebuild 1377 RMD160 e68f58b4cb38a4fb2d7350c2acd886572e1863c2 SHA1 f0be79201efd55bcf412b9c24f62fc993f4da384 SHA256 635f5f918cad65ccf085b791c07f516ecccf6e54f0466ade623c0e9f07fa9693
 MD5 668e0125299b8b540074101ef1ec4009 oroborox-0.9.7.9.ebuild 1377
 RMD160 e68f58b4cb38a4fb2d7350c2acd886572e1863c2 oroborox-0.9.7.9.ebuild 1377
 SHA256 635f5f918cad65ccf085b791c07f516ecccf6e54f0466ade623c0e9f07fa9693 oroborox-0.9.7.9.ebuild 1377
+EBUILD oroborox-0.9.8-r1.ebuild 1740 RMD160 a3d6909a810d4e97261327b0062fd61a6149bd9d SHA1 47e26893bc78c7b7b21996af84af5f6697cf1a21 SHA256 fba2685323794ad2e5721e8469a444cf1cbfbd59dab6228e4fd0c4e0b118e770
+MD5 3829fe96209ade88313a50602b344b45 oroborox-0.9.8-r1.ebuild 1740
+RMD160 a3d6909a810d4e97261327b0062fd61a6149bd9d oroborox-0.9.8-r1.ebuild 1740
+SHA256 fba2685323794ad2e5721e8469a444cf1cbfbd59dab6228e4fd0c4e0b118e770 oroborox-0.9.8-r1.ebuild 1740
 EBUILD oroborox-0.9.8.ebuild 1732 RMD160 c032fc7c933172efe3f10f696b1b846031902fb7 SHA1 e7c323d9f8941c4ef4598d86d0691c44e0f1ecc5 SHA256 b2fe306d96bd7d30fda87a6751415791df9196551b82c539378ebc5900d8eea9
 MD5 5ea5b7d2c55c8f2f2c8de18dd4ed66d9 oroborox-0.9.8.ebuild 1732
 RMD160 c032fc7c933172efe3f10f696b1b846031902fb7 oroborox-0.9.8.ebuild 1732
 SHA256 b2fe306d96bd7d30fda87a6751415791df9196551b82c539378ebc5900d8eea9 oroborox-0.9.8.ebuild 1732
-MISC ChangeLog 1980 RMD160 fc8726326b079d67cc6f8ff75f80edf191cc681e SHA1 15aed0b3cbc3eeab0fbd03034b17fb57ba392f84 SHA256 cf7ed08ff42adf905ab751d37f5031f914cd806d2cda3159ed7cedb9f8e53cc2
-MD5 f0f42661ec0f6446c5e1c4f6f2d422e3 ChangeLog 1980
-RMD160 fc8726326b079d67cc6f8ff75f80edf191cc681e ChangeLog 1980
-SHA256 cf7ed08ff42adf905ab751d37f5031f914cd806d2cda3159ed7cedb9f8e53cc2 ChangeLog 1980
+MISC ChangeLog 2187 RMD160 63f236e5a6fbc8505cff339b8060828c0c9284f1 SHA1 16c137196efed7e2316d03d98c8beebd41085ec6 SHA256 87edd8e4ba8d77c84cff222a2cbac8442fb2ff3ba3cc7622167a83596e92c7e2
+MD5 058114bf27c7cc43d685ee621d93f827 ChangeLog 2187
+RMD160 63f236e5a6fbc8505cff339b8060828c0c9284f1 ChangeLog 2187
+SHA256 87edd8e4ba8d77c84cff222a2cbac8442fb2ff3ba3cc7622167a83596e92c7e2 ChangeLog 2187
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -22,3 +30,6 @@ SHA256 74b88029bf479b5e7ac004d126686f75905367d76ce4b39d3acc5943ca20fe9b files/di
 MD5 0a8783d55a2cf52b7d29224159bd0305 files/digest-oroborox-0.9.8 247
 RMD160 3b9bce3085376eda5d42e3f05ac66cf7ad6c4e5f files/digest-oroborox-0.9.8 247
 SHA256 1eecef5c40471a9a9b984ca9c2348ee500280bae96533e0c884de93c16b55f7d files/digest-oroborox-0.9.8 247
+MD5 0a8783d55a2cf52b7d29224159bd0305 files/digest-oroborox-0.9.8-r1 247
+RMD160 3b9bce3085376eda5d42e3f05ac66cf7ad6c4e5f files/digest-oroborox-0.9.8-r1 247
+SHA256 1eecef5c40471a9a9b984ca9c2348ee500280bae96533e0c884de93c16b55f7d files/digest-oroborox-0.9.8-r1 247
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'
+}