Sync with portage [Fri Nov 18 10:41:03 MSK 2011].

mhiretskiy
root 13 years ago
parent a316933218
commit f3fcd3006a

@ -1 +1,2 @@
DIST sphinx3-0.6.3.tar.gz 26070353 RMD160 0d3e44af97fe24dbcca30a853ebc6d751c576fc6 SHA1 53e1d4106bf6cb50378618a7afe97b47c19afadc SHA256 f6a070a67d91ccd00dbce7b6cc55242ed7a5ebaae6d6429eb0364657c4056ede
DIST sphinx3-0.8.tar.gz 25226326 RMD160 63696e35838f07a6b6e2490d48ad59bd24037b83 SHA1 631220266c7619c411659d1a1a571c3f868b6994 SHA256 1cf76a086f9b509e35f7226df2e61b0a0bf8b0858b9676e5b18cfc47b2ea2741

@ -0,0 +1,34 @@
diff -uNr sphinx3-0.8.orig/python/setup.py sphinx3-0.8/python/setup.py
--- sphinx3-0.8.orig/python/setup.py 2008-12-31 23:20:08.000000000 -0500
+++ sphinx3-0.8/python/setup.py 2011-11-17 09:46:57.000000000 -0500
@@ -8,15 +8,10 @@
define_macros = []
module = Extension('_sphinx3',
- include_dirs = ['../../sphinxbase/include',
- '../include',
- '/usr/local/include/sphinxbase/',
- '/usr/local/include/sphinx3',
- ],
+ include_dirs = ['../include',
+ '@GENTOO_PORTAGE_EPREFIX@/usr/include/sphinxbase'],
define_macros = define_macros,
- library_dirs = ['../../sphinxbase/src/libsphinxbase/.libs',
- '../src/libs3decoder/.libs',
- '../../sphinxbase/lib/debug',
+ library_dirs = ['../src/libs3decoder/.libs',
'../lib/debug',
],
libraries = ['sphinxbase', 's3decoder'],
diff -uNr sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c sphinx3-0.8/src/libs3decoder/libsearch/vithist.c
--- sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c 2008-12-31 13:27:56.000000000 -0500
+++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c 2011-11-17 09:46:24.000000000 -0500
@@ -647,7 +647,7 @@
{
int32 se, fe, filler_done, th;
vithist_entry_t *ve;
- heap_t h;
+ heap_t *h;
s3wid_t *wid;
int32 i;

@ -0,0 +1,70 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/sphinx3-0.8.ebuild,v 1.1 2011/11/17 17:45:56 neurogeek Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
SUPPORT_PYTHON_ABIS="1"
inherit autotools-utils prefix python
DESCRIPTION="CMU Speech Recognition engine"
HOMEPAGE="http://cmusphinx.sourceforge.net/"
SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
LICENSE="BSD as-is"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc python static-libs"
DEPEND=">=app-accessibility/sphinxbase-0.7[static-libs?,python?]"
RDEPEND="${DEPEND}"
RESTRICT_PYTHON_ABIS="3*"
src_prepare() {
epatch "${FILESDIR}/${P}_heap_fix.patch"
eprefixify 'python/setup.py'
}
src_configure() {
econf \
$( use_enable static-libs static )
}
src_compile() {
default
if use python; then
python_copy_sources python
building() {
"$(PYTHON)" setup.py build
}
python_execute_function -s --source-dir python building
fi
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog NEWS README
if use doc; then
cd doc
dohtml -r -x CVS s3* s3 *.html
fi
if use python; then
installing() {
"$(PYTHON)" setup.py install \
--install-lib="${D}/$(python_get_sitedir)"
}
python_execute_function -s --source-dir python installing
fi
remove_libtool_files
}

@ -0,0 +1 @@
DIST sphinxbase-0.7.tar.gz 3291922 RMD160 6f75698e95fc4e772f44d6eda76af24f5edcdf7d SHA1 32dc04f7e7f37ffe53bd0b6e27b1f5df1800a705 SHA256 389cb99a545f7d615a2b3bc3f7362a490ca45fc4dc440140ae1d2a41f87773ec

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
<herd>accessibility</herd>
</pkgmetadata>

@ -0,0 +1,59 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild,v 1.1 2011/11/17 17:35:05 neurogeek Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
SUPPORT_PYTHON_ABIS="1"
inherit autotools-utils python
DESCRIPTION="Support library required by the Sphinx Speech Recognition Engine"
HOMEPAGE="http://cmusphinx.sourceforge.net/"
SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
LICENSE="BSD as-is"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc lapack python static-libs"
RDEPEND="lapack? ( virtual/lapack )"
DEPEND="${RDEPEND}
doc? ( >=app-doc/doxygen-1.4.7 )"
RESTRICT_PYTHON_ABIS="3*"
src_configure() {
econf \
$( use_with lapack ) \
$( use_with python ) \
$( use_enable static-libs static )
}
src_compile() {
default
if use python; then
python_copy_sources python
building() {
emake PYTHON="$(PYTHON)" PYTHON_INCLUDEDIR="$(python_get_includedir)" PYTHON_LIBDIR="$(python_get_libdir)"
}
python_execute_function -s --source-dir python building
fi
}
src_install() {
emake DESTDIR="${D}" install || die
if use python; then
python_execute_function -s --source-dir python -d
fi
if use doc; then
dohtml doc/html/*
fi
remove_libtool_files
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/logsurfer+/logsurfer+-1.8.ebuild,v 1.1 2011/10/22 12:09:04 matsuu Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/logsurfer+/logsurfer+-1.8.ebuild,v 1.2 2011/11/17 18:52:46 phajdan.jr Exp $
EAPI="4"
inherit toolchain-funcs
@ -13,7 +13,7 @@ SRC_URI="http://kerryt.orcon.net.nz/${MY_P}.tar.gz
LICENSE="as-is"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 x86"
IUSE=""
S="${WORKDIR}/${MY_P}"

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>nyhm@gentoo.org</email>
<email>tristan@gentoo.org</email>
<name>Tristan Heaven</name>
</maintainer>
<maintainer>

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>nyhm@gentoo.org</email>
<email>tristan@gentoo.org</email>
<name>Tristan Heaven</name>
</maintainer>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild,v 1.2 2011/11/15 22:11:11 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild,v 1.3 2011/11/17 18:47:32 phajdan.jr Exp $
inherit eutils toolchain-funcs
@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="sys-libs/zlib"

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>nyhm@gentoo.org</email>
<email>tristan@gentoo.org</email>
<name>Tristan Heaven</name>
</maintainer>
</pkgmetadata>

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>nyhm@gentoo.org</email>
<email>tristan@gentoo.org</email>
<name>Tristan Heaven</name>
</maintainer>
<use>

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.6.ebuild,v 1.4 2011/11/16 19:23:07 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.6.ebuild,v 1.5 2011/11/17 18:55:21 phajdan.jr Exp $
#BACKPORTS=2
#AUTOTOOLIZE=yes
@ -30,7 +30,7 @@ else
${BACKPORTS:+
http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
fi
S="${WORKDIR}/${P%_rc*}"

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.6.ebuild,v 1.11 2011/07/11 18:51:40 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.6.ebuild,v 1.12 2011/11/17 17:05:54 jlec Exp $
EAPI=2
@ -23,8 +23,8 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:0
media-libs/libpng
media-libs/tiff
media-libs/libpng:0
media-libs/tiff:0
net-print/cups
sys-libs/zlib
x11-libs/qt-core:4

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.8.ebuild,v 1.3 2011/07/11 18:51:40 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.8.ebuild,v 1.4 2011/11/17 17:05:54 jlec Exp $
EAPI=2
@ -23,8 +23,8 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:0
media-libs/libpng
media-libs/tiff
media-libs/libpng:0
media-libs/tiff:0
net-print/cups
sys-libs/zlib
x11-libs/qt-core:4

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild,v 1.1 2011/07/12 09:59:33 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild,v 1.2 2011/11/17 17:05:54 jlec Exp $
EAPI=2
@ -23,8 +23,8 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:0
media-libs/libpng
media-libs/tiff
media-libs/libpng:0
media-libs/tiff:0
net-print/cups
sys-libs/zlib
x11-libs/qt-core:4

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r2.ebuild,v 1.1 2011/09/27 21:28:14 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r2.ebuild,v 1.2 2011/11/17 17:05:54 jlec Exp $
EAPI=2
@ -23,8 +23,8 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:0
media-libs/libpng
media-libs/tiff
media-libs/libpng:0
media-libs/tiff:0
net-print/cups
sys-libs/zlib
x11-libs/qt-core:4

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9.ebuild,v 1.5 2011/07/15 15:07:37 xarthisius Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9.ebuild,v 1.6 2011/11/17 17:05:54 jlec Exp $
EAPI=2
@ -23,8 +23,8 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:0
media-libs/libpng
media-libs/tiff
media-libs/libpng:0
media-libs/tiff:0
net-print/cups
sys-libs/zlib
x11-libs/qt-core:4

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.4 2011/09/27 21:28:14 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.5 2011/11/17 17:05:54 jlec Exp $
EAPI=3
@ -25,8 +25,8 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:2
media-libs/libpng
media-libs/tiff
media-libs/libpng:0
media-libs/tiff:0
net-print/cups
sys-libs/zlib
x11-libs/qt-core:4

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc6.ebuild,v 1.1 2011/10/18 10:51:25 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc6.ebuild,v 1.2 2011/11/17 17:05:54 jlec Exp $
EAPI=3
@ -25,8 +25,8 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:2
media-libs/libpng
media-libs/tiff
media-libs/libpng:0
media-libs/tiff:0
net-print/cups
sys-libs/zlib
x11-libs/qt-core:4

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-7.ebuild,v 1.2 2011/11/16 17:27:18 chainsaw Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-7.ebuild,v 1.3 2011/11/17 18:47:08 phajdan.jr Exp $
EAPI=3
@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="vanilla"
RDEPEND=">=app-text/mupdf-0.8.165

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.17.ebuild,v 1.5 2011/11/16 17:28:51 chainsaw Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.17.ebuild,v 1.6 2011/11/17 18:38:14 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2"
@ -11,7 +11,7 @@ DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
HOMEPAGE="http://lilypond.org/mftrace/"
SRC_URI="http://lilypond.org/download/sources/mftrace/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86"
# SLOT 1 was used in pktrace ebuild
SLOT="1"
IUSE="test truetype"

@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0.ebuild,v 1.6 2011/10/17 15:31:47 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0.ebuild,v 1.8 2011/11/17 22:23:43 mr_bones_ Exp $
EAPI=2
inherit toolchain-funcs flag-o-matic bash-completion
EAPI=4
inherit toolchain-funcs flag-o-matic bash-completion-r1
DESCRIPTION="Lists directories recursively, and produces an indented listing of files."
HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
@ -22,18 +22,17 @@ src_prepare() {
}
src_compile() {
append-lfs-flags
append-cflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
emake \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
XOBJS="$(use elibc_uclibc && echo strverscmp.o)" \
|| die "emake failed"
XOBJS="$(use elibc_uclibc && echo strverscmp.o)"
}
src_install() {
dobin tree || die "dobin failed"
doman doc/tree*.1 || die
dodoc CHANGES README* || die
dobashcompletion "${FILESDIR}"/${PN}.bashcomp
dobin tree
doman doc/tree*.1
dodoc CHANGES README*
dobashcomp "${FILESDIR}"/${PN}.bashcomp
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-2.6.ebuild,v 1.3 2011/11/16 10:44:50 chainsaw Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-2.6.ebuild,v 1.4 2011/11/17 18:53:25 phajdan.jr Exp $
EAPI="2"
PYTHON_USE_WITH="tk"
@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="emacs tk vim-syntax"
DEPEND="dev-lang/python

@ -0,0 +1,22 @@
diff -ruN OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
--- OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-06-17 10:41:56.000000000 +0200
+++ my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-11-17 19:44:33.194607494 +0100
@@ -9,12 +9,13 @@
#define FF_API_OLD_SAMPLE_FMT 0
#include <errno.h> // for error codes defined in avformat.h
#include <stdint.h>
-#include <avcodec.h>
-#include <avformat.h>
-#include <avdevice.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavdevice/avdevice.h>
+#include <libavutil/mathematics.h>
-#ifdef USE_SWSCALE
- #include <swscale.h>
+#ifdef USE_SWSCALE
+ #include <libswscale/swscale.h>
#endif
}

@ -2,6 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
<maintainer>
<email>reavertm@gentoo.org</email>
<name>Maciej Mrozowski</name>
</maintainer>
<longdescription lang="en">
The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
</longdescription>

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.1 2011/10/14 09:50:30 tupone Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.2 2011/11/17 18:57:24 reavertm Exp $
EAPI=3
@ -84,6 +84,7 @@ DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
PATCHES=(
"${FILESDIR}/${P}-cmake.patch"
"${FILESDIR}/${PN}-3.0.1-libav-0.7.patch"
)
src_configure() {

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env,v 1.1 2011/09/08 07:28:32 caster Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env,v 1.2 2011/11/17 22:49:56 caster Exp $
VERSION="Oracle JDK @PV@"
JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
@ -8,7 +8,7 @@ JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
JAVAC=${JAVA_HOME}/bin/javac
PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/java/packages/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib64:@GENTOO_PORTAGE_EPREFIX@/lib64:@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
PROVIDES_TYPE="JDK JRE"
PROVIDES_VERSION="1.7"

@ -0,0 +1,165 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild,v 1.1 2011/11/17 22:49:56 caster Exp $
EAPI="4"
inherit java-vm-2 eutils pax-utils prefix versionator
UPDATE="$(get_version_component_range 4)"
UPDATE="${UPDATE#0}"
MY_PV="$(get_version_component_range 2)u${UPDATE}"
S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
# check the URIs when bumping, no idea about their stability yet
JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u1-download-513651.html"
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
JCE_DIR="UnlimitedJCEPolicy"
JCE_FILE="${JCE_DIR}JDK7.zip"
DESCRIPTION="Oracle's Java SE Development Kit"
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
SRC_URI="x86? ( ${X86_AT} )
amd64? ( ${AMD64_AT} )
jce? ( ${JCE_FILE} )"
SLOT="1.7"
LICENSE="Oracle-BCLA-JavaSE"
KEYWORDS="~amd64 ~x86"
RESTRICT="fetch strip"
IUSE="X alsa derby doc examples jce nsplugin"
QA_TEXTRELS_x86="
opt/${P}/jre/lib/i386/client/libjvm.so
opt/${P}/jre/lib/i386/server/libjvm.so"
DEPEND="jce? ( app-arch/unzip )"
RDEPEND="${DEPEND}
doc? ( dev-java/java-sdk-docs:1.7 )
!prefix? ( sys-libs/glibc )
alsa? ( media-libs/alsa-lib )
X? (
x11-libs/libXext
x11-libs/libXi
x11-libs/libXrender
x11-libs/libXtst
x11-libs/libX11
)"
S="${WORKDIR}/jdk${S_PV}"
pkg_nofetch() {
if use x86; then
AT=${X86_AT}
elif use amd64; then
AT=${AMD64_AT}
fi
einfo "Please download ${AT} from:"
einfo "${JDK_URI}"
einfo "and move it to ${DISTDIR}"
if use jce; then
einfo "Also download ${JCE_FILE} from:"
einfo ${JCE_URI}
einfo "and move it to ${DISTDIR}"
fi
}
src_prepare() {
if use jce; then
mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
fi
}
src_compile() {
# Set PaX markings on all JDK/JRE executables to allow code-generation on
# the heap by the JIT compiler. This needs to be done before CDS - #215225
pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
# see bug #207282
einfo "Creating the Class Data Sharing archives"
if use x86; then
"${S}"/bin/java -client -Xshare:dump || die
fi
"${S}"/bin/java -server -Xshare:dump || die
# Create files used as storage for system preferences.
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
}
src_install() {
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
# writable executable segments
if use x86; then
rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
{,jre/}lib/i386/libjavaplugin_nscp*.so
rm -vrf jre/plugin/i386
fi
# Without nsplugin flag, also remove the new plugin
local arch=${ARCH};
use x86 && arch=i386;
if ! use nsplugin; then
rm -vf {,jre/}lib/${arch}/libnpjp2.so \
{,jre/}lib/${arch}/libjavaplugin_jni.so
fi
dodir /opt/${P}
cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die
if use derby; then
cp -pPR db "${ED}"/opt/${P} || die
fi
if use examples; then
cp -pPR demo sample "${ED}"/opt/${P} || die
fi
# Remove empty dirs we might have copied
rmdir -v $(find "${D}" -type d -empty) || die
dodoc COPYRIGHT
dohtml README.html
if use jce; then
dodir /opt/${P}/jre/lib/security/strong-jce
mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
dosym /opt/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
/opt/${P}/jre/lib/security/
dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
/opt/${P}/jre/lib/security/
fi
if use nsplugin; then
install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
fi
# Install desktop file for the Java Control Panel. Using VMHANDLE as file
# name to prevent file collision with jre and or other slots.
[[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die
sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT}/" \
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
"${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \
"${T}"/${VMHANDLE}.desktop
domenu "${T}"/${VMHANDLE}.desktop
# bug #56444
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
eprefixify "${T}"/fontconfig.properties
insinto /opt/${P}/jre/lib/
doins "${T}"/fontconfig.properties
set_java_env
java-vm_revdep-mask
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
}

@ -7,3 +7,6 @@ DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 RMD160 32aca7c0ad9ced672efa1a1a94bdc
DIST swt-3.6.1-gtk-linux-ppc.zip 5396609 RMD160 475df9e050c5cd348b79839643bac2ddb2ebf398 SHA1 d9c484e77621d3bb3498d706d5e05aa006745bf6 SHA256 71caf4106401c8227696f8fc2c6d84a9c88877a38ed046b830455c65b85412ec
DIST swt-3.6.1-gtk-linux-x86.zip 5234373 RMD160 7cdead902a173850ae9caa4f3d3c804dc46b7a4b SHA1 e629e0b65296b67931f1fce8ab72419818c9747f SHA256 d0df381d82b1483bc2ffc576a55250be12db108f6a77058f87dd87ac7874f9ef
DIST swt-3.6.1-gtk-linux-x86_64.zip 5529321 RMD160 577c13612ce625d6aea97583cd511d95f37ef666 SHA1 4569b6a64348d0da24ff205925128552c6753a81 SHA256 e4e72278e710ecda4594a143e76cb7dc30ab7bcd5e6334b4c0d08ca75d900b94
DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 RMD160 2c8c0f00b4f001a4b0680d587f037499d258303c SHA1 0ef380192e28f028cb94c67071cbad648aaedf5f SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c
DIST swt-3.7.1-gtk-linux-x86.zip 5374283 RMD160 997e300ab267b6cbb5dc4f50610cecf752cf5417 SHA1 7d896033c84f2b0beef952aac0e2e0c73038c881 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942
DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 RMD160 9e9a82027b93557f8f7e44fc54d090b74cd59373 SHA1 2d8e18bc53d8a2d6ff1af5a4226756a11f4a107d SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75

@ -0,0 +1,17 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
Bundle-Version: 3.7
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
org.eclipse.swt.internal.cairo; x-internal:=true,
org.eclipse.swt.internal.cde; x-internal:=true,
org.eclipse.swt.internal.gnome; x-internal:=true,
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
org.eclipse.swt.internal.webkit; x-internal:=true

@ -8,6 +8,7 @@
AWT/Swing in Java with a difference - SWT uses a rich set of native widgets.
</longdescription>
<use>
<flag name="webkit">Embedded browser support via net-libs/webkit-gtk:2, replacing former xulrunner-based browser.</flag>
<flag name="xulrunner">Embedded browser support via xulrunner-1.9 (1.8 for swt-3.3). Xulrunner 2.0 is not supported, will be replaced by webkit in 3.7.</flag>
</use>
</pkgmetadata>

@ -0,0 +1,181 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.7.1.ebuild,v 1.1 2011/11/17 23:23:50 caster Exp $
EAPI=4
inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
MY_PV="${PV/_rc/RC}"
MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201109091335"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="GTK based SWT Library"
HOMEPAGE="http://www.eclipse.org/"
SRC_URI="x86? (
http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
)
x86-fbsd? (
http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
)
amd64? (
http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
)
ppc? (
http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
)
ppc64? (
http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
)"
SLOT="3.7"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="cairo gnome opengl webkit"
COMMON=">=dev-libs/glib-2.6
>=x11-libs/gtk+-2.6.8:2
>=dev-libs/atk-1.10.2
cairo? ( >=x11-libs/cairo-1.4.14 )
gnome? (
=gnome-base/libgnome-2*
=gnome-base/gnome-vfs-2*
=gnome-base/libgnomeui-2*
)
opengl? (
virtual/opengl
virtual/glu
)
webkit? ( >=net-libs/webkit-gtk-1.2:2 )
x11-libs/libXtst"
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
>=x11-libs/libXtst-1.1.0
x11-proto/inputproto
dev-util/pkgconfig
${COMMON}"
RDEPEND=">=virtual/jre-1.4
${COMMON}"
S="${WORKDIR}"
# JNI libraries don't need SONAME, bug #253756
QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
src_unpack() {
local DISTFILE=${A}
unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
unpack "./src.zip"
# Cleanup the redirtied directory structure
rm -rf about_files/ || die
}
java_prepare() {
# Replace the build.xml to allow compilation without Eclipse tasks
cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
# Fix Makefiles to respect flags and work with --as-needed
epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
}
src_compile() {
# Drop jikes support as it seems to be unfriendly with SWT
java-pkg_filter-compiler jikes
local AWT_ARCH
local JAWTSO="libjawt.so"
if [[ $(tc-arch) == 'x86' ]] ; then
AWT_ARCH="i386"
elif [[ $(tc-arch) == 'ppc' ]] ; then
AWT_ARCH="ppc"
elif [[ $(tc-arch) == 'ppc64' ]] ; then
AWT_ARCH="ppc64"
else
AWT_ARCH="amd64"
fi
if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
else
eerror "${JAWTSO} not found in the JDK being used for compilation!"
die "cannot build AWT library"
fi
# Fix the pointer size for AMD64
[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
local platform="linux"
use elibc_FreeBSD && platform="freebsd"
local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
einfo "Building AWT library"
${make} make_awt
einfo "Building SWT library"
${make} make_swt
einfo "Building JAVA-AT-SPI bridge"
${make} make_atk
if use gnome ; then
einfo "Building GNOME VFS support"
${make} make_gnome
fi
if use cairo ; then
einfo "Building CAIRO support"
${make} make_cairo
fi
if use opengl ; then
einfo "Building OpenGL component"
${make} make_glx
fi
if use webkit ; then
einfo "Building the WebKitGTK+ component"
${make} make_webkit
fi
einfo "Building JNI libraries"
eant compile
einfo "Copying missing files"
cp -i "${S}/version.txt" "${S}/build/version.txt"
cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
"${S}/build/org/eclipse/swt/internal/" || die
einfo "Packing JNI libraries"
eant jar
}
src_install() {
swtArch=${ARCH}
use amd64 && swtArch=x86_64
use x86-fbsd && swtArch=x86
sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
java-pkg_sointo /usr/$(get_libdir)
java-pkg_doso *.so
dohtml about.html || die
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.3.0.ebuild,v 1.2 2011/11/15 21:52:31 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.3.0.ebuild,v 1.3 2011/11/17 18:46:11 phajdan.jr Exp $
EAPI=2
JAVA_PKG_IUSE="source test"
@ -13,7 +13,7 @@ SRC_URI="https://github.com/clojure/clojure/tarball/clojure-1.3.0 -> ${P}.tar.gz
LICENSE="EPL-1.0"
SLOT="1.3"
KEYWORDS="amd64 ~x86 ~x86-linux"
KEYWORDS="amd64 x86 ~x86-linux"
IUSE=""
RDEPEND=">=virtual/jre-1.5"

@ -0,0 +1,287 @@
Fix install paths, respect user flags, build shared libs with -fPIC,
make static libs optional, convert use "--with/without-net2" instead
"--without-no-net2"
http://bugs.gentoo.org/268444
Thanks to Doktor Notor <notordoktor@gmail.com>
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,16 +1,18 @@
-INSTALL_INCLUDES_IN = /usr/include
-INSTALL_LIBRARY_IN = /usr/lib
-INSTALL_MANPAGE_IN = /usr/local/man
-
-# Compiler to produce C/C++ libraries with (autodetected)
-GCC = @CCAUTO@
-GPP = @CXAUTO@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+includedir = @includedir@
+mandir = @mandir@
+BUILD_STATIC = @BUILD_STATIC@
RANLIB = @RANLIB@
AR = @AR@
INSTALL = @INSTALL@
CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
+LDFLAGS = @LDFLAGS@
+CCOPTS = @CCOPTS@
CLIB = @CLIB@
AESOBJ = aes/aes.o aes/cast-256.o aes/mars.o aes/saferp.o aes/twofish.o aes/rijndael.o aes/md5.o
@@ -21,120 +19,80 @@
NETOBJPP = net/net++.o net/net2++.o
MISCOBJPP = misc/misc++.o misc/exclude++.o
-all: libmix.a libmix.so libmix++.a libmix++.so
+OBJS_C = $(AESOBJ) $(NETOBJ) $(MISCOBJ)
+OBJS_PP = $(AESOBJPP) $(NETOBJPP) $(MISCOBJPP)
+
+OBJS_C_A = $(OBJS_C:%.o=%.lo)
+OBJS_PP_A = $(OBJS_PP:%.o=%.lo)
+
+TARGETS = libmix.so libmix++.so
+ifdef BUILD_STATIC
+TARGETS += libmix.a libmix++.a
+endif
+
+all: $(TARGETS)
@echo ""
@echo Check the install location in the Makefile, and type 'make install'.
@echo You may also want to run './libtest' to see all functions work reliably.
@echo "Attention: libmix for C++ is now called libmix++[.so|.a]. The original libmix.[so|.a] name will be a plain C library."
@echo ""
-libmix.so: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
- ${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${CLIB}
+libmix.so: $(OBJS_C)
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@ -Wl,-soname,$@ $(CLIB)
-libmix.a: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
- ${AR} -cr libmix.a ${AESOBJ} ${NETOBJ} ${MISCOBJ}
- ${RANLIB} libmix.a
+libmix.a: $(OBJS_C_A)
+ $(AR) -cr $@ $^
+ $(RANLIB) $@
-libmix++.so: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
- ${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so ${CLIB}
+libmix++.so: $(OBJS_PP)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@ -Wl,-soname,$@ $(CLIB)
-libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
- ${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
- ${RANLIB} libmix++.a
+libmix++.a: $(OBJS_PP_A)
+ $(AR) -cr $@ $^
+ $(RANLIB) $@
libtest: libtest.o
- ${GPP} ${CFLAGS} -static -I. -L. libtest++.o -o libtest -lmix++ @LIBS@ ${CLIB}
+ $(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. $^ -o $@ -lmix++ $(CLIB)
libtest.o:
- ${GPP} ${CFLAGS} -c libtest.c -o libtest.o
- ${GPP} ${CFLAGS} -c libtest.c -o libtest++.o
-
-aes/aes++.o:
- ${GPP} ${CFLAGS} -c aes/aes.c -o aes/aes++.o
-
-aes/cast-256++.o:
- ${GPP} ${CFLAGS} -c aes/cast-256.c -o aes/cast-256++.o
-
-aes/mars++.o:
- ${GPP} ${CFLAGS} -c aes/mars.c -o aes/mars++.o
-
-aes/saferp++.o:
- ${GPP} ${CFLAGS} -c aes/saferp.c -o aes/saferp++.o
-
-aes/twofish++.o:
- ${GPP} ${CFLAGS} -c aes/twofish.c -o aes/twofish++.o
-
-aes/rijndael++.o:
- ${GPP} ${CFLAGS} -c aes/rijndael.c -o aes/rijndael++.o
-
-aes/md5++.o:
- ${GPP} ${CFLAGS} -c aes/md5.c -o aes/md5++.o
-
-net/net++.o:
- ${GPP} ${CFLAGS} -c net/net.c -o net/net++.o
-
-net/net2++.o:
- ${GPP} ${CFLAGS} -c net/net2.c -o net/net2++.o
-
-misc/misc++.o:
- ${GPP} ${CFLAGS} -c misc/misc.c -o misc/misc++.o
-
-misc/exclude++.o:
- ${GPP} ${CFLAGS} -c misc/exclude.c -o misc/exclude++.o
-
-aes/aes.o:
- ${GCC} ${CFLAGS} -c aes/aes.c -o aes/aes.o
-
-aes/cast-256.o:
- ${GCC} ${CFLAGS} -c aes/cast-256.c -o aes/cast-256.o
-
-aes/mars.o:
- ${GCC} ${CFLAGS} -c aes/mars.c -o aes/mars.o
-
-aes/saferp.o:
- ${GCC} ${CFLAGS} -c aes/saferp.c -o aes/saferp.o
-
-aes/twofish.o:
- ${GCC} ${CFLAGS} -c aes/twofish.c -o aes/twofish.o
-
-aes/rijndael.o:
- ${GCC} ${CFLAGS} -c aes/rijndael.c -o aes/rijndael.o
-
-aes/md5.o:
- ${GCC} ${CFLAGS} -c aes/md5.c -o aes/md5.o
-
-net/net.o:
- ${GCC} ${CFLAGS} -c net/net.c -o net/net.o
-
-net/net2.o:
- ${GCC} ${CFLAGS} -c net/net2.c -o net/net2.o
+ $(CC) $(CCOPTS) $(CFLAGS) -c libtest.c -o libtest.o
+ $(CXX) $(CCOPTS) $(CXXFLAGS) -c libtest.c -o libtest++.o
-misc/misc.o:
- ${GCC} ${CFLAGS} -c misc/misc.c -o misc/misc.o
-misc/exclude.o:
- ${GCC} ${CFLAGS} -c misc/exclude.c -o misc/exclude.o
+%++.o: %.c
+ $(CXX) $(CCOPTS) $(CXXFLAGS) -fPIC -c $< -o $@
-install: mix/mix.h mix/net.h mix/aes.h mix/misc.h libmix.so libmix.a
- ${INSTALL} -d ${INSTALL_INCLUDES_IN}/mix/
- ${INSTALL} -d ${INSTALL_LIBRARY_IN}/
- ${INSTALL} -d ${INSTALL_MANPAGE_IN}/man3/
- ${INSTALL} -m 0644 libmix.3 ${INSTALL_MANPAGE_IN}/man3/libmix.3
- ${INSTALL} -m 0644 mix/misc.h ${INSTALL_INCLUDES_IN}/mix/misc.h
- ${INSTALL} -m 0644 mix/net.h ${INSTALL_INCLUDES_IN}/mix/net.h
- ${INSTALL} -m 0644 mix/aes.h ${INSTALL_INCLUDES_IN}/mix/aes.h
- ${INSTALL} -m 0644 mix/mix.h ${INSTALL_INCLUDES_IN}/mix/mix.h
- ${INSTALL} -m 0644 mix/lmconfig.h ${INSTALL_INCLUDES_IN}/mix/lmconfig.h
- ${INSTALL} -m 0755 libmix.so ${INSTALL_LIBRARY_IN}/libmix.so
- ${INSTALL} -m 0755 libmix.a ${INSTALL_LIBRARY_IN}/libmix.a
- ${INSTALL} -m 0755 libmix++.so ${INSTALL_LIBRARY_IN}/libmix++.so
- ${INSTALL} -m 0755 libmix++.a ${INSTALL_LIBRARY_IN}/libmix++.a
+%++.lo: %.c
+ $(CXX) $(CCOPTS) $(CXXFLAGS) -c $< -o $@
+
+%.o: %.c
+ $(CC) $(CCOPTS) $(CFLAGS) -fPIC -c $< -o $@
+
+%.lo: %.c
+ $(CC) $(CCOPTS) $(CFLAGS) -c $< -o $@
+
+install: mix/mix.h mix/net.h mix/aes.h mix/misc.h $(TARGETS)
+ ${INSTALL} -d $(DESTDIR)/$(includedir)/mix/
+ ${INSTALL} -d $(DESTDIR)/$(libdir)/
+ ${INSTALL} -d $(DESTDIR)/$(mandir)/man3/
+ ${INSTALL} -m 0644 libmix.3 $(DESTDIR)/$(mandir)/man3/libmix.3
+ ${INSTALL} -m 0644 mix/misc.h $(DESTDIR)/$(includedir)/mix/misc.h
+ ${INSTALL} -m 0644 mix/net.h $(DESTDIR)/$(includedir)/mix/net.h
+ ${INSTALL} -m 0644 mix/aes.h $(DESTDIR)/$(includedir)/mix/aes.h
+ ${INSTALL} -m 0644 mix/mix.h $(DESTDIR)/$(includedir)/mix/mix.h
+ ${INSTALL} -m 0644 mix/lmconfig.h $(DESTDIR)/$(includedir)/mix/lmconfig.h
+ ${INSTALL} -m 0755 libmix.so $(DESTDIR)/$(libdir)/libmix.so
+ ${INSTALL} -m 0755 libmix++.so $(DESTDIR)/$(libdir)/libmix++.so
+ifdef BUILD_STATIC
+ ${INSTALL} -m 0755 libmix.a $(DESTDIR)/$(libdir)/libmix.a
+ ${INSTALL} -m 0755 libmix++.a $(DESTDIR)/$(libdir)/libmix++.a
+endif
@echo ""
@echo "Installation complete."
@echo ""
uninstall:
- rm -fr /usr/include/mix /usr/lib/libmix* /usr/local/man/man3/libmix.3
+ rm -fr $(includedir)/mix $(libdir)/libmix* $(mandir)/man3/libmix.3
cleanobj:
rm -f ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} ${AESOBJ} ${NETOBJ} ${MISCOBJ} */core */*~ core *~ *.o libtest
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,6 @@
AC_CONFIG_HEADER(mix/lmconfig.h)
compileas="0"
-net2="1"
dnl AC_ARG_WITH(libraries-as-c,
dnl [ --with-libraries-as-c Generate LibMix binaries with GCC ],
@@ -24,30 +23,33 @@
dnl ]
dnl )
-AC_ARG_WITH(no-net2,
- [ --with-no-net2 Don't use net2 functions, don't require libnet/libpcap.],
- [
- if test "x$withval" != "$xno" ; then
- net2="0"
- fi
- ]
-)
+AC_ARG_WITH([net2],
+ AS_HELP_STRING([--with-net2], [Use net2 functions from libnet/libpcap.]))
+AS_IF([test "x$with_net2" = "xyes"], [
+ AC_DEFINE(LM_USE_NET2)
+ CLIB="-lnet-1.0 -lpcap"
+], [CLIB=""])
+
+AC_ARG_ENABLE([static],
+ AS_HELP_STRING([--enable-static], [Build static libs]))
+AS_IF([test "x$enable_static" = "xyes"], [
+ BUILD_STATIC=1
+ AC_SUBST(BUILD_STATIC)
+])
AC_PROG_CC
AC_MSG_CHECKING(accepted compiler flags)
if test $ac_cv_prog_gcc = yes; then
- CCOPTS='-I. -Wall -O3 -funroll-loops -ansi -D_LIBMIX_'
+ CCOPTS='-I. -Wall -ansi -D_LIBMIX_'
AC_MSG_RESULT(GNU CC/ANSI (good))
else
CCOPTS='-I. -D_LIBMIX_'
AC_MSG_RESULT(crappy :P)
fi
- CFLAGS="$CCOPTS"
AC_PROG_CXX
CXAUTO="null"
-CLIB=""
CCAUTO=$CC
CXAUTO=$CXX
@@ -60,10 +62,6 @@
dnl CXAUTO=$CXX
dnl fi
-if test $net2 = "1"; then
- AC_DEFINE(LM_USE_NET2)
- CLIB="-lnet -lpcap"
-fi
if test $CXAUTO = "null"; then
AC_MSG_ERROR( *** Please use either ./configure --with-libraries-as-c
@@ -74,6 +72,11 @@
AC_SUBST(CXAUTO)
AC_SUBST(AR)
AC_SUBST(CLIB)
+AC_SUBST(LDFLAGS)
+AC_SUBST(libdir)
+AC_SUBST(mandir)
+AC_SUBST(includedir)
+AC_SUBST(CCOPTS)
AC_CHECK_PROGS(AR, ar, @true)
AC_PROG_RANLIB
AC_PROG_INSTALL

@ -0,0 +1,44 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r6.ebuild,v 1.1 2011/11/17 21:08:07 vapier Exp $
EAPI="2"
inherit autotools base multilib toolchain-funcs
DESCRIPTION="Programs Crypto/Network/Multipurpose Library"
HOMEPAGE="http://mixter.void.ru/"
SRC_URI="http://mixter.void.ru/${P/.}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="static-libs"
#IUSE="net2 static-libs"
#DEPEND="net2? ( net-libs/libpcap net-libs/libnet:1.0 )"
#RDEPEND="${DEPEND}"
S=${WORKDIR}/${PN}-v${PV}
PATCHES=(
"${FILESDIR}"/${P}-fix-pattern.patch
"${FILESDIR}"/${P}-gentoo-r1.patch
"${FILESDIR}"/${P}-libnet.patch
)
DOCS=( CHANGES )
src_prepare() {
base_src_prepare
eautoreconf
}
# net-libs/libnet doesn't provide shared libs, cannot be used currently
src_configure() {
tc-export CC CXX
econf \
$(use_enable static-libs static) \
--without-net2
# $(use_with net2)
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r7.ebuild,v 1.7 2011/11/15 22:12:22 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r7.ebuild,v 1.8 2011/11/17 18:54:48 phajdan.jr Exp $
EAPI="3"
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/libusb/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc +cxx static-libs"
RESTRICT="test"

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/papyon/papyon-0.5.6.ebuild,v 1.2 2011/11/17 09:33:47 chainsaw Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/papyon/papyon-0.5.6.ebuild,v 1.3 2011/11/17 18:51:22 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=dev-python/pygobject-2.10:2

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.8-r1.ebuild,v 1.1 2011/10/31 20:01:46 maksbotan Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.8-r1.ebuild,v 1.2 2011/11/17 17:09:43 pva Exp $
EAPI="3"
@ -10,7 +10,7 @@ RESTRICT_PYTHON_ABIS="3.*"
inherit distutils eutils
DESCRIPTION="Python bindings for Network Security Services (NSS)"
HOMEPAGE="http://people.redhat.com/jdennis/python-nss/doc/api/html"
HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.lzma"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.8.ebuild,v 1.1 2011/10/30 17:00:05 maksbotan Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.8.ebuild,v 1.2 2011/11/17 17:09:43 pva Exp $
EAPI="3"
@ -10,7 +10,7 @@ RESTRICT_PYTHON_ABIS="3.*"
inherit distutils eutils
DESCRIPTION="Python bindings for Network Security Services (NSS)"
HOMEPAGE="http://people.redhat.com/jdennis/python-nss/doc/api/html"
HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.lzma"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"

@ -17,6 +17,7 @@ DIST git-1.7.7.2.tar.gz 3483993 RMD160 e1b2bdcf6ff7e206a346f09e7af02250f6e0fc7e
DIST git-1.7.7.3.tar.gz 3484344 RMD160 638f21de4b834d64788413261ee572264f942f33 SHA1 382ee40da74a1b4a1875820c0f0a35c9ccd750f8 SHA256 dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100
DIST git-1.7.7.tar.gz 3475448 RMD160 54a185d66fb1f0e1607dc4514640c4b353d2cd1c SHA1 bbf85bd767ca6b7e9caa1489bb4ba7ec64e0ab35 SHA256 5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6
DIST git-1.7.8.rc1.tar.gz 3536204 RMD160 de0c196a5e010954b35b717a6a3512f5674879c6 SHA1 f35e5c4410b21710434cb591f4c89843e75bb793 SHA256 f5ae0ce19d345e1e2680941bfd0404968a649ecdb02c8fce1211283d95a0236b
DIST git-1.7.8.rc3.tar.gz 3536531 RMD160 64732aa30b2cb8f0e74a8bffcb1df5427a528d0c SHA1 cc142fe293e289e473cd7259c695bb6a4c520fa8 SHA256 155c4ea79cc85376fbccfe968bccfcc6762c32c7ccf4030de6ee5d1d6e99255e
DIST git-htmldocs-1.6.4.5.tar.bz2 772113 RMD160 64b3f689385334d9b101b4bb8647f0fed14bd1fc SHA1 4ac2ede0a3ed82dea9107ff5e4a4948b60282f49 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2
DIST git-htmldocs-1.7.2.5.tar.bz2 919247 RMD160 8ff6503efdb3cfaa639d2acbfaf76dad274aeb8f SHA1 b99f4e9eb620918b68fd98a4a0f0686832799477 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337
DIST git-htmldocs-1.7.3.4.tar.bz2 929858 RMD160 4183ff0e61885323371b11dfb119bcc718e46a34 SHA1 17cbfcb9b85352777ace4b787e8ff48b6aeee6ab SHA256 24f03bcd6b5c3745c2395cf49260cdbf7fe80292883b0b4da3e1ac636aee6fba
@ -36,6 +37,7 @@ DIST git-htmldocs-1.7.7.2.tar.gz 1634159 RMD160 66e5a7816ce0660b93edd3d2c3f441eb
DIST git-htmldocs-1.7.7.3.tar.gz 1660184 RMD160 b3c7e10545bcf896e7294ee4f8c7dcd2c2fb35f4 SHA1 bc0f89cb04e562e4a6d3b936382dbc8f593d861f SHA256 b84992ea9d2dad0ddc643a87f5c463342acd0f9475ecfd082ac5f61b00294dc0
DIST git-htmldocs-1.7.7.tar.gz 1391354 RMD160 7e0fb2f27053d97d4945eb2e41080e7f9b31f8e8 SHA1 33183db94fd25e001bd8a9fd6696b992f61e28d8 SHA256 bcb11eda56ac74687cc6852f6ee104ab5dcf13039546616c608783cebc7f4a40
DIST git-htmldocs-1.7.8.rc1.tar.gz 1694277 RMD160 c5bf09b2d2614df0c018cfb7a36a415a4e8a0598 SHA1 72e27cd397f5ae7b3c9d8bb030a76d7c99cdbb50 SHA256 c841cb7f0238742a99e4e09bb6192c2d27763473383ee145bb4f3067937954d9
DIST git-htmldocs-1.7.8.rc3.tar.gz 1694634 RMD160 dcf2643db1112954d2ce6d54060e38cf7c1101ff SHA1 9261e59da9da8027204bf45d84a0dd15041ba45d SHA256 f42e5de872d9020d8dde3decc8c6cdd6a73759a15ecbd9c29b5466b85b950501
DIST git-manpages-1.6.4.5.tar.bz2 254368 RMD160 7731d81631ec2c8c33ddc028667eaad79926754b SHA1 905d5e66db1b22b48c1b001d1f5dec830a75dde1 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447
DIST git-manpages-1.7.2.5.tar.bz2 289543 RMD160 b921fa2b5ec47e091987d1122b1c189b4bd87f3b SHA1 735ee1f23428404bdb99d9b0bd1cbb79c9e7afce SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e
DIST git-manpages-1.7.3.4.tar.bz2 294381 RMD160 dfd4a4757077290a666ad974585677888f909890 SHA1 c4f93ed1d9892af1174d63743dc578835a6183f1 SHA256 2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75
@ -55,3 +57,4 @@ DIST git-manpages-1.7.7.2.tar.gz 474637 RMD160 dd5b397967c20702922c01d145d36ea04
DIST git-manpages-1.7.7.3.tar.gz 475209 RMD160 99ea33e5d21d8daae28c23a9850016bc5e3975a8 SHA1 cf1b0d35e2d242bc4cffce3b2bf5b3e32857b395 SHA256 62bec01d704d3495fcf66a3b97a8fb7c337a06202784fa7a7fa510360e79671f
DIST git-manpages-1.7.7.tar.gz 476036 RMD160 4bc0504533df3c956e9ad5133e6bd8bfca980007 SHA1 75d3cceb46f7a46eeb825033dff76af5eb5ea3d9 SHA256 dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb
DIST git-manpages-1.7.8.rc1.tar.gz 497264 RMD160 a0da361fafc53fdccb12d6d8586657efc5eba3fe SHA1 95429858e879df3f9425cf1279e03cdec7832379 SHA256 20f63b8b0be15be013dd762fd86a832245ce0363b1ee785f0490b22dc62a8ab5
DIST git-manpages-1.7.8.rc3.tar.gz 497231 RMD160 83daa401572f75c0dc0bd1e873007cebe3016b8e SHA1 d01b5cc48ab5e5a3eea7aa8fd575b4943e36a78d SHA256 e53c566f4a57501565df02fc7c75ad57ef347a059e58c7d04a66f904f8e6399e

@ -0,0 +1,527 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8_rc3.ebuild,v 1.1 2011/11/17 22:28:24 robbat2 Exp $
EAPI=4
GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_DEPEND="python? 2"
[[ ${PV} == *9999 ]] && SCM="git-2"
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
MY_PV="${PV/_rc/.rc}"
MY_P="${PN}-${MY_PV}"
DOC_VER=${MY_PV}
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
HOMEPAGE="http://www.git-scm.com/"
if [[ ${PV} != *9999 ]]; then
SRC_URI_SUFFIX="gz"
SRC_URI_GOOG="http://git-core.googlecode.com/files"
SRC_URI_KORG="mirror://kernel/software/scm/git"
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
doc? (
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
SRC_URI=""
KEYWORDS=""
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
# Common to both DEPEND and RDEPEND
CDEPEND="
!blksha1? ( dev-libs/openssl )
sys-libs/zlib
perl? ( dev-lang/perl[-build] dev-libs/libpcre )
tk? ( dev-lang/tk )
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )"
RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
cgi? ( virtual/perl-CGI )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
python? ( gtk?
(
>=dev-python/pygtk-2.8
dev-python/pygtksourceview:2
) )"
# This is how info docs are created with Git:
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
# .xml/docbook --(docbook2texi.pl)--> .texi
# .texi --(makeinfo)---------> .info
DEPEND="${CDEPEND}
app-arch/cpio
doc? (
app-text/asciidoc
app-text/docbook2X
sys-apps/texinfo
)"
# Live ebuild builds man pages and HTML docs, additionally
if [[ ${PV} == *9999 ]]; then
DEPEND="${DEPEND}
app-text/asciidoc
app-text/xmlto"
fi
SITEFILE=50${PN}-gentoo.el
S="${WORKDIR}/${MY_P}"
REQUIRED_USE="
cgi? ( perl )
cvs? ( perl )
subversion? ( perl )
webdav? ( curl )
"
pkg_setup() {
if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
ewarn "have been warned."
fi
if use python ; then
python_set_active_version 2
python_pkg_setup
fi
}
# This is needed because for some obscure reasons future calls to make don't
# pick up these exports if we export them in src_unpack()
exportmakeopts() {
local myopts
if use blksha1 ; then
myopts="${myopts} BLK_SHA1=YesPlease"
elif use ppcsha1 ; then
myopts="${myopts} PPC_SHA1=YesPlease"
fi
if use curl ; then
use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
else
myopts="${myopts} NO_CURL=YesPlease"
fi
# broken assumptions, because of broken build system ...
myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
myopts="${myopts} INSTALL=install TAR=tar"
myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
myopts="${myopts} SANE_TOOL_PATH="
myopts="${myopts} OLD_ICONV="
myopts="${myopts} NO_EXTERNAL_GREP="
# can't define this to null, since the entire makefile depends on it
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
use iconv \
|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
# || myopts="${myopts} NO_ICONV=YesPlease"
# because, above, we need to do this unconditionally (no "&& use iconv")
use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
use tk \
|| myopts="${myopts} NO_TCLTK=YesPlease"
use perl \
&& myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
|| myopts="${myopts} NO_PERL=YesPlease"
use python \
|| myopts="${myopts} NO_PYTHON=YesPlease"
use subversion \
|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
use threads \
&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
use cvs \
|| myopts="${myopts} NO_CVS=YesPlease"
# Disabled until ~m68k-mint can be keyworded again
# if [[ ${CHOST} == *-mint* ]] ; then
# myopts="${myopts} NO_MMAP=YesPlease"
# myopts="${myopts} NO_IPV6=YesPlease"
# myopts="${myopts} NO_STRLCPY=YesPlease"
# myopts="${myopts} NO_MEMMEM=YesPlease"
# myopts="${myopts} NO_MKDTEMP=YesPlease"
# myopts="${myopts} NO_MKSTEMPS=YesPlease"
# fi
if [[ ${CHOST} == ia64-*-hpux* ]]; then
myopts="${myopts} NO_NSEC=YesPlease"
fi
if [[ ${CHOST} == *-*-aix* ]]; then
myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
fi
has_version '>=app-text/asciidoc-8.0' \
&& myopts="${myopts} ASCIIDOC8=YesPlease"
myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
# Bug 290465:
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
[[ "${CHOST}" == *-uclibc* ]] && \
myopts="${myopts} NO_NSEC=YesPlease"
export MY_MAKEOPTS="${myopts}"
}
src_unpack() {
if [[ ${PV} != *9999 ]]; then
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
cd "${S}"
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
use doc && \
cd "${S}"/Documentation && \
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
cd "${S}"
else
git-2_src_unpack
cd "${S}"
#cp "${FILESDIR}"/GIT-VERSION-GEN .
fi
}
src_prepare() {
# Noperl is being merged to upstream as of 2009/04/05
#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
# GetOpt-Long v2.38 is strict
# Merged in 1.6.3 final 2009/05/07
#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
# JS install fixup
# Merged in 1.7.5.x
#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
# USE=-iconv causes segfaults, fixed post 1.7.1
# Gentoo bug #321895
#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
# Fix false positives with t3404 due to SHELL=/bin/false for the portage
# user.
# Merged upstream
#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
# bug #350075: t9001: fix missing prereq on some tests
# Merged upstream
#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
# bug #350330 - automagic CVS when we don't want it is bad.
epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
sed -i \
-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-e 's:^\(CC = \).*$:\1$(OPTCC):' \
-e 's:^\(AR = \).*$:\1$(OPTAR):' \
-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
Makefile || die "sed failed"
# Never install the private copy of Error.pm (bug #296310)
sed -i \
-e '/private-Error.pm/s,^,#,' \
perl/Makefile.PL
# Fix docbook2texi command
sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
Documentation/Makefile || die "sed failed"
# bug #318289
# Merged upstream
#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
# merged upstream
#epatch "${FILESDIR}"/git-1.7.5-interix.patch
# merged upstream
#epatch "${FILESDIR}"/git-1.7.6-interix.patch
}
git_emake() {
# bug #326625: PERL_PATH, PERL_MM_OPT
# bug #320647: PYTHON_PATH
PYTHON_PATH=""
use python && PYTHON_PATH="$(PYTHON -a)"
emake ${MY_MAKEOPTS} \
DESTDIR="${D}" \
OPTCFLAGS="${CFLAGS}" \
OPTLDFLAGS="${LDFLAGS}" \
OPTCC="$(tc-getCC)" \
OPTAR="$(tc-getAR)" \
prefix="${EPREFIX}"/usr \
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
sysconfdir="${EPREFIX}"/etc \
PYTHON_PATH="${PYTHON_PATH}" \
PERL_MM_OPT="" \
GIT_TEST_OPTS="--no-color" \
"$@"
# This is the fix for bug #326625, but it also causes breakage, see bug
# #352693.
# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
}
src_configure() {
exportmakeopts
}
src_compile() {
git_emake || die "emake failed"
if use emacs ; then
elisp-compile contrib/emacs/git{,-blame}.el \
|| die "emacs modules failed"
fi
if use perl && use cgi ; then
git_emake \
gitweb/gitweb.cgi \
|| die "emake gitweb/gitweb.cgi failed"
fi
cd "${S}"/Documentation
if [[ ${PV} == *9999 ]] ; then
git_emake man \
|| die "emake man failed"
if use doc ; then
git_emake info html \
|| die "emake info html failed"
fi
else
if use doc ; then
git_emake info \
|| die "emake info html failed"
fi
fi
}
src_install() {
git_emake \
install || \
die "make install failed"
# Depending on the tarball and manual rebuild of the documentation, the
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
use doc && dodir /usr/share/doc/${PF}/html
for d in / /howto/ /technical/ ; do
docinto ${d}
dodoc Documentation${d}*.txt
use doc && dohtml -p ${d} Documentation${d}*.html
done
docinto /
# Upstream does not ship this pre-built :-(
use doc && doinfo Documentation/{git,gitman}.info
newbashcomp contrib/completion/git-completion.bash ${PN}
if use emacs ; then
elisp-install ${PN} contrib/emacs/git.{el,elc} || die
elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
# don't add automatically to the load-path, so the sitefile
# can do a conditional loading
touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
fi
if use python && use gtk ; then
dobin "${S}"/contrib/gitview/gitview
python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
dodoc "${S}"/contrib/gitview/gitview.txt
fi
dobin contrib/fast-import/git-p4
dodoc contrib/fast-import/git-p4.txt
newbin contrib/fast-import/import-tars.perl import-tars
newbin contrib/git-resurrect.sh git-resurrect
dodir /usr/share/${PN}/contrib
# The following are excluded:
# completion - installed above
# emacs - installed above
# examples - these are stuff that is not used in Git anymore actually
# gitview - installed above
# p4import - excluded because fast-import has a better one
# patches - stuff the Git guys made to go upstream to other places
# svnimport - use git-svn
# thunderbird-patch-inline - fixes thunderbird
for i in \
blameview buildsystems ciabot continuous convert-objects fast-import \
hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
stats svn-fe vim workdir \
; do
cp -rf \
"${S}"/contrib/${i} \
"${ED}"/usr/share/${PN}/contrib \
|| die "Failed contrib ${i}"
done
if use perl && use cgi ; then
# We used to install in /usr/share/${PN}/gitweb
# but upstream installs in /usr/share/gitweb
# so we will install a symlink and use their location for compat with other
# distros
dosym /usr/share/gitweb /usr/share/${PN}/gitweb
# INSTALL discusses configuration issues, not just installation
docinto /
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
newdoc "${S}"/gitweb/README README.gitweb
find "${ED}"/usr/lib64/perl5/ \
-name .packlist \
-exec rm \{\} \;
else
rm -rf "${ED}"/usr/share/gitweb
fi
if ! use subversion ; then
rm -f "${ED}"/usr/libexec/git-core/git-svn \
"${ED}"/usr/share/man/man1/git-svn.1*
fi
if use xinetd ; then
insinto /etc/xinetd.d
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
fi
newinitd "${FILESDIR}"/git-daemon.initd git-daemon
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
fixlocalpod
}
src_test() {
local disabled=""
local tests_cvs="t9200-git-cvsexportcommit.sh \
t9400-git-cvsserver-server.sh \
t9401-git-cvsserver-crlf.sh \
t9600-cvsimport.sh \
t9601-cvsimport-vendor-branch.sh \
t9602-cvsimport-branches-tags.sh \
t9603-cvsimport-patchsets.sh"
local tests_perl="t5502-quickfetch.sh \
t5512-ls-remote.sh \
t5520-pull.sh"
# Bug #225601 - t0004 is not suitable for root perm
# Bug #219839 - t1004 is not suitable for root perm
# t0001-init.sh - check for init notices EPERM* fails
local tests_nonroot="t0001-init.sh \
t0004-unwritable.sh \
t0070-fundamental.sh \
t1004-read-tree-m-u-wf.sh \
t3700-add.sh \
t7300-clean.sh"
# Unzip is used only for the testcase code, not by any normal parts of Git.
if ! has_version app-arch/unzip ; then
einfo "Disabling tar-tree tests"
disabled="${disabled} t5000-tar-tree.sh"
fi
cvs=0
use cvs && let cvs=$cvs+1
if [[ ${EUID} -eq 0 ]]; then
if [[ $cvs -eq 1 ]]; then
ewarn "Skipping CVS tests because CVS does not work as root!"
ewarn "You should retest with FEATURES=userpriv!"
disabled="${disabled} ${tests_cvs}"
fi
einfo "Skipping other tests that require being non-root"
disabled="${disabled} ${tests_nonroot}"
else
[[ $cvs -gt 0 ]] && \
has_version dev-vcs/cvs && \
let cvs=$cvs+1
[[ $cvs -gt 1 ]] && \
built_with_use dev-vcs/cvs server && \
let cvs=$cvs+1
if [[ $cvs -lt 3 ]]; then
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
disabled="${disabled} ${tests_cvs}"
fi
fi
if ! use perl ; then
einfo "Disabling tests that need Perl"
disabled="${disabled} ${tests_perl}"
fi
# Reset all previously disabled tests
cd "${S}/t"
for i in *.sh.DISABLED ; do
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
done
einfo "Disabled tests:"
for i in ${disabled} ; do
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
done
# Avoid the test system removing the results because we want them ourselves
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-i "${S}"/t/Makefile
# Clean old results first
cd "${S}/t"
git_emake clean
# Now run the tests
cd "${S}"
einfo "Start test run"
git_emake test
rc=$?
# Display nice results
cd "${S}/t"
git_emake aggregate-results
# And exit
[ $rc -eq 0 ] || die "tests failed. Please file a bug."
}
showpkgdeps() {
local pkg=$1
shift
elog " $(printf "%-17s:" ${pkg}) ${@}"
}
pkg_postinst() {
use emacs && elisp-site-regen
use python && python_mod_optimize git_remote_helpers
einfo "Please read /usr/share/bash-completion/git for Git bash completion"
elog "These additional scripts need some dependencies:"
echo
showpkgdeps git-quiltimport "dev-util/quilt"
showpkgdeps git-instaweb \
"|| ( www-servers/lighttpd www-servers/apache )"
echo
}
pkg_postrm() {
use emacs && elisp-site-regen
use python && python_mod_cleanup git_remote_helpers
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.1 2011/02/10 21:35:46 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.2 2011/11/17 18:44:15 phajdan.jr Exp $
EAPI="2"
@ -16,7 +16,7 @@ HOMEPAGE="http://rapidsvn.tigris.org/"
SRC_URI="http://www.rapidsvn.org/download/release/${MY_PV}/${P}-${MY_REL}.tar.gz"
LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="doc"
COMMON_DEP=">=dev-vcs/subversion-1.5.0

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-5.2.ebuild,v 1.3 2011/11/15 09:54:59 chainsaw Exp $
# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-5.2.ebuild,v 1.4 2011/11/17 18:46:42 phajdan.jr Exp $
EAPI=2
inherit eutils games
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~x86"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND="media-libs/allegro:0[X]"

@ -3,7 +3,7 @@
<pkgmetadata>
<herd>games</herd>
<maintainer>
<email>nyhm@gentoo.org</email>
<email>tristan@gentoo.org</email>
<name>Tristan Heaven</name>
</maintainer>
</pkgmetadata>

@ -1 +0,0 @@
DIST cervi-0.0.3.tar.bz2 21699 RMD160 f28364318da43cbc2cc66ab127e2dd11f7d0fac4 SHA1 b426b5720e6d1c8cca373f4ac36cf17957fa3fc8 SHA256 947411f0139d292454ec4521565dfe31f3f0c5e12f62eb4f4a74075a9fb86556

@ -1,48 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-arcade/cervi/cervi-0.0.3.ebuild,v 1.8 2009/01/18 19:58:12 tupone Exp $
inherit eutils toolchain-funcs games
DESCRIPTION="A multiplayer game where players drive a worm and try not to collide with anything"
SRC_URI="http://tomi.nomi.cz/download/${P}.tar.bz2"
HOMEPAGE="http://tomi.nomi.cz/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="ppc x86"
IUSE=""
DEPEND="=x11-libs/gtk+-1.2*
media-sound/esound
media-sound/timidity++"
S=${WORKDIR}/${PN}
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-gcc43.patch
sed -i \
-e "/^CFLAGS/ s:-Wall:${CFLAGS}:" \
-e "/^CXXFLAGS/ s:-Wall:${CXXFLAGS}:" Makefile \
|| die "sed Makefile failed"
}
src_compile() {
emake \
CXX=$(tc-getCXX) \
bindir="${GAMES_BINDIR}" \
datadir="${GAMES_DATADIR}/${PN}" \
|| die "emake failed"
}
src_install() {
dodir "${GAMES_BINDIR}" || die "dodir failed"
emake \
bindir="${D}/${GAMES_BINDIR}" \
datadir="${D}/${GAMES_DATADIR}/${PN}" install \
|| die "emake install failed"
dodoc AUTHORS changelog README
prepgamesdirs
}

@ -1,10 +0,0 @@
--- game.cc.old 2009-01-18 20:27:15.000000000 +0100
+++ game.cc 2009-01-18 20:27:52.000000000 +0100
@@ -10,6 +10,7 @@
#include <iostream>
#include <cmath>
+#include <cstdlib>
#include <gdk/gdkkeysyms.h>
#include "game.h"
#include "music.h"

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1,3 +0,0 @@
DIST StepMania-3.9-linux.tar.gz 10174400 RMD160 426b11d652669be85753161f2cd03f2fe81df860 SHA1 100b1a2771fec1d208798ef03ba164259a589bf2 SHA256 ccb6e549e8d026e79de7d6bbfadc7f1ac7f7c05242a90edf56cf652f5ddeaae0
DIST StepMania-3.9-src.tar.gz 3090223 RMD160 e7451192fe67f53a7a93baf99bf9a20bc3d1f7cf SHA1 b2d2c3a50c23506844ba7e22289e59d270bb8b2e SHA256 31082d388fa64b9764aee4d7628f377bc0fe47b8f157b8bcc66d9e3678479c85
DIST stepmania-3.9-patches-6.tar.bz2 10577 RMD160 23ed35d8c25f3421bce3da0b3889cb917cb03fc4 SHA1 c39d3e747ecdb563117156d903313f897ec18cf2 SHA256 3ea399d5dd99f0285f9b0c88eb1c60802bd85617a8934bb9810ac8773b854264

@ -1,10 +0,0 @@
--- src/crypto51/cryptlib.h.old 2011-04-12 14:50:28.000000000 +0200
+++ src/crypto51/cryptlib.h 2011-04-12 14:55:34.000000000 +0200
@@ -297,6 +297,7 @@
class NullNameValuePairs : public NameValuePairs
{
public:
+ NullNameValuePairs() : NameValuePairs() {}
bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const {return false;}
};

@ -1,21 +0,0 @@
--- src/RageFileManager.cpp 2004-09-06 03:36:12.000000000 -0600
+++ src/RageFileManager.cpp 2005-05-15 00:22:41.000000000 -0600
@@ -154,7 +154,7 @@
* scores. It would need to handle permissions properly. */
/* RageFileManager::Mount( "dir", "/var/lib/games/stepmania", "Data/Profiles" ); */
- // CString Home = getenv( "HOME" ) + "/" + PRODUCT_NAME;
+ CString Home = ssprintf( "%s/%s", getenv( "HOME" ), PACKAGE );
/*
* Next: path to write general mutable user data. If the above path fails (eg.
@@ -181,7 +181,8 @@
if( Root == "" )
RageException::Throw( "Couldn't find \"Songs\"" );
- RageFileManager::Mount( "dir", Root, "" );
+ RageFileManager::Mount( "dir", Home, "" );
+ RageFileManager::Mount( "dir", "/usr/share/games/stepmania", "" );
#elif defined(_WINDOWS)
/* All Windows data goes in the directory one level above the executable. */
CHECKPOINT_M( ssprintf( "DOE \"%s\"", DirOfExecutable.c_str()) );

@ -1,38 +0,0 @@
--- src/RageSurface_Load_PNG.cpp.old 2005-10-01 05:32:44.000000000 +0200
+++ src/RageSurface_Load_PNG.cpp 2011-06-28 12:37:27.542730428 +0200
@@ -40,7 +40,7 @@
void RageFile_png_read( png_struct *png, png_byte *p, png_size_t size )
{
CHECKPOINT;
- RageFile *f = (RageFile *) png->io_ptr;
+ RageFile *f = (RageFile *) png_get_io_ptr(png);
int got = f->Read( p, size );
if( got == -1 )
@@ -66,7 +66,7 @@
void PNG_Error( png_struct *png, const char *error )
{
CHECKPOINT;
- error_info *info = (error_info *) png->error_ptr;
+ error_info *info = (error_info *) png_get_error_ptr(png);
strncpy( info->err, error, 1024 );
info->err[1023] = 0;
LOG->Trace( "loading \"%s\": err: %s", info->fn, info->err );
@@ -76,7 +76,7 @@
void PNG_Warning( png_struct *png, const char *warning )
{
CHECKPOINT;
- error_info *info = (error_info *) png->error_ptr;
+ error_info *info = (error_info *) png_get_error_ptr(png);
LOG->Trace( "loading \"%s\": warning: %s", info->fn, warning );
}
@@ -139,7 +139,7 @@
/* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
if( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 )
- png_set_gray_1_2_4_to_8( png );
+ png_set_expand_gray_1_2_4_to_8( png );
/* These are set for type == PALETTE. */
RageSurfaceColor colors[256];

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
<use>
<flag name="force-oss">Force using OSS</flag>
</use>
</pkgmetadata>

@ -1,83 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9-r2.ebuild,v 1.7 2011/06/28 12:12:00 tupone Exp $
EAPI=2
inherit autotools eutils games
MY_P=StepMania-${PV}
DESCRIPTION="An advanced DDR simulator"
HOMEPAGE="http://www.stepmania.com/stepmania/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz
mirror://sourceforge/${PN}/${MY_P}-linux.tar.gz
mirror://gentoo/${P}-patches-6.tar.bz2"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug ffmpeg force-oss gtk jpeg mad vorbis"
RESTRICT="test"
RDEPEND="gtk? ( x11-libs/gtk+:2 )
mad? ( media-libs/libmad )
>=dev-lang/lua-5
media-libs/libsdl[joystick,opengl]
jpeg? ( virtual/jpeg )
media-libs/libpng
ffmpeg? ( virtual/ffmpeg )
vorbis? ( media-libs/libvorbis )
virtual/opengl
virtual/glu"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
S=${WORKDIR}/${MY_P}-src
src_prepare() {
sed "s:/usr/share/games/${PN}:${GAMES_DATADIR}/${PN}:" \
"${FILESDIR}"/${P}-gentoo.patch > "${T}"/${P}.patch
EPATCH_SUFFIX=patch epatch "${T}"/${P}.patch "${WORKDIR}"/patches
epatch "${FILESDIR}"/${P}-gcc46.patch \
"${FILESDIR}"/${P}-libpng15.patch
eautoreconf
}
src_configure() {
econf \
--disable-dependency-tracking \
$(use_with debug) \
$(use_with jpeg) \
$(use_with vorbis) \
$(use_with mad mp3) \
$(use_enable gtk gtk2) \
$(use_enable force-oss)
}
src_install() {
local dir=${GAMES_DATADIR}/${PN}
exeinto "${dir}"
doexe src/stepmania || die "doexe failed"
if use gtk; then
doexe src/GtkModule.so || die "doexe failed"
fi
cd "${WORKDIR}"/${MY_P}
insinto "${dir}"
doins -r Announcers BGAnimations CDTitles Characters Courses Data Docs \
NoteSkins RandomMovies Songs Themes Visualizations || die "doins failed"
dodoc Copying.txt NEWS
dohtml README-FIRST.html
newicon "Themes/default/Graphics/Common window icon.png" ${PN}.png
make_desktop_entry ${PN} StepMania
games_make_wrapper ${PN} "${dir}"/${PN} "${dir}"
prepgamesdirs
}

@ -1 +0,0 @@
DIST dn9b0401.tgz 199963 RMD160 82201c3a2da113fa39edeb9ea675ddeceeec2bf3 SHA1 3158ae8bd53891c2d17989cbb9d03493f1511132 SHA256 630e52fe3f72c1352afff8eafd96f896dc026a2d775412c86afebc1c0aac4715

@ -1,70 +0,0 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/darcnes-0401-r2.ebuild,v 1.12 2007/07/02 17:07:42 nyhm Exp $
inherit eutils games
DESCRIPTION="A multi-system emulator"
HOMEPAGE="http://www.dridus.com/~nyef/darcnes/"
SRC_URI="http://www.dridus.com/~nyef/darcnes/download/dn9b${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-ppc x86"
IUSE="gtk svga X"
RDEPEND="svga? ( >=media-libs/svgalib-1.4.2 )
!svga? ( !gtk? ( x11-libs/libXaw ) )
X? ( x11-libs/libXaw )
gtk? ( =x11-libs/gtk+-1.2* )"
DEPEND="${RDEPEND}
!svga? ( x11-proto/xextproto )
X? ( x11-proto/xextproto )"
S=${WORKDIR}/${PN}
src_unpack() {
unpack ${A}
cd "${S}"
epatch \
"${FILESDIR}"/${P}-gcc34.patch \
"${FILESDIR}"/${P}-exec-stack.patch
# bug #75391
sed -i \
-e "s/buttons\[0\]/buttons\[\]/" ui.h \
|| die "sed failed"
}
src_compile() {
build_X=true
use svga && build_X=false
use gtk && build_X=false
use X && build_X=true
if use svga ; then
emake TARGET=Linux_svgalib OPTFLAGS="${CFLAGS}" \
|| die "compile target Linux_svgalib failed"
fi
if use gtk ; then
emake BINFILE=gdarcnes TARGET=Linux_GTK OPTFLAGS="${CFLAGS}" \
|| die "compile target Linux_GTK failed"
fi
if $build_X ; then
emake TARGET=Linux_X OPTFLAGS="${CFLAGS}" \
|| die "compile target Linux_X failed"
fi
}
src_install() {
if use svga ; then
dogamesbin sdarcnes || die "dogamesbin failed (svga)"
fi
if use gtk ; then
dogamesbin gdarcnes || die "dogamesbin failed (gtk)"
fi
if $build_X ; then
dogamesbin darcnes || die "dogamesbin failed"
fi
dodoc readme
prepgamesdirs
}

@ -1,9 +0,0 @@
--- blitters.S
+++ blitters.S
@@ -242,3 +242,6 @@
* Initial revision
*
*/
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif

@ -1,11 +0,0 @@
diff -Naur old/video_x.c new/video_x.c
--- old/video_x.c 2004-09-04 01:26:41.102187277 +0200
+++ new/video_x.c 2004-09-04 01:27:51.586427427 +0200
@@ -366,6 +366,7 @@
}
default:
+ break;
}
}

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1 +0,0 @@
DIST epsxe160lin.zip 180407 RMD160 410b1a509bb2767927d46b6a97e2b0a3c7d80fc5 SHA1 4201537ee9fe12f313af81fb3b0882b61b1d65b4 SHA256 a15f92c54b4d5813ac5257282efdbeeddbdbbf08dd45655770e5d5b268735fdd

@ -1,44 +0,0 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild,v 1.11 2007/04/06 04:38:00 nyhm Exp $
inherit games
DESCRIPTION="ePSXe PlayStation Emulator"
HOMEPAGE="http://www.epsxe.com/"
SRC_URI="http://www.epsxe.com/files/epsxe${PV//.}lin.zip"
LICENSE="freedist"
SLOT="0"
KEYWORDS="-* x86"
IUSE="opengl"
RESTRICT="strip"
RDEPEND="=x11-libs/gtk+-1.2*"
DEPEND="${RDEPEND}
app-arch/unzip"
RDEPEND="${RDEPEND}
x11-misc/imake
games-emulation/psemu-peopsspu
opengl? ( games-emulation/psemu-gpupetemesagl )
!opengl? ( games-emulation/psemu-peopssoftgpu )"
S=${WORKDIR}
src_install() {
local dir=${GAMES_PREFIX_OPT}/${PN}
dogamesbin "${FILESDIR}"/epsxe
sed -i \
-e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
-e "s:GAMES_LIBDIR:$(games_get_libdir):" \
"${D}${GAMES_BINDIR}"/epsxe \
|| die "sed failed"
exeinto "${dir}"
doexe epsxe || die "doexe failed"
insinto "${dir}"
doins keycodes.lst || die "doins failed"
insinto "$(games_get_libdir)"/psemu/cheats
doins cheats/* || die "doins failed"
dodoc docs/*
prepgamesdirs
}

@ -1,72 +0,0 @@
#!/bin/sh
PSEMUDIR=GAMES_LIBDIR/psemu
EPSXEDIR=GAMES_PREFIX_OPT/epsxe
mkdir -p ~/.epsxe
cd ~/.epsxe
cleanlinks
mkdir -p memcards bios cfg cheats snap sstates patches plugins
shopt -s nullglob
for f in `find "${EPSXEDIR}" -maxdepth 1 -type f -printf '%f '` ; do
[[ -e "${f}" ]] && continue
ln -s "${EPSXEDIR}/${f}" "${f}" >& /dev/null
done
if [[ -d "${PSEMUDIR}" ]] ; then
if [[ -d "${PSEMUDIR}/plugins" ]] ; then
for plugin in `find "${PSEMUDIR}/plugins" -maxdepth 1 -type f -printf '%f '` ; do
if [[ ! -e "plugins/${plugin}" ]] ; then
echo "Loading new plugin: ${plugin}"
ln -s "${PSEMUDIR}/plugins/${plugin}" "plugins/${plugin}"
fi
done
fi
if [[ -d "${PSEMUDIR}/cfg" ]] ; then
for configlib in `find "${PSEMUDIR}/cfg" -maxdepth 1 -iname '*.cfg' -prune -o -type f -printf '%f '`; do
if [[ ! -e "cfg/${configlib}" ]] ; then
echo "Loading config utility: ${configlib}"
ln -s "${PSEMUDIR}/cfg/${configlib}" "cfg/${configlib}"
fi
done
for config in `find "${PSEMUDIR}/cfg" -maxdepth 1 -iname '*.cfg' -type f -printf '%f '`; do
if [[ ! -e "cfg/${config}" ]] ; then
echo "Loading default config: ${config}"
cp "${PSEMUDIR}/cfg/${config}" "cfg/${config}"
fi
done
fi
if [[ -d "${PSEMUDIR}/cheats" ]] ; then
for cheat in `find "${PSEMUDIR}/cheats" -maxdepth 1 -type f -printf '%f '`; do
if [[ ! -e "cheats/${cheat}" ]] ; then
ln -s "${PSEMUDIR}/cheats/${cheat}" "cheats/${cheat}"
fi
done
fi
if [[ -d "${PSEMUDIR}/bios" ]] ; then
for bios in `find "${PSEMUDIR}/bios" -maxdepth 1 -type f -printf '%f '`; do
if [[ ! -e "bios/${bios}" ]] ; then
ln -s "${PSEMUDIR}/bios/${bios}" "bios/${bios}"
fi
done
fi
fi
# check for bios
if [[ -z "`cd bios && ls`" ]] ; then
# if the bios directory is empty, then ... well ...
echo
echo "*** Put your BIOS file into ~/.epsxe/bios/"
echo " or ePSXe may not work!"
echo
fi
# execute program (with args)
export LD_PRELOAD="libpthread.so.0:${LD_PRELOAD}" # fix for Bug #26121
exec ./epsxe "$@"

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1 +0,0 @@
DIST gtuxnes-0.75.tar.gz 16805 RMD160 6ccce307516b0e37e51750b6f9c9c68dd3dca35a SHA1 98a0f414ac8f7efce6f9fde2e1ce9139df9dc291 SHA256 b7b00f94d7d759a44412c50177d0de6f497b4eb24946a977a9e6f26c9db9b46a

@ -1,11 +0,0 @@
--- config.c.orig 2005-02-26 22:52:50.000000000 -0500
+++ config.c 2005-02-26 22:53:21.000000000 -0500
@@ -56,7 +56,7 @@
while (!feof(config_file))
{
raw_data[0] = '\0';
- fscanf(config_file, "%s\n", raw_data);
+ fscanf(config_file, "%[^\n]\n", raw_data);
if (strlen(raw_data) < 10)
break;
strncpy(str_opname, raw_data, 10);

@ -1,34 +0,0 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/gtuxnes/gtuxnes-0.75.ebuild,v 1.7 2005/06/15 18:34:47 wolf31o2 Exp $
inherit eutils games
DESCRIPTION="GTK frontend for tuxnes, the emulator for the 8-bit Nintendo Entertainment System"
HOMEPAGE="http://www.scottweber.com/projects/gtuxnes/"
SRC_URI="http://www.scottweber.com/projects/gtuxnes/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86"
IUSE=""
DEPEND="=x11-libs/gtk+-1.2*"
RDEPEND="${DEPEND}
>=games-emulation/tuxnes-0.75"
src_unpack() {
unpack ${A}
cd "${S}"
sed -i \
-e 's/gcc/$(CC) $(CFLAGS)/' Makefile \
|| die 'sed Makefile failed'
epatch "${FILESDIR}/${PV}-rc.patch"
}
src_install() {
dogamesbin gtuxnes || die "dogamesbin failed"
dodoc AUTHORS CHANGES README TODO
prepgamesdirs
}

@ -1 +0,0 @@
DIST InfoNES097J_Src.zip 271316 RMD160 1a9a49cb0cbd9f6b22a20ba6c85f2f8ade730942 SHA1 a3ef1aff074f6a4e05e0cc3719120df92483ba74 SHA256 6464788667f53de27c9c12ec96a5548886d1e38a0b795024c55618d2eadb5289

@ -1,37 +0,0 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/infones/infones-0.97.ebuild,v 1.2 2006/10/25 23:35:03 nyhm Exp $
inherit games
MY_P="InfoNES${PV//.}J_Src"
DESCRIPTION="A fast and portable NES emulator"
HOMEPAGE="http://www.geocities.co.jp/SiliconValley/5604/infones/"
SRC_URI="mirror://sourceforge.jp/${PN}/16325/${MY_P}.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="=x11-libs/gtk+-1.2*"
DEPEND="${RDEPEND}
app-arch/unzip"
S=${WORKDIR}/${MY_P}/linux
src_unpack() {
unpack ${A}
cd "${S}"
sed -i \
-e "s:-O6:${CFLAGS}:" \
-e "/^LDFILGS/s:=:=${LDFLAGS} :" \
Makefile \
|| die "sed Makefile failed"
}
src_install() {
dogamesbin InfoNES || die "dogamesbin failed"
dohtml ../doc/readme.html
prepgamesdirs
}

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1 +0,0 @@
DIST PcsxSrc-1.5.tgz 441651 RMD160 83e6425cb027c72b5b452b61f6b5a83992c5e065 SHA1 ce7200a3ee79e04685c6fe666b1bb7e49f8a4a17 SHA256 49656115a7ade50245e54314052d2a7be814f40c50f609427fe5320eba4435a9

@ -1,11 +0,0 @@
--- Linux/LnxMain.c.orig 2003-08-14 00:55:01.529872992 -0400
+++ Linux/LnxMain.c 2003-08-14 00:54:56.000000000 -0400
@@ -48,7 +48,7 @@
bindtextdomain(PACKAGE, "./Langs");
textdomain(PACKAGE);
#endif
- strcpy(cfgfile, "Pcsx.cfg");
+ sprintf(cfgfile, "%s/.pcsx/config", getenv("HOME"));
for (i=1; i<argc; i++) {
if (!strcmp(argv[i], "-runcd")) runcd = 1;

@ -1,56 +0,0 @@
#!/bin/bash
source /etc/init.d/functions.sh || exit 1
if [[ ! -f ~/.pcsx/config ]]; then
einfo You are running PCSX for the first time.
einfo Setting up your PCSX environment... Please wait...
mkdir -p ~/.pcsx
cd ~/.pcsx
mkdir memcards bios cfg plugins
ln -s GAMES_BINDIR/pcsx.bin pcsx
ln -s GAMES_LIBDIR/psemu/plugins/* plugins/
ln -s GAMES_DATADIR/pcsx .pixmaps
cd bios
if [[ -f GAMES_LIBDIR/psemu/bios/scph1001.bin ]]; then
ln -s GAMES_LIBDIR/psemu/bios/scph1001.bin .
biosname=scph1001.bin
else
biosname=HLE
fi
cd ..
cat >~/.pcsx/config <<EOF
Bios = $biosname
Gpu = $(basename $(ls plugins/libgpu* | cut -f1 -d\ ) )
Spu = $(basename $(ls plugins/libspu* | cut -f1 -d\ ) )
Cdr = $(basename $(ls plugins/libcdr* | cut -f1 -d\ ) )
Pad1 = $(basename $(ls plugins/libpadXwin-* | cut -f1 -d\ ) )
Pad2 = $(basename $(ls plugins/libpadXwin-* | cut -f1 -d\ ) )
Mcd1 = ${HOME}/.pcsx/memcards/Mcd001.mcr
Mcd2 = ${HOME}/.pcsx/memcards/Mcd002.mcr
PluginsDir = ${HOME}/.pcsx/plugins/
BiosDir = ${HOME}/.pcsx/bios/
Xa = 0
Sio = 0
Mdec = 0
PsxAuto = 1
PsxType = 0
Cdda = 0
Cpu = 0
PsxOut = 0
SpuIrq = 0
CdTiming = 0
EOF
unset biosname
fi
cd ~/.pcsx/
ln -s GAMES_LIBDIR/psemu/cfg/* cfg/ &>/dev/null
ln -s GAMES_LIBDIR/psemu/plugins/* plugins/ &>/dev/null
exec ./pcsx "$@"

@ -1,22 +0,0 @@
--- PsxBios.c.old 2006-05-02 21:22:52.000000000 +0200
+++ PsxBios.c 2006-05-02 21:41:56.000000000 +0200
@@ -2253,7 +2253,7 @@
if (ptr) psxRu32ref(base) = SWAPu32((u32)ptr - (u32)psxM); \
else psxRu32ref(base) = 0; \
} else { \
- if (psxRu32(base)) (u8*)ptr = (u8*)(psxM + psxRu32(base)); \
+ if (psxRu32(base)) *(u8**)&ptr = (u8*)(psxM + psxRu32(base)); \
else ptr = NULL; \
} \
base+=4;
--- R3000A.h.old 2006-05-02 21:44:36.000000000 +0200
+++ R3000A.h 2006-05-02 21:45:07.000000000 +0200
@@ -135,7 +135,7 @@
psxRegisters psxRegs;
-#define _i32(x) (long)x
+#define _i32(x) *(long *)&x
#define _u32(x) x
#define _i16(x) (short)x

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1,66 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/pcsx-1.5-r1.ebuild,v 1.12 2011/02/22 20:57:27 mr_bones_ Exp $
EAPI=2
inherit eutils games
DESCRIPTION="PlayStation emulator"
HOMEPAGE="http://www.pcsx.net/"
SRC_URI="http://www.pcsx.net/downloads/PcsxSrc-${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-ppc x86"
IUSE="opengl"
DEPEND="x11-libs/gtk+:2
gnome-base/libglade"
RDEPEND="${DEPEND}
games-emulation/psemu-cdr
games-emulation/psemu-cdriso
games-emulation/psemu-padxwin
games-emulation/psemu-padjoy
games-emulation/psemu-peopsspu
opengl? ( games-emulation/psemu-gpupetemesagl )
!opengl? ( games-emulation/psemu-peopssoftgpu )"
S=${WORKDIR}/PcsxSrc-${PV}
src_prepare() {
edos2unix $(find -regex '.*\.[ch]')
epatch \
"${FILESDIR}"/${PV}-gentoo.patch \
"${FILESDIR}"/${P}-gcc41.patch
sed -i \
-e "s:Plugin/:$(games_get_libdir)/psemu/plugins/:" \
-e "s:Bios/:$(games_get_libdir)/psemu/bios/:" \
-e 's:Pcsx.cfg:~/.pcsx/config:' \
Linux/LnxMain.c \
|| die "sed LnxMain.c failed"
sed \
-e "s:GAMES_DATADIR:${GAMES_DATADIR}:" \
-e "s:GAMES_LIBDIR:$(games_get_libdir):" \
-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
"${FILESDIR}"/pcsx > "${T}"/pcsx \
|| die "sed failed"
}
src_configure() {
cd Linux
egamesconf
}
src_compile() {
emake -C Linux OPTIMIZE="${CFLAGS}" STRIP=true || die "emake failed"
}
src_install() {
newgamesbin Linux/pcsx pcsx.bin || die "newgamesbin failed"
dogamesbin "${T}"/pcsx || die "dogamesbin failed"
insinto "${GAMES_DATADIR}"/${PN}
doins Linux/.pixmaps/* || die "doins failed"
dodoc Docs/*
prepgamesdirs
}

@ -1 +0,0 @@
DIST pcsx2-0.8.1src.7z 551500 RMD160 b9241ad6c59a5e62ff556ac5935dec93dca77875 SHA1 a3923a02347550f799f7da1ebf76039acae162f3 SHA256 473f6e278c51770260174026d5c26183dd3ae0083c905a9bedfc2c56321d99e1

@ -1,52 +0,0 @@
#!/bin/bash
if [[ ! -f ${HOME}/.pcsx2/Pcsx2.cfg ]] ; then
echo You are running PCSX2 for the first time.
echo Setting up your PCSX2 environment... Please wait...
mkdir -p "${HOME}"/.pcsx2
cd "${HOME}"/.pcsx2
mkdir Bios Docs Plugins host memcards snap
ln -s "GAMES_BINDIR"/pcsx2.bin pcsx2
ln -s "GAMES_LIBDIR"/ps2emu/plugins/* Plugins/
ln -s "GAMES_LIBDIR"/ps2emu/Langs Langs
ln -s "GAMES_LIBDIR"/ps2emu/cfg cfg
cd Bios
if [[ -f GAMES_LIBDIR/ps2emu/bios/scph1001.bin ]] ; then
ln -s "GAMES_LIBDIR"/ps2emu/bios/scph1001.bin .
biosname=scph1001.bin
else
biosname=HLE
fi
cd ..
firstplugin() { echo $(basename $(ls "$@" | cut -f1 -d\ ) ) 2>/dev/null ; }
cat > "${HOME}"/.pcsx2/Pcsx2.cfg <<EOF
Bios = $biosname
GS = $(firstplugin Plugins/libGS*)
SPU2 = $(firstplugin Plugins/libSPU2*)
CDVD = $(firstplugin Plugins/libCDVD*)
PAD1 = $(firstplugin Plugins/libPADxwin*)
PAD2 = $(firstplugin Plugins/libPADxwin*)
DEV9 = $(firstplugin Plugins/libDEV9null*)
USB = $(firstplugin Plugins/libUSBlinuz*)
Mcd1 = ${HOME}/.pcsx2/memcards/Mcd001.mcr
Mcd2 = ${HOME}/.pcsx2/memcards/Mcd002.mcr
PluginsDir = ${HOME}/.pcsx2/Plugins/
BiosDir = ${HOME}/.pcsx2/Bios/
Cpu = 0
PsxOut = 0
varLog = 0
Lang = en
EOF
fi
cd "${HOME}"/.pcsx2/
ln -s "GAMES_LIBDIR"/ps2emu/cfg/* cfg/ &> /dev/null
ln -s "GAMES_LIBDIR"/ps2emu/plugins/* plugins/ &> /dev/null
exec ./pcsx2 "$@"

@ -1,25 +0,0 @@
--- x86/ix86/ix86_cpudetect.c.orig 2005-08-07 03:43:45.000000000 -0400
+++ x86/ix86/ix86_cpudetect.c 2005-08-07 03:44:23.000000000 -0400
@@ -94,16 +94,19 @@
__asm__ __volatile__ (
#ifdef __x86_64__
+#define AX "%%rax"
"sub $0x18, %%rsp\n"
+#else
+#define AX "%%eax"
#endif
"pushf\n"
- "pop %%eax\n"
+ "pop "AX"\n"
"mov %%eax, %%edx\n"
"xor $0x200000, %%eax\n"
- "push %%eax\n"
+ "push "AX"\n"
"popf\n"
"pushf\n"
- "pop %%eax\n"
+ "pop "AX"\n"
"xor %%edx, %%eax\n"
"mov %%eax, %0\n"
#ifdef __x86_64__

@ -1,293 +0,0 @@
--- FiFo.c.old 2006-05-02 22:31:47.000000000 +0200
+++ FiFo.c 2006-05-02 22:39:29.000000000 +0200
@@ -61,6 +61,7 @@
void fifo_get3(struct fifo *fifo, void *value, u32 size, int type){
struct item * p;
register u32 q;
+ u8* u8Value;
if ( value == NULL ) return;
if(fifo->first->next == NULL) memset(value, 0, size);
@@ -72,7 +73,8 @@
q = min(p->size - fifo->used, size);
memcpy(value,(u8*)p->data + fifo->used, q);
size -= q;
- (u8*)value += q;
+ u8Value = (u8*)value + q;
+ value = u8Value;
if(type)
{
fifo->count -= q;
@@ -94,6 +96,7 @@
void fifo_get(struct fifo *fifo, void *value, u32 size){
struct item *p;
register u32 q;
+ u8* u8Value;
if (value==NULL) return;
@@ -107,7 +110,8 @@
fifo->used+=q;
fifo->count-=q;
size-=q;
- (u8*)value+=q;
+ u8Value = (u8*)value + q;
+ value = u8Value;
if (fifo->used>=p->size){
fifo->used=0;
fifo->first->next=p->next;
@@ -124,6 +128,7 @@
void fifo_get2(struct fifo *fifo, void *value, u32 size){
struct item *p;
register u32 q;
+ u8* u8Value;
if (value==NULL) return;
@@ -135,7 +140,8 @@
q=min(p->size-fifo->used, size);
memcpy(value, (u8*)p->data+fifo->used, q);
size-=q;
- (u8*)value+=q;
+ u8Value = (u8*)value + q;
+ value = u8Value;
p=fifo->first->next;
}
memset(value, 0, size);
--- CDVDiso.c.old 2006-05-02 22:44:47.000000000 +0200
+++ CDVDiso.c 2006-05-02 23:29:19.000000000 +0200
@@ -198,7 +198,7 @@
// case CdSecS2064:
((u32*)buf)[0] = i + 0x30000;
memcpy((u8*)buf+12, buff, 2048);
- (u8*)buf+= 2064; break;
+ buf+= 2064; break;
// default:
// return 0;
// }
@@ -300,14 +300,13 @@
//CdSync(0x00);
// point the tocEntryPointer at the first real toc entry
- (char*)tocEntryPointer = toc;
+ tocEntryPointer = (struct dirTocEntry *)toc;
num_dir_sectors = (tocEntryPointer->fileSize+2047) >> 11; //round up fix
current_sector = tocEntryPointer->fileLBA;
- (char*)tocEntryPointer += tocEntryPointer->length;
- (char*)tocEntryPointer += tocEntryPointer->length;
-
+ tocEntryPointer = (struct dirTocEntry *)((char *)tocEntryPointer + tocEntryPointer->length);
+ tocEntryPointer = (struct dirTocEntry *)((char *)tocEntryPointer + tocEntryPointer->length);
localTocEntry.fileLBA = CDVolDesc.rootToc.tocLBA;
// while (there are more dir names in the path)
@@ -360,7 +359,7 @@
}
// CdSync(0x00);
- (char*)tocEntryPointer = toc;
+ tocEntryPointer = (struct dirTocEntry *)toc;
}
else
{
@@ -385,7 +384,7 @@
}
// point to the next entry
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
}
// If we havent found the directory name we wanted then fail
@@ -410,23 +409,23 @@
current_sector = localTocEntry.fileLBA;
// and point the tocEntryPointer at the first real toc entry
- (char*)tocEntryPointer = toc;
- (char*)tocEntryPointer += tocEntryPointer->length;
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *)toc;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
}
#ifdef DEBUG
printf("CDVD_findfile: found dir, now looking for file\n");
#endif
- (char*)tocEntryPointer = toc;
+ tocEntryPointer = (struct dirTocEntry *)toc;
num_dir_sectors = (tocEntryPointer->fileSize+2047) >> 11; //round up fix
dir_lba = tocEntryPointer->fileLBA;
- (char*)tocEntryPointer = toc;
- (char*)tocEntryPointer += tocEntryPointer->length;
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *)toc;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
while (num_dir_sectors > 0)
{
@@ -455,7 +454,7 @@
return TRUE;
}
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
}
num_dir_sectors--;
@@ -470,7 +469,7 @@
}
// CdSync(0x00);
- (char*)tocEntryPointer = toc;
+ tocEntryPointer = (struct dirTocEntry *) toc;
}
}
@@ -521,13 +520,13 @@
//CdSync(0x00);
// point the tocEntryPointer at the first real toc entry
- (char*)tocEntryPointer = toc;
+ tocEntryPointer = (struct dirTocEntry *)toc;
num_dir_sectors = (tocEntryPointer->fileSize+2047) >> 11;
current_sector = tocEntryPointer->fileLBA;
- (char*)tocEntryPointer += tocEntryPointer->length;
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
// use strtok to get the next dir name
@@ -563,7 +562,7 @@
}
//CdSync(0x00);
- (char*)tocEntryPointer = toc;
+ tocEntryPointer = (struct dirTocEntry *)toc;
}
else{
// Couldnt find the directory, and got to end of directory
@@ -588,7 +587,7 @@
}
// point to the next entry
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
}
// If we havent found the directory name we wanted then fail
@@ -611,9 +610,9 @@
current_sector = localTocEntry.fileLBA;
// and point the tocEntryPointer at the first real toc entry
- (char*)tocEntryPointer = toc;
- (char*)tocEntryPointer += tocEntryPointer->length;
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *)toc;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
}
// We know how much data we need to read in from the DirTocHeader
@@ -625,7 +624,7 @@
// This is a bit of a waste of reads since we're not actually copying the data out yet,
// but we dont know how big this TOC might be, so we cant allocate a specific size
- (char*)tocEntryPointer = toc;
+ tocEntryPointer = (struct dirTocEntry *)toc;
// Need to STORE the start LBA and number of Sectors, for use by the retrieve func.
getDirTocData.start_LBA = localTocEntry.fileLBA;
@@ -637,9 +636,9 @@
num_dir_sectors = getDirTocData.num_sectors;
- (char*)tocEntryPointer = toc;
- (char*)tocEntryPointer += tocEntryPointer->length;
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *)toc;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
toc_entry_num=0;
@@ -661,7 +660,7 @@
}
//CdSync(0x00);
- (char*)tocEntryPointer = toc;
+ tocEntryPointer = (struct dirTocEntry *)toc;
// continue;
}
@@ -694,7 +693,7 @@
}
}
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
}
@@ -731,14 +730,14 @@
if (getDirTocData.current_entry == 0){
// if this is the first read then make sure we point to the first real entry
- (char*)tocEntryPointer = toc;
- (char*)tocEntryPointer += tocEntryPointer->length;
- (char*)tocEntryPointer += tocEntryPointer->length;
+ tocEntryPointer = (struct dirTocEntry *)toc;
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
getDirTocData.current_sector_offset = (char*)tocEntryPointer - toc;
}
else{
- (char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
+ tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
}
if (req_entries > 128)
@@ -763,7 +762,7 @@
//CdSync(0x00);
getDirTocData.current_sector_offset = 0;
- (char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
+ tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
// continue;
}
@@ -789,7 +788,7 @@
}
getDirTocData.current_sector_offset += tocEntryPointer->length;
- (char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
+ tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
}
else{
if (strlen(getDirTocData.extension_list) > 0){
@@ -799,13 +798,13 @@
}
getDirTocData.current_sector_offset += tocEntryPointer->length;
- (char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
+ tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
}
else{
toc_entry_num++;
getDirTocData.current_sector_offset += tocEntryPointer->length;
- (char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
+ tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
}
}
/*

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1,68 +0,0 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/pcsx2-0.8.1.ebuild,v 1.11 2008/10/13 17:10:02 mr_bones_ Exp $
inherit eutils toolchain-funcs games
DESCRIPTION="Playstation2 emulator"
HOMEPAGE="http://www.pcsx2.net/"
SRC_URI="http://www.pcsx2.net/download/0.8release/${P}src.7z"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND="sys-libs/zlib
=x11-libs/gtk+-1*
|| (
>=games-emulation/ps2emu-cddvdlinuz-0.3-r1
>=games-emulation/ps2emu-cdvdiso-0.3 )
>=games-emulation/ps2emu-gssoft-0.6.1
>=games-emulation/ps2emu-padxwin-0.5
>=games-emulation/ps2emu-spu2null-0.2.1
>=games-emulation/ps2emu-dev9null-0.1
>=games-emulation/ps2emu-usbnull-0.4"
DEPEND="${RDEPEND}
app-arch/p7zip"
S=${WORKDIR}/${P}src
src_unpack() {
7z x "${DISTDIR}/${P}src.7z" || die "unpack failed"
cd "${S}"
epatch "${FILESDIR}"/${P}-amd64.patch \
"${FILESDIR}/${P}"-gcc41.patch
sed -i \
-e '/^CC/d' \
-e "/^CPU/s:=.*:=$(tc-arch-kernel):" \
Linux/Makefile \
|| die "sed failed"
sed -i \
-e "/non_linear_quantizer_scale/s/^/extern /" \
IPU/Mpeg.h \
|| die "sed failed"
}
src_compile() {
local CPU=i386
if use amd64; then
CPU=x86_64
fi
emake -C Linux OPTIMIZE="${CFLAGS}" CPU="${CPU}" || die "emake failed"
}
src_install() {
newgamesbin Linux/pcsx2 pcsx2.bin || die "newgamesbin failed"
dogamesbin "${FILESDIR}/pcsx2" || die "dogamesbin failed"
sed -i \
-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-e "s:GAMES_LIBDIR:$(games_get_libdir):" \
"${D}/${GAMES_BINDIR}/pcsx2" \
|| die "sed failed"
dodoc Docs/*.txt
doicon "${FILESDIR}"/pcsx2.png
make_desktop_entry pcsx2 PCSX2 pcsx2
prepgamesdirs
}

@ -1 +0,0 @@
DIST CDVDlinuz0.3.zip 26264 RMD160 18193095cbfa38a276698493d2714f37f7ac2610 SHA1 e903af124a893dadeaa8be1b00dbf5de020c1d82 SHA256 99900a4ad56d4f2c0a92e0dbb827ed2471a02da6b28bb433ef9e768ca78f8a66

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1,40 +0,0 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cddvdlinuz/ps2emu-cddvdlinuz-0.3-r1.ebuild,v 1.7 2007/04/06 18:56:48 nyhm Exp $
inherit games
DESCRIPTION="PSEmu2 CD/DVD plugin"
HOMEPAGE="http://www.pcsx2.net/"
SRC_URI="http://www.pcsx2.net/download/0.5release/CDVDlinuz${PV}.zip"
LICENSE="freedist"
SLOT="0"
KEYWORDS="~ppc x86"
IUSE=""
RDEPEND="=x11-libs/gtk+-1*"
DEPEND="${RDEPEND}
app-arch/unzip"
S=${WORKDIR}/CDVDlinuz
src_unpack() {
unpack ${A}
cd "${S}"
sed -i \
-e 's:-O2 -fomit-frame-pointer:$(OPTFLAGS):' Src/Makefile \
|| die "sed failed"
}
src_compile() {
cd Src
emake OPTFLAGS="${CFLAGS}" || die "emake failed"
}
src_install() {
dodoc ReadMe.txt
exeinto "$(games_get_libdir)"/ps2emu/plugins
newexe Src/libCDVDlinuz.so libCDVDlinuz-${PV}.so || die "newexe failed"
prepgamesdirs
}

@ -1 +0,0 @@
DIST CDVDiso05.rar 404700 RMD160 bf981dc189c92766126b1e56ea36e9472fc5555e SHA1 61b4eca0087e6c587c940df0c6ad3e296db31532 SHA256 332f0447077a2dd5100b718d376a68f4429babf4bbf4abf9fea063d5c72b6d45

@ -1,8 +0,0 @@
--- src/CDVDiso.h.old 2006-05-03 07:42:09.000000000 +0200
+++ src/CDVDiso.h 2006-05-03 07:43:04.000000000 +0200
@@ -76,5 +76,4 @@
void UpdateZmode();
void CfgOpenFile();
-void SysMessage(char *fmt, ...);

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1,45 +0,0 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.5.ebuild,v 1.5 2007/04/06 19:53:05 nyhm Exp $
inherit eutils games
DESCRIPTION="PSEmu2 CD/DVD iso plugin"
HOMEPAGE="http://www.pcsx2.net/"
SRC_URI="http://www.pcsx2.net/download/0.8release/CDVDiso${PV//.}.rar"
LICENSE="freedist"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="=x11-libs/gtk+-1.2*"
DEPEND="${RDEPEND}
app-arch/unrar"
S=${WORKDIR}/CDVDiso${PV//.}
src_unpack() {
unpack ${A}
cd "${S}"
sed -i \
-e 's:-O2 -fomit-frame-pointer:$(OPTFLAGS):' \
-e '/strip/d' \
src/Linux/Makefile || die
epatch "${FILESDIR}/${P}"-gcc41.patch
}
src_compile() {
cd src/Linux
emake OPTFLAGS="${CFLAGS}" || die
}
src_install() {
dodoc ReadMe.txt
cd src/Linux
exeinto "$(games_get_libdir)"/ps2emu/plugins
newexe libCDVDiso.so libCDVDiso-${PV}.so || die
exeinto "$(games_get_libdir)"/ps2emu/cfg
doexe cfgCDVDiso || die
prepgamesdirs
}

@ -1 +0,0 @@
DIST dev9null03.rar 65356 RMD160 1efdae38c98991ae0e08c95bc7df473acd1e2f3e SHA1 e3edd96df5b552b60dc53e073279d10441565560 SHA256 05771003e92c6e85e173c3e00ece0c9341b08ce3ad506694c153503c11a5e5fa

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1,39 +0,0 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-dev9null/ps2emu-dev9null-0.3.ebuild,v 1.2 2007/04/06 20:46:18 nyhm Exp $
inherit games
DESCRIPTION="PSEmu2 NULL Sound plugin"
HOMEPAGE="http://www.pcsx2.net/"
SRC_URI="http://www.pcsx2.net/download/0.8release/dev9null${PV//.}.rar"
LICENSE="freedist"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="=x11-libs/gtk+-1.2*"
DEPEND="${RDEPEND}
app-arch/unrar"
S=${WORKDIR}/dev9null${PV//.}
src_unpack() {
unpack ${A}
cd "${S}"
sed -i 's:-O2 -fomit-frame-pointer:$(OPTFLAGS):' src/Makefile \
|| die "sed failed"
}
src_compile() {
cd src
emake OPTFLAGS="${CFLAGS}" || die
}
src_install() {
dodoc ReadMe.txt
exeinto "$(games_get_libdir)"/ps2emu/plugins
newexe src/libDEV9null.so libDEV9null-${PV}.so || die
prepgamesdirs
}

@ -1 +0,0 @@
DIST GSsoft0.9.rar 330468 RMD160 19e36024e3ff0976129c8498f14a1a5944a6e6d9 SHA1 29a4dc854c2e5c03e736d610a46a18c066361248 SHA256 811aa538d9845fa8ea4af5b4e248f34363922a9d3134ebdbc460ed1b7dc95afc

@ -1,23 +0,0 @@
http://bugs.gentoo.org/101627
--- Src/x86/ix86_cpudetect.c
+++ Src/x86/ix86_cpudetect.c
@@ -151,16 +151,18 @@
}
__asm__ __volatile__ (
+ "mov %%ebx, %%edi\n"
"mov %4, %%eax\n"
"cpuid\n"
"mov %%eax, %0\n"
"mov %%ebx, %1\n"
"mov %%ecx, %2\n"
"mov %%edx, %3\n"
+ "mov %%edi, %%ebx\n"
: "=m" (regs[0]), "=m" (regs[1]),
"=m" (regs[2]), "=m" (regs[3])
: "m"(cmd)
- : "eax", "ebx", "ecx", "edx"
+ : "eax", "ecx", "edx", "edi"
);
return 0;

@ -1,18 +0,0 @@
diff -ur GSsoft0.9-orig/Src/Cache.c GSsoft0.9/Src/Cache.c
--- GSsoft0.9-orig/Src/Cache.c 2006-05-12 21:57:05.000000000 -0400
+++ GSsoft0.9/Src/Cache.c 2006-05-12 22:02:06.000000000 -0400
@@ -70,11 +70,12 @@
for (u=0; u<tex->tex0.tw; u+=8) {
mem = &vRamUL[getPixelAddress32(u, v, tex->tex0.tbp0, tex->tex0.tbw)];
#ifdef __GNUC__
+ u32 *temp = &mem[4];
__asm__ __volatile__ (
"movsd %1, %%xmm0\n"
"movhps %2, %%xmm0\n"
"movaps %%xmm0, %0\n"
- : "=m"(&ptr[0]) : "m"(&mem[0]), "m"(&mem[4])
+ : "=m"(&ptr[0]) : "m"(&mem[0]), "m"(temp)
);
#else
ptr[0] = mem[0]; ptr[1] = mem[1];

@ -1,45 +0,0 @@
--- Src/Texts.c
+++ Src/Texts.c
@@ -17,6 +17,7 @@
*/
#include <math.h>
+#include <string.h>
#include "GS.h"
#include "Texts.h"
--- Src/Linux/Conf.c
+++ Src/Linux/Conf.c
@@ -21,6 +21,7 @@
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
+#include <string.h>
#include "GS.h"
--- Src/x86/ix86_cpudetect.c
+++ Src/x86/ix86_cpudetect.c
@@ -124,16 +124,19 @@
__asm__ __volatile__ (
#ifdef __x86_64__
+#define AX "%%rax"
"sub $0x18, %%rsp\n"
+#else
+#define AX "%%eax"
#endif
"pushf\n"
- "pop %%eax\n"
+ "pop "AX"\n"
"mov %%eax, %%edx\n"
"xor $0x200000, %%eax\n"
- "push %%eax\n"
+ "push "AX"\n"
"popf\n"
"pushf\n"
- "pop %%eax\n"
+ "pop "AX"\n"
"xor %%edx, %%eax\n"
"mov %%eax, %0\n"
#ifdef __x86_64__

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
</pkgmetadata>

@ -1,47 +0,0 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild,v 1.7 2007/04/09 15:49:33 nyhm Exp $
inherit eutils games
DESCRIPTION="PSEmu2 GPU plugin"
HOMEPAGE="http://www.pcsx2.net/"
SRC_URI="http://www.pcsx2.net/download/0.8release/GSsoft${PV}.rar"
LICENSE="freedist"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
RDEPEND="virtual/opengl
media-libs/libsdl
=x11-libs/gtk+-1*"
DEPEND="${RDEPEND}
app-arch/unrar"
S=${WORKDIR}/GSsoft${PV}
src_unpack() {
unpack ${A}
cd "${S}"
sed -i \
's:-O2 -fomit-frame-pointer -ffast-math:$(OPTFLAGS):' \
Src/Linux/Makefile \
|| die "sed failed"
epatch \
"${FILESDIR}"/${P}-gentoo.patch \
"${FILESDIR}"/${P}-PIC.patch \
"${FILESDIR}/${P}"-gcc41.patch
}
src_compile() {
cd Src/Linux
emake OPTFLAGS="${CFLAGS}" || die "emake failed"
}
src_install() {
dodoc ReadMe.txt
exeinto "$(games_get_libdir)"/ps2emu/plugins
newexe Src/Linux/libGSsoft.so libGSsoft-${PV}.so || die "newexe failed"
prepgamesdirs
}

@ -1 +0,0 @@
DIST PADwin09.rar 506891 RMD160 9c0cb0ea4ba5e2f60cb8f9296d2cd416cf722279 SHA1 b6f0eb6672e06b7c6f7f55c5ef0d799384265565 SHA256 b58c1a993cc0ebbe4f5447420cbd20d81d4d97c5a9e672da11602f503969912d

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save