Sync with portage [Sun Mar 17 19:31:52 MSK 2013].

mhiretskiy
root 11 years ago
parent fa4e567143
commit 260b9ec007

@ -0,0 +1,10 @@
Index: speech-dispatcher/doc/Makefile.am
===================================================================
--- speech-dispatcher.orig/doc/Makefile.am 2010-09-13 17:50:28.000000000 +0200
+++ speech-dispatcher/doc/Makefile.am 2010-09-13 17:50:36.000000000 +0200
@@ -1,3 +1,3 @@
-info_TEXINFOS = ssip.texi speech-dispatcher.texi spd-say.texi
-EXTRA_DIST = figures gpl.texi fdl.texi speech-dispatcher-cs.texi speech-dispatcher-cs.texi
+info_TEXINFOS = ssip.texi speech-dispatcher.texi spd-say.texi speech-dispatcher-cs.texi
+EXTRA_DIST = figures gpl.texi fdl.texi

@ -0,0 +1,29 @@
src/audio/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index 3b596f6..ec23c9f 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -11,7 +11,7 @@ endif
if pulse_support
PULSE_FLAGS = -DWITH_PULSE
-PULSE_LIBS = -lpulse-simple
+PULSE_LIBS = -lpulse-simple -lpulse
endif
if alsa_support
@@ -31,7 +31,8 @@ endif
EXTRA_DIST = alsa.c libao.c oss.c nas.c pulse.c
AM_CFLAGS = $(am_cflags) $(NAS_FLAGS) $(PULSE_FLAGS) $(ALSA_FLAGS) $(LIBAO_FLAGS) $(LIBOSS_FLAGS)
-libsdaudio_la_LDFLAGS = -version-info @LIB_SDAUDIO_CURRENT@:@LIB_SDAUDIO_REVISION@:@LIB_SDAUDIO_AGE@ -lpthread $(NAS_LIBS) $(PULSE_LIBS) $(ALSA_LIBS) $(LIBAO_LIBS)
+libsdaudio_la_LDFLAGS = -version-info @LIB_SDAUDIO_CURRENT@:@LIB_SDAUDIO_REVISION@:@LIB_SDAUDIO_AGE@
+libsdaudio_la_LIBADD = -lpthread $(NAS_LIBS) $(PULSE_LIBS) $(ALSA_LIBS) $(LIBAO_LIBS)
spdlib_LTLIBRARIES = libsdaudio.la
src/audio/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

@ -0,0 +1,13 @@
Index: speech-dispatcher/src/c/api/Makefile.am
===================================================================
--- speech-dispatcher.orig/src/c/api/Makefile.am 2010-10-01 20:17:24.000000000 +0200
+++ speech-dispatcher/src/c/api/Makefile.am 2010-10-01 20:17:26.000000000 +0200
@@ -8,6 +8,6 @@
libspeechd_la_SOURCES = libspeechd.c
libspeechd_la_HEADERS = libspeechd.h
libspeechd_ladir = $(includedir)
-libspeechd_la_LDFLAGS = -version-info @LIB_SPD_CURRENT@:@LIB_SPD_REVISION@:@LIB_SPD_AGE@ -lpthread
-libspeechd_la_LIBADD = @glib_libs@
+libspeechd_la_LDFLAGS = -version-info @LIB_SPD_CURRENT@:@LIB_SPD_REVISION@:@LIB_SPD_AGE@
+libspeechd_la_LIBADD = @glib_libs@ -lpthread

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>accessibility</herd>
<herd>sound</herd>
<maintainer>
<email>williamh@gentoo.org</email>
</maintainer>
<use>
<flag name='espeak'>Adds support for espeak speech engine</flag>
<flag name='flite'>Adds support for flite speech engine</flag>
</use>
<herd>accessibility</herd>
<herd>sound</herd>
<maintainer>
<email>williamh@gentoo.org</email>
</maintainer>
<use>
<flag name="espeak">Adds support for espeak speech engine</flag>
<flag name="flite">Adds support for flite speech engine</flag>
</use>
</pkgmetadata>

@ -0,0 +1,122 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild,v 1.1 2013/03/17 12:15:09 jlec Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
AUTOTOOLS_AUTORECONF=true
inherit autotools-utils python-r1
DESCRIPTION="Speech synthesis interface"
HOMEPAGE="http://www.freebsoft.org/speechd"
SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
RDEPEND="
dev-libs/dotconf
>=dev-libs/glib-2
alsa? ( media-libs/alsa-lib )
ao? ( media-libs/libao )
espeak? ( app-accessibility/espeak )
flite? ( app-accessibility/flite )
nas? ( media-libs/nas )
pulseaudio? ( media-sound/pulseaudio )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-pthread.patch
"${FILESDIR}"/${P}-doc.patch
"${FILESDIR}"/${P}-gold.patch
)
src_prepare() {
# Python bindings are built/installed manually.
sed -e "/SUBDIRS += python/d" -i src/Makefile.am || die
autotools-utils_src_prepare
}
src_configure() {
local myeconfargs=(
$(use_enable python)
$(use_with alsa)
$(use_with ao libao)
$(use_with espeak)
$(use_with flite)
$(use_with pulseaudio pulse)
$(use_with nas)
)
autotools-utils_src_configure
}
src_compile() {
use python && python_copy_sources
autotools-utils_src_compile all
if use python; then
building() {
cd src/python || die
emake \
pyexecdir="$(python_get_sitedir)" \
pythondir="$(python_get_sitedir)"
}
python_foreach_impl run_in_build_dir building
fi
}
src_install() {
autotools-utils_src_install
if use python; then
installation() {
cd src/python || die
emake \
DESTDIR="${D}" \
pyexecdir="$(python_get_sitedir)" \
pythondir="$(python_get_sitedir)" \
install
}
python_foreach_impl run_in_build_dir installation
python_replicate_script "${ED}"/usr/bin/spd-conf
fi
local f
for f in clibrary clibrary2 connection_recovery long_message run_test; do
rm "${ED}"/usr/bin/${f} || die
done
}
pkg_postinst() {
local editconfig="n"
if ! use espeak; then
ewarn "You have disabled espeak, which is speech-dispatcher's"
ewarn "default speech synthesizer."
ewarn
editconfig="y"
fi
if ! use pulseaudio; then
ewarn "You have disabled pulseaudio support."
ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
ewarn
editconfig="y"
fi
if [[ "${editconfig}" == "y" ]]; then
ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
ewarn "and make sure the settings there match your system."
ewarn
fi
ewarn "This version does not include a system wide startup script"
ewarn "since it is not intended to be run in system-wide mode."
ewarn
elog "For festival support, you need to"
elog "install app-accessibility/festival-freebsoft-utils."
}

@ -0,0 +1,37 @@
do not let these targets depend on clean, otherwise it could run in
parallel with the object compile which runs into races
https://bugs.gentoo.org/461806
While we're in here, fix up a few other things:
- do not bother with `rm` in the output since linking will clober it
- use CXXFLAGS when linking
- append LIBFLAGS to the individual targets instead of the final link
--- a/makefile.unix
+++ b/makefile.unix
@@ -116,9 +116,8 @@
clean:
@rm -f *.o *.bak *~
-unrar: clean $(OBJECTS) $(UNRAR_OBJ)
- @rm -f unrar
- $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
+unrar: $(OBJECTS) $(UNRAR_OBJ)
+ $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
$(STRIP) unrar
sfx: WHAT=SFX_MODULE
@@ -128,10 +127,9 @@
$(STRIP) default.sfx
lib: WHAT=RARDLL
-lib: CXXFLAGS+=$(LIBFLAGS)
-lib: clean $(OBJECTS) $(LIB_OBJ)
- @rm -f libunrar.so
- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS)
+lib: $(OBJECTS) $(LIB_OBJ)
+ $(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
install-unrar:
install -D unrar $(DESTDIR)/bin/unrar

@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.4.ebuild,v 1.13 2013/03/15 15:27:56 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.4.ebuild,v 1.14 2013/03/16 15:35:08 vapier Exp $
EAPI=4
inherit flag-o-matic multilib toolchain-funcs
inherit flag-o-matic multilib toolchain-funcs eutils
MY_PN=${PN}src
@ -21,6 +21,7 @@ RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
S=${WORKDIR}/unrar
src_prepare() {
epatch "${FILESDIR}"/${PN}-4.2.4-build.patch
sed -i \
-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
@ -36,6 +37,9 @@ src_compile() {
ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
# The stupid code compiles a lot of objects differently if
# they're going into a lib (-DRARDLL) or into the main app.
# So for now, we can't link the main app against the lib.
unrar_make clean
unrar_make
}

@ -1,4 +1,3 @@
DIST qxmledit-0.8.2-src.tgz 5770059 SHA256 2852c340a91ced797a3626601be580084bbc29602e9f9221e27f58d16387bc09 SHA512 5e2f147dbb4f2e955faa66f12932be2e9357b1c1db4c0dc008c3ca86d1532f182f67476dbf0ff7c4f2768d432c71ab400ecb1cc4e564e5aedf6081ca0c802f13 WHIRLPOOL 9c0c6810972afb7a9b4c65bb48307a6aab4deb7af1636c63157d7763d8ddf462d7674c505932dfa3abcd4d04ccf8c89211ef464eb917762ba024f53bc57f1148
DIST qxmledit-0.8.3.1-src.tgz 5948346 SHA256 f51b41b53735419023f564d71447e620a73035fdde54a54e710729c317c385bb SHA512 f4a77316999038d0b970135780b7152197905e3c3cef16d4e5739c2fbb9b10f86af70797fe12c36e00ab991c65164c18c8dae69f1bbbe3420fbfdb389efce805 WHIRLPOOL 9ae30bfac7e23ff9fe2927a05939ebfb44610d8efb22cf6603a4df8b5e978f8114b78a37a2c1088b1922eae4f4cc8ea55cd276ff5593b74f88a0c5c0aa81aa82
DIST qxmledit-0.8.4-src.tgz 6437466 SHA256 45f8b8ff322181e7387759938f6d7cf5824b5443ffbc30cd189c116a2dbd3804 SHA512 cf6e23ee976d41a6c754edabaca5d4a67953b4a3afeeaeae4d40221c594bb6f4aba51053abf71464142a3d20812288e94c9ab9d700a1b46c63746f0b7855cfa2 WHIRLPOOL d8cb177673b13f64461d88dba6179a32c2b57f4c1318c3a674236208a809d67dfddbf2d938f1538542d0a22249f916672acff5260af7e128abc32c060e2dbf9d
DIST qxmledit-0.8.5-src.tgz 6727188 SHA256 aedb70f27493ba50f0c8bde4acdd8913fcf4221611b24f9042769df47aa701c4 SHA512 c974dc0787fdc1831a39e9e36f842ed92ca5b57e9e66e64822eea4646d88a0755f9aa791e4d7724872856561eac213413696fa7b0f61d89b54e29cbc95049a8a WHIRLPOOL 362d898005677dea5bb7372bc78d8b5d9376f2c7555be3086448778202a55fff5766856c39a55561c92b08498ecafaeace033121ba4706b4c1aa923ea45f28d8

@ -1,59 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.2.ebuild,v 1.3 2013/03/02 19:22:03 hwoarang Exp $
EAPI=4
inherit multilib eutils qt4-r2
MY_P="qxmledit-${PV}-src"
DESCRIPTION="Qt4 XML Editor"
HOMEPAGE="http://code.google.com/p/qxmledit/"
SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND=">=dev-qt/qtcore-4.7:4
>=dev-qt/qtgui-4.7:4
>=dev-qt/qtsql-4.7:4
>=dev-qt/qtsvg-4.7:4
>=dev-qt/qtxmlpatterns-4.7:4"
RDEPEND="${DEPEND}"
DOCS="AUTHORS NEWS README ROADMAP TODO"
src_prepare() {
# fix doc dir
sed -i "/INST_DOC_DIR = / s|/opt/${PN}|/usr/share/doc/${PF}|" \
src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
die "failed to fix doc installation path"
# fix binary installation path
sed -i "/INST_DIR = / s|/opt/${PN}|/usr/bin|" \
src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
die "failed to fix binary installation path"
# fix helper libraries installation path
sed -i "/INST_LIB_DIR = / s|/opt/${PN}|/usr/$(get_libdir)|" \
src/QXmlEdit{,Widget}.pro \
src/sessions/QXmlEditSessions.pro || \
die "failed to fix library installation path"
# fix translations
sed -i "/INST_DATA_DIR = / s|/opt|/usr/share|" src/QXmlEdit{,Widget}.pro \
src/sessions/QXmlEditSessions.pro || \
die "failed to fix translations"
# fix include
sed -i "/INST_INCLUDE_DIR = / s|/opt|/usr/share|" src/QXmlEditWidget.pro \
|| die "failed to fix include directory"
qt4-r2_src_prepare
}
src_install() {
qt4-r2_src_install
newicon src/images/icon.png ${PN}.png
make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor"
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.4.ebuild,v 1.2 2013/03/02 19:22:03 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.4.ebuild,v 1.3 2013/03/17 12:24:49 ago Exp $
EAPI=5
@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 ~x86"
IUSE="debug"
DEPEND=">=dev-qt/qtcore-4.7:4

@ -1,2 +1,2 @@
DIST wxHexEditor-v0.11-src.tar.bz2 507012 SHA256 85c866c7f09c53c90af2fd12f1978125caa1b7d0ee20719915e45220d31f1ee5 SHA512 187fd3e2b20a68cd23644bf91afc7c65431670c4125b44eec665ebae3eadf8ffc13885f12386a4d5ca7274b402fa7609a94b6eb8111a229940dc85896a073d99 WHIRLPOOL 92ce6657f56a05cded331a988a3aa7ea8eeef4399cb68cdf471c1b0e026b17736c3916020ad97212ec36408e4b48c2a7ce42ec6849aa97c824af0d8d22e735b5
DIST wxHexEditor-v0.20-src.tar.bz2 1194554 SHA256 a3dda32eb62e3ec1c9760519302bcef688253d48b3d2c566f9629c4e4246ae55 SHA512 f8138fb892528fd7d131b0931f52cb6b19dc984aa831882d7f60f557527e6bb559429a11b5a1307cf51d1a8974123627d15ccee87561970784a75910929f85a3 WHIRLPOOL 9d3343060f815fae7b2512b098c3a1c4853c062040cb2b180bf7402231295d27e96a3996aca041ce2f694f2cc84bb6dfbc419797079713afb254900187d100e0
DIST wxHexEditor-v0.21-src.tar.bz2 1760192 SHA256 076111ebcf1472e80ec9a16223ca60bdf4598689cc5aa076a4f9760bba51f17f SHA512 bea80a139bb76e47ed5d3644f923b4b042d8842bb3522e88e2c84947eadc7f49f2599438f583ea8a1fde05356886d8fb20f679398e1519c13acd8e4dd49ad729 WHIRLPOOL fd5ebc1609183b8879254461c7eb1a22355a2f71ca45452a6dd21ca8164c5b8b96474d9d1c01b2aea962d4d47c291e3b43d8bf1d337c7bcff6c1c109c3fe29b9

@ -1,96 +0,0 @@
https://bugs.gentoo.org/373665
use system udis86
respect flags
fix parallel build
--- a/hashlibpp/src/Makefile
+++ b/hashlibpp/src/Makefile
@@ -50,7 +50,7 @@ INCLUDE_PATH = /usr/include/hashlib++
LIB_PATH = /usr/local/lib/
# Compiler to use
-COMPILER = g++
+COMPILER = ${CXX}
# Global options for the compiler
COPTIONS = -ansi -Wall -Wextra
@@ -62,7 +62,7 @@ COPTIONS = -ansi -Wall -Wextra
ifdef DEBUG
COPTIONS += -g
else
- COPTIONS += -O3 -fomit-frame-pointer
+ COPTIONS += ${CXXFLAGS}
endif
GCC = $(COMPILER) $(COPTIONS)
@@ -149,7 +149,7 @@ hl_sha512wrapper.o: hl_sha512wrapper.cpp hl_sha512wrapper.h
#-----------------------------------------------------------------------
# Creating a static lib using ar
-LIB: MD5 SHA1 SHA256
+LIB: MD5 SHA1 SHA256 SHA2EXT
ar rs libhl++.a $(MD5) $(SHA1) $(SHA256) $(SHA2EXT)
#-----------------------------------------------------------------------
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
WXCONFIG = wx-config
CPP = `$(WXCONFIG) --cxx`
-CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -c ${OPTFLAGS}
-LDFLAGS = `$(WXCONFIG) --libs`
+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS}
+WXLDFLAGS = `$(WXCONFIG) --libs` ${LDFLAGS}
RC = `$(WXCONFIG) --rescomp`
#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
@@ -17,7 +17,7 @@ SOURCES= src/HexEditorGui.cpp \
src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
src/HexEditorCtrl/HexEditorCtrlGui.cpp\
src/HexEditorFrame.cpp
-LIBS = udis86/libudis86/.libs/libudis86.a hashlibpp/src/libhl++.a
+LIBS = hashlibpp/src/libhl++.a
OBJECTS=$(SOURCES:.cpp=.o)
DEPENDS=$(OBJECTS:.o=.d)
RESOURCES= resources/resource.rc
@@ -39,19 +39,19 @@ all: prepare $(EXECUTABLE)
prepare: $(LIBS) $(SOURCES)
$(EXECUTABLE): $(OBJECTS) $(LIBS)
- $(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -o $@
+ $(CPP) $(OBJECTS) $(LIBS) -ludis86 $(WXLDFLAGS) ${LDFLAGS} -o $@
.cpp.o:
- $(CPP) $(CXXFLAGS) $< -o $@
+ $(CPP) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@
%.o : %.rc
$(RC) $(RCFLAGS) $< -o $@
-udis86/libudis86/.libs/libudis86.a:
- echo Please make sure if libudis86 build for your host to avoid link time errors!
- cd udis86;./autogen.sh
- cd udis86;./configure
- cd udis86/libudis86; $(MAKE) $(MFLAGS)
+#udis86/libudis86/.libs/libudis86.a:
+# echo Please make sure if libudis86 build for your host to avoid link time errors!
+# cd udis86;./autogen.sh
+# cd udis86;./configure
+# cd udis86/libudis86; $(MAKE) $(MFLAGS)
hashlibpp/src/libhl++.a:
echo "Please make sure if libudis86 build for your host to avoid link time errors!"
@@ -61,10 +61,10 @@ win: prepare $(RESOURCES) $(EXECUTABLE_WIN)
#Stack override required for file comparison function...
$(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)
- $(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,5242880 -o $@
+ $(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,5242880 ${LDFLAGS} -o $@
maclink: $(OBJECTS)
- $(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -o $(EXECUTABLE)
+ $(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) -lexpat ${LDFLAGS} -o $(EXECUTABLE)
mac: prepare maclink
mkdir -p $(EXECUTABLE_DIR_MAC)/Contents

@ -0,0 +1,17 @@
--- a/resources/wxHexEditor.desktop
+++ b/resources/wxHexEditor.desktop
@@ -1,12 +1,11 @@
[Desktop Entry]
-Version=v1.0
+Version=1.0
Encoding=UTF-8
Name=wxHexEditor
GenericName=wxHexEditor
Comment=A hex editor for huge files and devices
Exec=wxHexEditor
-Icon=wxHexEditor.png
+Icon=wxHexEditor
Terminal=false
Type=Application
-MimeType=*
Categories=Utility;TextEditor;

@ -0,0 +1,107 @@
- respect CXXFLAGS/LDFLAGS
- install into /usr
- use system mhash and udis86
--- a/makefile
+++ b/makefile
@@ -1,8 +1,8 @@
WXCONFIG = wx-config
CC = `$(WXCONFIG) --cc`
CXX = `$(WXCONFIG) --cxx`
-CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS}
-LDFLAGS = `$(WXCONFIG) --libs`
+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -O2 -c ${OPTFLAGS}
+WXLDFLAGS = `$(WXCONFIG) --libs`
RC = `$(WXCONFIG) --rescomp`
#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
@@ -21,7 +21,7 @@ SOURCES= src/HexEditorGui.cpp \
src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
src/HexEditorCtrl/HexEditorCtrlGui.cpp\
src/HexEditorFrame.cpp
-LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
+LIBS = -ludis86 -lmhash
OBJECTS=$(SOURCES:.cpp=.o)
DEPENDS=$(OBJECTS:.o=.d)
LANGUAGEDIRS=tr
@@ -32,7 +32,7 @@ EXECUTABLE=wxHexEditor
EXECUTABLE_WIN=$(EXECUTABLE).exe
EXECUTABLE_DIR_MAC=$(EXECUTABLE).app
-PREFIX = /usr/local
+PREFIX = /usr
BINDIR = $(PREFIX)/bin
DATADIR = $(PREFIX)/share
LOCALEDIR = $(DATADIR)/locale
@@ -46,10 +46,10 @@ $(OBJECTS): $(LIBS) $(SOURCES)
MOBJECTS=$(LANGUAGES:.po=.mo)
$(EXECUTABLE): $(OBJECTS)
- $(CXX) $(OBJECTS) $(LIBS) $(LDFLAGS) -lgomp -o $@
+ $(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lgomp -o $@
.cpp.o: $(LIBS)
- $(CXX) $(CXXFLAGS) $< -o $@
+ $(CXX) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@
%.o : %.rc
$(RC) $(RCFLAGS) $< -o $@
@@ -59,23 +59,14 @@ langs: $(MOBJECTS)
%.mo : %.po
$(MSGFMT) $< -o $@
-udis86/libudis86/.libs/libudis86.a:
- cd udis86;./autogen.sh
- cd udis86;./configure --host=$(HOST)
- cd udis86/libudis86; $(MAKE) $(MFLAGS)
-
-mhash/lib/.libs/libmhash.a:
- cd mhash; ./configure --host=$(HOST)
- cd mhash; $(MAKE) $(MFLAGS)
-
win: $(RESOURCES) $(EXECUTABLE_WIN)
#Stack override required for file comparison function...
$(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)
- $(CXX) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@
+ $(CXX) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@
maclink: $(OBJECTS)
- $(CXX) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -lgomp -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)
+ $(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lexpat -lgomp -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)
mac: maclink langs
mkdir -p $(EXECUTABLE_DIR_MAC)/Contents
--- a/src/HexDialogs.cpp
+++ b/src/HexDialogs.cpp
@@ -24,7 +24,7 @@
#define NANINT 0xFFFFFFFFFFFFFFFFLL
#include "HexDialogs.h"
#include <wx/progdlg.h>
-#include "../mhash/include/mhash.h"
+#include <mhash.h>
#ifdef _OPENMP
#include <omp.h>
--- a/src/HexEditor.h
+++ b/src/HexEditor.h
@@ -25,7 +25,7 @@
#ifndef _wxHexEditor_h_
#define _wxHexEditor_h_
-#include "../mhash/include/mhash.h"
+#include <mhash.h>
#include <wx/ffile.h>
#include <wx/clipbrd.h>
--- a/src/HexPanels.h
+++ b/src/HexPanels.h
@@ -27,7 +27,7 @@
#include "HexEditorFrame.h"
#include "HexEditorCtrl/HexEditorCtrl.h"
#include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"
-#include "../udis86/udis86.h"
+#include <udis86.h>
#ifdef WX_GCH
#include <wx_pch.h>

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/wxhexeditor-0.11.ebuild,v 1.1 2011/08/19 04:44:27 dirtyepic Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild,v 1.1 2013/03/16 20:36:53 dirtyepic Exp $
EAPI="4"
EAPI="5"
WX_GTK_VER="2.8"
inherit eutils toolchain-funcs wxwidgets
@ -18,13 +18,21 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-libs/udis86
DEPEND="app-crypt/mhash
dev-libs/udis86
x11-libs/wxGTK:2.8[X]"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_PN}"
pkg_pretend() {
tc-has-openmp \
|| die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
}
src_prepare() {
# parts sent upstream : https://sourceforge.net/p/wxhexeditor/patches/8/
epatch "${FILESDIR}"/${P}-makefile.patch
tc-export CXX
# sent upstream : https://sourceforge.net/p/wxhexeditor/patches/9/
epatch "${FILESDIR}"/${P}-desktop-validation.patch
}

@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.21.ebuild,v 1.1 2013/03/09 07:43:45 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.21.ebuild,v 1.2 2013/03/16 09:27:58 ulm Exp $
EAPI=5
inherit elisp
inherit readme.gentoo elisp
DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
@ -17,10 +17,5 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbs
DOCS="ChangeLog keyword-generation.sh"
ELISP_TEXINFO="${PN}.texi"
SITEFILE="50${PN}-gentoo.el"
pkg_postinst() {
elisp-site-regen
elog "Some optional features may require installation of additional"
elog "packages, like app-portage/gentoolkit-dev for echangelog."
}
DOC_CONTENTS="Some optional features may require installation of additional
packages, like app-portage/gentoolkit-dev for echangelog."

@ -0,0 +1 @@
DIST edumips64-1.1.tar.bz2 551083 SHA256 f34031fcfe7b43a8cf73a6e5d1da23f712cb83cf9bf68c94db70c799ae61cd6c SHA512 ca4884bbdb5bb41fe96abca566500af7dc31b330390f352bc6413aacb0561f58b5e95a90e22f58d18065324c155c97bd4d79beb7769efdafc3541cc37145579c WHIRLPOOL de616182917f5436d65c388da1cf90c2f84174f4bfb446613c01ff9aa48c419dbe26c6ab71a9377fb92627cfe9fece9d5b4d335a046daa84558686db2009bac7

@ -0,0 +1,47 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/edumips64/edumips64-1.1.ebuild,v 1.1 2013/03/16 19:01:03 lxnay Exp $
EAPI="5"
JAVA_PKG_IUSE="doc test"
inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="A visual and cross-platform MIPS64 CPU Simulator"
HOMEPAGE="http://www.edumips.org"
SLOT="0"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/sphinx
dev-java/javahelp:0
>=virtual/jdk-1.6
doc? ( sys-devel/make )
test? (
dev-java/junit:4
dev-java/ant-junit4
)"
RDEPEND=">=virtual/jre-1.6"
EANT_BUILD_TARGET="slim-jar"
EANT_DOC_TARGET="htmldoc"
src_prepare() {
epatch "${FILESDIR}/${PN}-javadoc-cp.patch"
java-pkg_jar-from --build-only --into libs javahelp jhall.jar
use test && java-pkg_jar-from --build-only --into libs junit-4 junit.jar junit-4.10.jar
java-pkg-2_src_prepare
}
src_install() {
java-pkg_newjar ${PN}-${PV}-nodeps.jar ${PN}.jar
dodoc RELEASE_NOTES authors
use doc && java-pkg_dojavadoc docs/en/output/html
}
src_test() {
ANT_TASKS="ant-junit4" eant test
}

@ -0,0 +1,11 @@
--- edumips64-1.1.orig/build.xml
+++ edumips64-1.1/build.xml
@@ -24,7 +24,7 @@
<!-- Access the environment -->
<property environment="env" />
- <property name="base.classpath" value="libs:libs/junit-4.10.jar:libs/hamcrest-core-1.3.jar:${env.CLASSPATH}" />
+ <property name="base.classpath" value="libs:libs/jhall.jar:libs/junit-4.10.jar:libs/hamcrest-core-1.3.jar:${env.CLASSPATH}" />
<!-- File names -->
<property name="standalone_jar_filename" value="edumips64-${version}.jar" />

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>media-tv</herd>
<herd>java</herd>
<maintainer>
<email>cardoe@gentoo.org</email>
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224.ebuild,v 1.1 2013/02/25 18:38:17 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224.ebuild,v 1.2 2013/03/16 15:18:18 pacho Exp $
EAPI=5
inherit emul-linux-x86
@ -10,7 +10,7 @@ LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
openssl tcp_wrappers_license"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20130224.ebuild,v 1.1 2013/02/25 18:39:06 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20130224.ebuild,v 1.2 2013/03/16 15:18:41 pacho Exp $
EAPI=5
inherit emul-linux-x86 eutils multilib
@ -9,7 +9,7 @@ DESCRIPTION="32 bit lib-compat, and also libgcc_s and libstdc++ from gcc 3.3 and
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
IUSE="multilib"
DEPEND=""

@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20130224.ebuild,v 1.1 2013/02/25 18:39:41 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20130224.ebuild,v 1.2 2013/03/16 15:19:08 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="Boost-1.0 LGPL-2.1"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}"

@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20130224.ebuild,v 1.1 2013/02/25 18:40:42 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20130224.ebuild,v 1.2 2013/03/16 15:19:35 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="GPL-2 LGPL-2.1"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}"

@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20130224.ebuild,v 1.1 2013/02/25 18:41:32 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20130224.ebuild,v 1.2 2013/03/16 15:20:08 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="GPL-2 LGPL-2 LGPL-2.1"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}

@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20130224.ebuild,v 1.1 2013/02/25 18:42:21 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20130224.ebuild,v 1.2 2013/03/16 15:20:30 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}

@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20130224.ebuild,v 1.1 2013/02/25 18:43:08 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20130224.ebuild,v 1.2 2013/03/16 15:20:52 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="LGPL-2 LGPL-2.1 GPL-2"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}

@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-jna/emul-linux-x86-jna-20130224.ebuild,v 1.1 2013/02/25 18:43:57 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-jna/emul-linux-x86-jna-20130224.ebuild,v 1.2 2013/03/16 15:21:15 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="LGPL-2.1"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}"

@ -1,19 +1,20 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224.ebuild,v 1.1 2013/02/25 18:44:44 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224.ebuild,v 1.3 2013/03/16 16:56:48 ssuominen Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 MPEG-4"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
~app-emulation/emul-linux-x86-xlibs-${PV}
~app-emulation/emul-linux-x86-db-${PV}
!<=app-emulation/emul-linux-x86-sdl-20081109
!<=app-emulation/emul-linux-x86-soundlibs-20110101"
!<=app-emulation/emul-linux-x86-soundlibs-20110101
!>=media-libs/libv4l-0.8.9-r1[abi_x86_32]"
PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
src_prepare() {

@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild,v 1.2 2013/03/15 19:17:44 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild,v 1.3 2013/03/16 15:21:57 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="LGPL-2+ MIT MOTIF"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}

@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild,v 1.1 2013/02/25 18:46:13 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild,v 1.2 2013/03/16 15:22:17 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="BSD MIT LGPL-3 SGI-B-2.0"
KEYWORDS="-* ~amd64 ~amd64-linux"
KEYWORDS="-* amd64 ~amd64-linux"
DEPEND="app-admin/eselect-opengl
>=app-admin/eselect-mesa-0.0.9"

@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20130224.ebuild,v 1.2 2013/03/02 19:24:42 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20130224.ebuild,v 1.3 2013/03/16 15:22:55 pacho Exp $
EAPI=5
inherit eutils emul-linux-x86
LICENSE="LGPL-2.1 GPL-3"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
IUSE="gtkstyle"

@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20130224.ebuild,v 1.1 2013/02/25 18:48:03 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20130224.ebuild,v 1.2 2013/03/16 15:23:36 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="LGPL-2 LGPL-2.1 ZLIB"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}

@ -1,16 +1,17 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild,v 1.1 2013/02/25 18:48:52 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild,v 1.3 2013/03/16 15:23:55 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
IUSE="alsa"
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
~app-emulation/emul-linux-x86-medialibs-${PV}
!>=media-libs/libmikmod-3.2.0-r1[abi_x86_32]
!>=sci-libs/fftw-3.3.3-r1[abi_x86_32]"
src_prepare() {

@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224.ebuild,v 1.2 2013/02/26 22:59:48 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224.ebuild,v 1.3 2013/03/16 15:24:19 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="FTL GPL-2 MIT"
KEYWORDS="-* ~amd64"
KEYWORDS="-* amd64"
IUSE="opengl"
DEPEND=""

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.12.26.958366.ebuild,v 1.1 2013/01/20 12:09:12 vadimk Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.12.26.958366.ebuild,v 1.2 2013/03/15 19:48:53 floppym Exp $
EAPI="4"
@ -59,6 +59,7 @@ src_prepare() {
sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
|| die "Sed failed."
epatch "${FILESDIR}/frozen.patch"
epatch_user
}
src_configure() {

@ -7,3 +7,5 @@ DIST qemu-1.1.0-patches.tar.xz 26728 SHA256 ceae860693a027f57942bd27a0f1d8ec07ec
DIST qemu-1.1.0-r1-patches.tar.xz 27916 SHA256 f1e97bff0e7dd2155f572a09f0db407c121004412554612ebfaa29a8d3374609 SHA512 9b099833bc2936b57e8a580421a3db3e2ece12b8334d0de3e348d4d6b0ec758383429461c14bd7a17508df0834e8f281d71aa502ce2362dc87093997f45e2757 WHIRLPOOL 5f21aa0decb79f94b161f2b279099889ecbc8ee93405f206d3a026a9624c382a21bc0d37b4533823ecae57e96d853b9160799e9e00b70e6008700c0f9eda6faf
DIST qemu-1.2.2-patches.tar.xz 26520 SHA256 b4c6a7ea2cd59db49b3844aa4ce4e8cd1bdb0566aa88a606346870fd95e7d683 SHA512 094ed8b970366aa7795799eb71ef5ff0c1cb09fe4e7cb138797fc4a9084cf026f040d53caf094eab0a58e06ed6ae0bbd8dbaf1935712b835d1d27a0fad8b338d WHIRLPOOL 35e9e3eb80d74312164369983ced33e56bfe985f801f328e19e184a8bf481abefd672f2279d5b7cf10ca797a52c53389046002af1fbb0f5749a135418758fa23
DIST qemu-1.2.2.tar.bz2 9871919 SHA256 27a66629136cf6cefe4875a5d6fce04eb521cfc9e0ca2523335ca72c45be8625 SHA512 74a0040de3c03760a6aee9100acecc672853e5442e3ead3ee6abd191a61d3ed4f9157c692a6dadb8b18f86371fd62034d05ca65195703778fe17316810596915 WHIRLPOOL c54d05d7d1490a95c2c8bc60eee45b524ad9f7556a67e8de9ffc7f5ddb948a471059f31d538b8449ad8552da534c9593755292fadc9a652e38cbfcbb039f9b62
DIST qemu-1.4.0-patches.tar.xz 6056 SHA256 114ab5d8484aa589ac108f3d1884a5dd64f3bb175854b92657407f64c25b53ae SHA512 4335c86f8a3e7f67846a0c8cc02948c50ea94896049bf4447ad74e36b61d5239757b09da835abacf82ac982709e815ed78a787a53b0d633708f8b5e7741f8cbc WHIRLPOOL afc12d16b0f9b86ff22e2f8b0854e54dc4f5751759a17d4ddef959f258f066064c1bf2355e300aaab4687531a198f3b90db60400d1376d383d3e43f8c6449fd7
DIST qemu-1.4.0.tar.bz2 10419510 SHA256 066297ed77408fb7588889c271a85cf3c259ad55c939315988e6062d7708eda8 SHA512 8ad0f1409d94283303abdc80e319fcfaad7818cade7c77fcba1b1adde411726ad166c5cc62a561414afb22b3bff956c4ec0cc7d0fec36542dd86dc347506ce72 WHIRLPOOL b0ecc866dd042a8af25f49419be680d7fb313230f99036ca8f22b20663da5b669cce7be89957fb583dc75bdcf73e905d7bd31904351f05d21816137c03c5be25

@ -0,0 +1,140 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.4.0.ebuild,v 1.1 2013/03/16 12:26:24 lu_zero Exp $
EAPI=4
if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git
http://git.qemu.org/git/qemu.git"
GIT_ECLASS="git-2"
fi
PYTHON_DEPEND=2
inherit eutils base flag-o-matic pax-utils toolchain-funcs python ${GIT_ECLASS}
MY_P=${P/-user/}
if [[ ${PV} != *9999 ]]; then
SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2
http://dev.gentoo.org/~lu_zero/distfiles/qemu-${PVR}-patches.tar.xz"
KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
S="${WORKDIR}/${MY_P}"
fi
DESCRIPTION="Open source dynamic CPU translator - static user mode emulation"
HOMEPAGE="http://www.qemu.org"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
IUSE=""
RESTRICT="test"
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel
mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
for target in ${IUSE_USER_TARGETS}; do
IUSE="${IUSE} +qemu_user_targets_${target}"
done
DEPEND="app-text/texi2html
virtual/pkgconfig
sys-libs/zlib[static-libs]
dev-libs/glib[static-libs]"
RDEPEND=""
QA_WX_LOAD="
usr/bin/qemu-static-ppc64abi32-binfmt
usr/bin/qemu-static-ppc64
usr/bin/qemu-static-x86_64-binfmt
usr/bin/qemu-static-x86_64
usr/bin/qemu-static-unicore32-binfmt
usr/bin/qemu-static-m68k-binfmt
usr/bin/qemu-static-ppc-binfmt
usr/bin/qemu-static-alpha-binfmt
usr/bin/qemu-static-microblazeel-binfmt
usr/bin/qemu-static-sparc-binfmt
usr/bin/qemu-static-sparc32plus-binfmt
usr/bin/qemu-static-ppc
usr/bin/qemu-static-mipsn32el-binfmt
usr/bin/qemu-static-sh4eb-binfmt
usr/bin/qemu-static-ppc64abi32
usr/bin/qemu-static-ppc64-binfmt
usr/bin/qemu-static-armeb-binfmt
usr/bin/qemu-static-microblaze-binfmt
usr/bin/qemu-static-mips-binfmt
usr/bin/qemu-static-mipsel-binfmt
usr/bin/qemu-static-sh4-binfmt
usr/bin/qemu-static-s390x-binfmt
usr/bin/qemu-static-i386-binfmt
usr/bin/qemu-static-cris-binfmt
usr/bin/qemu-static-arm-binfmt
usr/bin/qemu-static-sparc64-binfmt
usr/bin/qemu-static-mipsn32-binfmt
"
pkg_setup() {
python_set_active_version 2
}
src_prepare() {
# prevent docs to get automatically installed
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
# Alter target makefiles to accept CFLAGS set via flag-o
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
}
src_configure() {
filter-flags -fpie -fstack-protector
local conf_opts user_targets
for target in ${IUSE_USER_TARGETS} ; do
use "qemu_user_targets_${target}" && \
user_targets="${user_targets} ${target}-linux-user"
done
conf_opts="--enable-linux-user --disable-strip"
conf_opts+=" --disable-bsd-user"
conf_opts+=" --disable-system"
conf_opts+=" --disable-vnc-tls"
conf_opts+=" --disable-curses"
conf_opts+=" --disable-sdl"
conf_opts+=" --disable-seccomp"
conf_opts+=" --disable-vde"
conf_opts+=" --prefix=/usr --sysconfdir=/etc --disable-bluez --disable-kvm"
conf_opts+=" --cc=$(tc-getCC) --host-cc=$(tc-getBUILD_CC)"
conf_opts+=" --extra-ldflags=-Wl,-z,execheap"
conf_opts+=" --disable-smartcard-nss"
conf_opts+=" --disable-strip --disable-werror"
conf_opts+=" --static"
./configure ${conf_opts} --target-list="${user_targets}" || die "econf failed"
}
src_install() {
emake DESTDIR="${ED}" install
# fixup to avoid collisions with qemu
base_dir="${ED}/usr/bin"
for qemu_bin in "${base_dir}"/qemu-{img,io,nbd}; do
rm -f ${qemu_bin}
done
for qemu_bin in "${base_dir}"/qemu-*; do
qemu_bin_name=$(basename "${qemu_bin}")
mv "${qemu_bin}" "${base_dir}"/"${qemu_bin_name/qemu-/qemu-static-}" || die
done
pax-mark r "${ED}"/usr/bin/qemu-static-*
rm -fr "${ED}/usr/share" "${ED}/usr/libexec" "${ED}/etc"
dohtml qemu-doc.html qemu-tech.html
newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
}

@ -1,4 +1,5 @@
DIST qemu-1.3.1.tar.bz2 10283677 SHA256 3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf SHA512 f371012d0c1fd5c2504ba4235ed787d897ff7b4dcf5bffc4452dd71b33394db4ec46488771927be2fc410408f69ca2c38d1edf23fca1e6767295c416ce98c588 WHIRLPOOL fb440dffca62c48a2644592ecdcd352349852fa67e5aa1c8cec45c86e599ef74cccc3a0464977cefebf311fea98a65e9035b5f87fa0dcdf87034b8a71d675627
DIST qemu-1.4.0-4114896d.tar.xz 25852 SHA256 9df38a4a7a595093e88b63a112bb06af4bb27ae18078076f39a0ed6eed02e741 SHA512 ed291bc2046ffc345941fc61a7c406e146582475f3b59a57c91eec3dd0aebba32911698a38d8cf68e939791e1dddf0f052e39fe0631c10a0810eb68bb22abc0e WHIRLPOOL 5a13293d039384ba356ca0a184ea10eb4692c88d7a6290886c589cab3a4271eabc33a090d9453169c723badea2c11fb003ae4414471e161c072235ea82b78ff1
DIST qemu-1.4.0-ebc00c94.tar.xz 6752 SHA256 be9574d8df4e3876f40921857b43fdcd62813ab86d496d7af0591aa3978f43ac SHA512 ae47e7dedf314630810e714106cc924a0449b2cdc7a4c7f464f82264311dad916737282a4782abd1479063cd312fec4618ea0416bb959fe4e550435e0bdb56cd WHIRLPOOL 57e31b5e1b947d3ddc9c6f3bf8529ab67b0e80602ffd06bf122be0ce0a1f13f317beed1f1cc8e89192fd5bd4ac7392beab11f10cb0fb6837997a40cb7e216d99
DIST qemu-1.4.0.tar.bz2 10419510 SHA256 066297ed77408fb7588889c271a85cf3c259ad55c939315988e6062d7708eda8 SHA512 8ad0f1409d94283303abdc80e319fcfaad7818cade7c77fcba1b1adde411726ad166c5cc62a561414afb22b3bff956c4ec0cc7d0fec36542dd86dc347506ce72 WHIRLPOOL b0ecc866dd042a8af25f49419be680d7fb313230f99036ca8f22b20663da5b669cce7be89957fb583dc75bdcf73e905d7bd31904351f05d21816137c03c5be25
DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596f7c7d3c0e18fb216cb2b2026af40 SHA512 781eae1fdc1cb7482d3d6fd1cf81e0d565588e3987fc4cab92abc06741b1b57d999b0de1fffce7270f50033b53c5707e4ef477ca3b7ddfca3dc1a432c1e15cc7 WHIRLPOOL 3f80b4cc9902021686bea823a41af136d21dd5a6b8aa59913aeb8697c3a38acc02d92ee59b9d052b6d161830a72d709fe684beb95f756a92216fe79cce4c5d9a

@ -12,6 +12,9 @@
<flag name='brltty'>Adds support for braille displays using brltty</flag>
<flag name='curl'>Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
<flag name='fdt'>Enables firmware device tree support</flag>
<flag name='iscsi'>Enable direct iSCSI support via
<pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux
block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag>
<flag name='mixemu'>Enable audio mixer emulation. On Fedora, known to cause performance problems when using SDL output and ALSA. For OSS, locks the sound device from other applications.</flag>
<flag name='ncurses'>Enable the ncurses-based console</flag>
<flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>

@ -0,0 +1,510 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0-r1.ebuild,v 1.1 2013/03/17 04:20:35 cardoe Exp $
EAPI=5
PYTHON_DEPEND="2:2.4"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python \
user udev fcaps
BACKPORTS=4114896d
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
inherit git-2
SRC_URI=""
KEYWORDS=""
else
SRC_URI="http://wiki.qemu-project.org/download//${P}.tar.bz2
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
HOMEPAGE="http://www.linux-kvm.org"
LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt iscsi +jpeg \
kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
virtfs +vnc xattr xen xfs"
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
# Setup the default SoftMMU targets, while using the loops
# below to setup the other targets.
REQUIRED_USE="|| ("
for target in ${IUSE_SOFTMMU_TARGETS}; do
IUSE="${IUSE} qemu_softmmu_targets_${target}"
REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
done
REQUIRED_USE="${REQUIRED_USE} )"
for target in ${IUSE_USER_TARGETS}; do
IUSE="${IUSE} qemu_user_targets_${target}"
done
# Block USE flag configurations known to not work
REQUIRED_USE="${REQUIRED_USE}
static? ( static-softmmu static-user )
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl )
virtfs? ( xattr )"
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sys-apps/pciutils[static-libs(+)]
sys-libs/zlib[static-libs(+)]
>=x11-libs/pixman-0.28.0[static-libs(+)]
aio? ( dev-libs/libaio[static-libs(+)] )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
jpeg? ( virtual/jpeg[static-libs(+)] )
ncurses? ( sys-libs/ncurses[static-libs(+)] )
png? ( media-libs/libpng[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
xattr? ( sys-apps/attr[static-libs(+)] )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
!app-emulation/kqemu
qemu_softmmu_targets_i386? (
sys-firmware/ipxe
~sys-firmware/seabios-1.7.2
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
qemu_softmmu_targets_x86_64? (
sys-firmware/ipxe
~sys-firmware/seabios-1.7.2
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
brltty? ( app-accessibility/brltty )
iscsi? ( net-libs/libiscsi )
opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
python? ( =dev-lang/python-2*[ncurses] )
sdl? ( media-libs/libsdl[X] )
selinux? ( sec-policy/selinux-qemu )
smartcard? ( dev-libs/nss !app-emulation/libcacard )
spice? ( >=app-emulation/spice-protocol-0.12.3 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
xen? ( app-emulation/xen-tools )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-text/texi2html )
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
static-softmmu? ( ${LIB_DEPEND} )
test? (
dev-libs/glib[utils]
sys-devel/bc
)"
STRIP_MASK="/usr/share/qemu/palcode-clipper"
QA_PREBUILT="
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper"
QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
usr/bin/qemu-cris
usr/bin/qemu-m68k
usr/bin/qemu-microblaze
usr/bin/qemu-microblazeel
usr/bin/qemu-mips
usr/bin/qemu-mipsel
usr/bin/qemu-or32
usr/bin/qemu-ppc
usr/bin/qemu-ppc64
usr/bin/qemu-ppc64abi32
usr/bin/qemu-sh4
usr/bin/qemu-sh4eb
usr/bin/qemu-sparc
usr/bin/qemu-sparc64
usr/bin/qemu-armeb
usr/bin/qemu-sparc32plus
usr/bin/qemu-s390x
usr/bin/qemu-unicore32"
qemu_support_kvm() {
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
use qemu_softmmu_targets_s390x; then
return 0
fi
return 1
}
pkg_pretend() {
if use kernel_linux && kernel_is lt 2 6 25; then
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
elif use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
else
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
ERROR_KVM="You must enable KVM in your kernel to continue"
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
ERROR_KVM_AMD+=" your kernel configuration."
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
ERROR_TUN+=" into your kernel or loaded as a module to use the"
ERROR_TUN+=" virtual network device if using -net tap."
ERROR_BRIDGE="You will also need support for 802.1d"
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
ERROR_VHOST_NET+=" support"
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
fi
use python && CONFIG_CHECK+=" ~DEBUG_FS"
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
# Now do the actual checks setup above
check_extra_config
fi
fi
}
pkg_setup() {
python_set_active_version 2
python_pkg_setup
enewgroup kvm 78
}
src_prepare() {
# Alter target makefiles to accept CFLAGS set via flag-o
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
python_convert_shebangs -r 2 "${S}/scripts/kvm/vmxcap"
epatch "${FILESDIR}"/qemu-9999-cflags.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
# Fix ld and objcopy being called directly
tc-export LD OBJCOPY
# Verbose builds
MAKEOPTS+=" V=1"
epatch_user
}
##
# configures qemu based on the build directory and the build type
# we are using.
#
qemu_src_configure() {
debug-print-function $FUNCNAME "$@"
local buildtype=$1
local builddir=$2
local conf_opts audio_opts
local static_flag="static-${buildtype}"
conf_opts="--prefix=/usr"
conf_opts+=" --sysconfdir=/etc"
conf_opts+=" --libdir=/usr/$(get_libdir)"
conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
conf_opts+=" --disable-bsd-user"
conf_opts+=" --disable-guest-agent"
conf_opts+=" --disable-strip"
conf_opts+=" --disable-werror"
conf_opts+=" --python=python2"
# audio options
audio_opts="oss"
use alsa && audio_opts="alsa,${audio_opts}"
use sdl && audio_opts="sdl,${audio_opts}"
use pulseaudio && audio_opts="pa,${audio_opts}"
if [[ ${buildtype} == "user" ]]; then
conf_opts+=" --enable-linux-user"
conf_opts+=" --disable-system"
conf_opts+=" --target-list=${user_targets}"
conf_opts+=" --disable-blobs"
conf_opts+=" --disable-bluez"
conf_opts+=" --disable-curses"
conf_opts+=" --disable-kvm"
conf_opts+=" --disable-libiscsi"
conf_opts+=" $(use_enable seccomp)"
conf_opts+=" --disable-sdl"
conf_opts+=" --disable-smartcard-nss"
conf_opts+=" --disable-tools"
conf_opts+=" --disable-vde"
fi
if [[ ${buildtype} == "softmmu" ]]; then
conf_opts+=" --disable-linux-user"
conf_opts+=" --enable-system"
conf_opts+=" --with-system-pixman"
conf_opts+=" --target-list=${softmmu_targets}"
conf_opts+=" $(use_enable bluetooth bluez)"
conf_opts+=" $(use_enable sdl)"
conf_opts+=" $(use_enable aio linux-aio)"
conf_opts+=" $(use_enable brltty brlapi)"
conf_opts+=" $(use_enable caps cap-ng)"
conf_opts+=" $(use_enable curl)"
conf_opts+=" $(use_enable fdt)"
conf_opts+=" $(use_enable iscsi libiscsi)"
conf_opts+=" $(use_enable jpeg vnc-jpeg)"
conf_opts+=" $(use_enable kernel_linux kvm)"
conf_opts+=" $(use_enable kernel_linux nptl)"
conf_opts+=" $(use_enable ncurses curses)"
conf_opts+=" $(use_enable opengl)"
conf_opts+=" $(use_enable png vnc-png)"
conf_opts+=" $(use_enable rbd)"
conf_opts+=" $(use_enable sasl vnc-sasl)"
conf_opts+=" $(use_enable seccomp)"
conf_opts+=" $(use_enable smartcard smartcard-nss)"
conf_opts+=" $(use_enable spice)"
conf_opts+=" $(use_enable tls vnc-tls)"
conf_opts+=" $(use_enable tls vnc-ws)"
conf_opts+=" $(use_enable usbredir usb-redir)"
conf_opts+=" $(use_enable uuid)"
conf_opts+=" $(use_enable vde)"
conf_opts+=" $(use_enable vhost-net)"
conf_opts+=" $(use_enable virtfs)"
conf_opts+=" $(use_enable vnc)"
conf_opts+=" $(use_enable xattr attr)"
conf_opts+=" $(use_enable xen)"
conf_opts+=" $(use_enable xen xen-pci-passthrough)"
conf_opts+=" $(use_enable xfs xfsctl)"
use mixemu && conf_opts+=" --enable-mixemu"
conf_opts+=" --audio-drv-list=${audio_opts}"
conf_opts+=" --enable-migration-from-qemu-kvm"
fi
conf_opts+=" $(use_enable debug debug-info)"
conf_opts+=" $(use_enable debug debug-tcg)"
conf_opts+=" $(use_enable doc docs)"
conf_opts+=" $(use_enable tci tcg-interpreter)"
# Add support for SystemTAP
use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
# Add support for static builds
use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if
# the current GCC doesn't have PIE support.
if ! use ${static_flag} && gcc-specs-pie; then
conf_opts="${conf_opts} --enable-pie"
fi
einfo "./configure ${conf_opts}"
cd ${builddir}
../configure \
--cc="$(tc-getCC)" \
--host-cc="$(tc-getBUILD_CC)" \
${conf_opts} \
|| die "configure failed"
# FreeBSD's kernel does not support QEMU assigning/grabbing
# host USB devices yet
use kernel_FreeBSD && \
sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
}
src_configure() {
softmmu_targets=
user_targets=
for target in ${IUSE_SOFTMMU_TARGETS} ; do
use "qemu_softmmu_targets_${target}" && \
softmmu_targets="${softmmu_targets},${target}-softmmu"
done
for target in ${IUSE_USER_TARGETS} ; do
use "qemu_user_targets_${target}" && \
user_targets="${user_targets},${target}-linux-user"
done
[[ -n ${softmmu_targets} ]] && \
einfo "Building the following softmmu targets: ${softmmu_targets}"
[[ -n ${user_targets} ]] && \
einfo "Building the following user targets: ${user_targets}"
if [[ -n ${softmmu_targets} ]]; then
mkdir "${S}/softmmu-build"
qemu_src_configure "softmmu" "${S}/softmmu-build"
fi
if [[ -n ${user_targets} ]]; then
mkdir "${S}/user-build"
qemu_src_configure "user" "${S}/user-build"
fi
}
src_compile() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
default
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
default
fi
}
src_test() {
cd "${S}/softmmu-build"
emake -j1 check
}
src_install() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
emake DESTDIR="${ED}" install
# Install binfmt handler init script for user targets
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
if use test; then
dohtml check-report.html
fi
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
fi
if use qemu_softmmu_targets_x86_64 ; then
newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
ewarn "your libvirt configs or other wrappers for ${PN}"
elif use x86 || use amd64; then
elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
elog "of the /usr/bin/qemu-kvm script."
fi
use python && dobin "${S}/scripts/kvm/kvm_stat"
use python && dobin "${S}/scripts/kvm/vmxcap"
fi
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
cd "${S}"
dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
fi
# Remove vgabios since we're using the vgabios packaged one
rm "${ED}/usr/share/qemu/vgabios.bin"
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
fi
# Remove sgabios since we're using the sgabios packaged one
rm "${ED}/usr/share/qemu/sgabios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
fi
# Remove iPXE since we're using the iPXE packaged one
rm "${ED}"/usr/share/qemu/pxe-*.rom
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
fi
}
pkg_postinst() {
local virtfs_caps=
if qemu_support_kvm; then
elog "If you don't have kvm compiled into the kernel, make sure you have"
elog "the kernel module loaded before running kvm. The easiest way to"
elog "ensure that the kernel module is loaded is to load it on boot."
elog "For AMD CPUs the module is called 'kvm-amd'"
elog "For Intel CPUs the module is called 'kvm-intel'"
elog "Please review /etc/conf.d/modules for how to load these"
elog
elog "Make sure your user is in the 'kvm' group"
elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
elog
fi
virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
}
pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
echo " $(best_version sys-firmware/ipxe)"
echo " $(best_version sys-firmware/seabios)"
if has_version sys-firmware/seabios[binary]; then
echo " USE=binary"
else
echo " USE=''"
fi
echo " $(best_version sys-firmware/vgabios)"
}

@ -1,10 +1,9 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenstored.initd,v 1.2 2011/04/05 21:25:03 alexxy Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenstored.initd,v 1.3 2013/03/16 16:46:57 idella4 Exp $
depend() {
need net
before xendomains xend sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild,v 1.1 2012/10/17 02:10:11 naota Exp $
# $Header: /var/cvsroot/gentoo-x86/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild,v 1.3 2013/03/16 08:31:45 ago Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="+nls static-libs"
DEPEND="nls? ( sys-devel/gettext )"

@ -0,0 +1,25 @@
From 75cb1897a9eabd6acf280cade2ecffb1554380db Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <rrs@researchut.com>
Date: Mon, 5 Nov 2012 04:07:26 +0530
Subject: [PATCH 01/20] Do not ship the board-specific/ folder in default
installs
---
install.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/install.sh b/install.sh
index 322e784..536a63a 100755
--- a/install.sh
+++ b/install.sh
@@ -112,7 +112,6 @@ $INSTALL -d -m 755 "$DESTDIR/usr/share/laptop-mode-tools/modules"
$INSTALL -d -m 755 "$DESTDIR/usr/share/laptop-mode-tools/module-helpers"
$INSTALL -d -m 755 "$DESTDIR/usr/lib/tmpfiles.d"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/conf.d"
-$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/conf.d/board-specific"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/modules"
$INSTALL -d -m 755 "$DESTDIR/usr/sbin"
$INSTALL -d -m 755 "$DESTDIR/lib/udev"
--
1.8.1.5

@ -0,0 +1,72 @@
From 58ae05221b12192e48fb4801b6b93c88797985ea Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <rrs@debian.org>
Date: Sun, 10 Mar 2013 13:43:19 +0530
Subject: [PATCH 04/20] add $LIB_D so it can give the possibility to install
udev/system files in different location
Thanks: Robert Milasan
---
etc/rules/99-laptop-mode.rules | 6 +++---
install.sh | 15 +++++++++------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/etc/rules/99-laptop-mode.rules b/etc/rules/99-laptop-mode.rules
index c0b4761..96d5d68 100644
--- a/etc/rules/99-laptop-mode.rules
+++ b/etc/rules/99-laptop-mode.rules
@@ -1,3 +1,3 @@
-ACTION=="change", SUBSYSTEM=="power_supply", RUN+="/lib/udev/lmt-udev auto"
-ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="/lib/udev/lmt-udev auto"
-ACTION=="add", SUBSYSTEM=="usb", RUN+="/lib/udev/lmt-udev force modules=usb-autosuspend devices=%k"
+ACTION=="change", SUBSYSTEM=="power_supply", RUN+="@LIB_D@/udev/lmt-udev auto"
+ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="@LIB_D@/udev/lmt-udev auto"
+ACTION=="add", SUBSYSTEM=="usb", RUN+="@LIB_D@/udev/lmt-udev force modules=usb-autosuspend devices=%k"
diff --git a/install.sh b/install.sh
index 536a63a..cde2a0a 100755
--- a/install.sh
+++ b/install.sh
@@ -28,6 +28,7 @@
#
[ -z "$MAN_D" ] && MAN_D="/usr/man"
+[ -z "$LIB_D" ] && LIB_D="/lib"
if [ -z "$ACPI" ] ; then
ACPI=auto
@@ -114,8 +115,8 @@ $INSTALL -d -m 755 "$DESTDIR/usr/lib/tmpfiles.d"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/conf.d"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/modules"
$INSTALL -d -m 755 "$DESTDIR/usr/sbin"
-$INSTALL -d -m 755 "$DESTDIR/lib/udev"
-$INSTALL -d -m 755 "$DESTDIR/lib/systemd/system"
+$INSTALL -d -m 755 "$DESTDIR/$LIB_D/udev"
+$INSTALL -d -m 755 "$DESTDIR/$LIB_D/systemd/system"
$INSTALL -d -m 755 "$DESTDIR/$MAN_D/man8"
ALREADY_EXISTED=0
@@ -200,16 +201,18 @@ fi
if ( ! $INSTALL -D -m 644 etc/rules/99-laptop-mode.rules "$DESTDIR/etc/udev/rules.d/99-laptop-mode.rules" ) ; then
echo "$0: Failed to install udev rule into /etc/udev/rules.d/ Installation failed."
exit 23
+else
+ sed -i -e "s|@LIB_D@|$LIB_D|g" $DESTDIR/etc/udev/rules.d/99-laptop-mode.rules >/dev/null 2>&1
fi
# udev helper tool
-if ( ! $INSTALL -D -m 755 etc/rules/lmt-udev "$DESTDIR/lib/udev/lmt-udev" ) ; then
- echo "$0: Failed to install udev helper tool into /lib/udev/ Installation failed."
+if ( ! $INSTALL -D -m 755 etc/rules/lmt-udev "$DESTDIR/$LIB_D/udev/lmt-udev" ) ; then
+ echo "$0: Failed to install udev helper tool into $LIB_D/udev Installation failed."
fi
# systemd service
-if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.service "$DESTDIR/lib/systemd/system/laptop-mode.service" ) ; then
- echo "$0: Failed to install systemd service into /lib/systemd/system/ Installation failed."
+if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.service "$DESTDIR/$LIB_D/systemd/system/laptop-mode.service" ) ; then
+ echo "$0: Failed to install systemd service into $LIB_D/systemd/system/ Installation failed."
fi
# and systemd's tmpfiles.d
--
1.8.1.5

@ -0,0 +1,50 @@
From fedcb181446734d5bf22e878fcde0d60e9edbcc8 Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <rrs@debian.org>
Date: Sun, 10 Mar 2013 16:29:16 +0530
Subject: [PATCH 08/20] Re-order the check because HAL is deprecated
And for backward compatibility, still have the HAL check with the fix.
Thanks: Pacho Ramos
---
usr/sbin/laptop_mode | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/usr/sbin/laptop_mode b/usr/sbin/laptop_mode
index 35b3b08..6ef1e41 100755
--- a/usr/sbin/laptop_mode
+++ b/usr/sbin/laptop_mode
@@ -670,20 +670,20 @@ lmt_main_function ()
fi
if [ "$ENABLE_LAPTOP_MODE_WHEN_LID_CLOSED" -ne 0 -a "$ACTIVATE" -eq 0 ] ; then
- if [ -x "`which hal-find-by-property`" ] ; then
- HAL_LID_BUTTON=$(hal-find-by-property --key "button.type" --string "lid")
- fi
- if [ "$HAL_LID_BUTTON" != "" ] ; then
- HAL_LID_BUTTON_STATE=$(hal-get-property --udi $(hal-find-by-property --key "button.type" --string "lid") --key "button.state.value")
- if [ "$HAL_LID_BUTTON_STATE" = "true" ] ; then
- log "VERBOSE" "Setting action to \"start\" because the lid is closed (says HAL)."
- ACTIVATE=1
- fi
- elif [ -f /proc/acpi/button/lid/*/state ] ; then
+ if [ -f /proc/acpi/button/lid/*/state ] ; then
if ( grep -q "closed" /proc/acpi/button/lid/*/state ) ; then
log "VERBOSE" 'Setting action to "start" because the lid is closed (says /proc/acpi/button/lid/*/state).'
ACTIVATE=1
fi
+ elif ( which hal-find-by-property >/dev/null ) ; then
+ HAL_LID_BUTTON=$($HAL_FIND_BY_PROPERTY --key "button.type" --string "lid")
+ if [ "$HAL_LID_BUTTON" != "" ] ; then
+ HAL_LID_BUTTON_STATE=$(hal-get-property --udi $(hal-find-by-property --key "button.type" --string "lid") --key "button.state.value")
+ if [ "$HAL_LID_BUTTON_STATE" = "true" ] ; then
+ log "VERBOSE" "Setting action to \"start\" because the lid is closed (says HAL)."
+ ACTIVATE=1
+ fi
+ fi
else
log "MSG" "Warning: ENABLE_LAPTOP_MODE_WHEN_LID_CLOSED is set, but there is no file"
log "MSG" "/proc/acpi/button/lid/.../state, and hal information is not available either!"
--
1.8.1.5

@ -0,0 +1,22 @@
From 5ffc55928bd482872fbf6b7ffc67b4cd173f400b Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <rrs@debian.org>
Date: Sat, 16 Mar 2013 16:04:00 +0530
Subject: [PATCH 14/20] Kick the power savings back in, as soon as the stick is
unplugged
---
etc/rules/99-laptop-mode.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/rules/99-laptop-mode.rules b/etc/rules/99-laptop-mode.rules
index 96d5d68..8ff8218 100644
--- a/etc/rules/99-laptop-mode.rules
+++ b/etc/rules/99-laptop-mode.rules
@@ -1,3 +1,3 @@
ACTION=="change", SUBSYSTEM=="power_supply", RUN+="@LIB_D@/udev/lmt-udev auto"
ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="@LIB_D@/udev/lmt-udev auto"
-ACTION=="add", SUBSYSTEM=="usb", RUN+="@LIB_D@/udev/lmt-udev force modules=usb-autosuspend devices=%k"
+ACTION=="add|remove", SUBSYSTEM=="usb", RUN+="@LIB_D@/udev/lmt-udev force modules=usb-autosuspend devices=%k"
--
1.8.1.5

@ -0,0 +1,28 @@
From a5f59bfeed1d486a81bebc85171210909d2c981f Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <rrs@debian.org>
Date: Sat, 16 Mar 2013 16:10:36 +0530
Subject: [PATCH 15/20] Don't hardcode the path
There's no need to hardcode the path. From my tests, it shows that udev
does a lookup in /lib/udev/ anyways.
This will also help in cases where udev/systemd stores rules in
/usr/lib/
---
etc/rules/99-laptop-mode.rules | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/rules/99-laptop-mode.rules b/etc/rules/99-laptop-mode.rules
index 8ff8218..0565644 100644
--- a/etc/rules/99-laptop-mode.rules
+++ b/etc/rules/99-laptop-mode.rules
@@ -1,3 +1,3 @@
-ACTION=="change", SUBSYSTEM=="power_supply", RUN+="@LIB_D@/udev/lmt-udev auto"
-ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="@LIB_D@/udev/lmt-udev auto"
-ACTION=="add|remove", SUBSYSTEM=="usb", RUN+="@LIB_D@/udev/lmt-udev force modules=usb-autosuspend devices=%k"
+ACTION=="change", SUBSYSTEM=="power_supply", RUN+="lmt-udev auto"
+ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="lmt-udev auto"
+ACTION=="add|remove", SUBSYSTEM=="usb", RUN+="lmt-udev force modules=usb-autosuspend devices=%k"
--
1.8.1.5

@ -0,0 +1,25 @@
From 7bde97466a824bdec0f2f4bc545e9790eac62e41 Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <rrs@debian.org>
Date: Sat, 16 Mar 2013 16:35:19 +0530
Subject: [PATCH 16/20] show the errors, if any
---
install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install.sh b/install.sh
index cde2a0a..b36c8ca 100755
--- a/install.sh
+++ b/install.sh
@@ -202,7 +202,7 @@ if ( ! $INSTALL -D -m 644 etc/rules/99-laptop-mode.rules "$DESTDIR/etc/udev/rule
echo "$0: Failed to install udev rule into /etc/udev/rules.d/ Installation failed."
exit 23
else
- sed -i -e "s|@LIB_D@|$LIB_D|g" $DESTDIR/etc/udev/rules.d/99-laptop-mode.rules >/dev/null 2>&1
+ sed -i -e "s|@LIB_D@|$LIB_D|g" $DESTDIR/etc/udev/rules.d/99-laptop-mode.rules
fi
# udev helper tool
--
1.8.1.5

@ -0,0 +1,36 @@
From 8c0db5f5fa48ca3580bc3f7fe9fdea346857c20e Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <rrs@debian.org>
Date: Sat, 16 Mar 2013 17:00:27 +0530
Subject: [PATCH 17/20] Initialize variables early, before being referenced
---
usr/sbin/laptop_mode | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/usr/sbin/laptop_mode b/usr/sbin/laptop_mode
index bc1d02a..48e6ad4 100755
--- a/usr/sbin/laptop_mode
+++ b/usr/sbin/laptop_mode
@@ -508,6 +508,9 @@ lmt_load_config ()
fi
+ INIT=0 # Display info in init script format?
+ FORCE=0 # Force reapplying the current state?
+ INITSCRIPT_STOP=0 # Track stop command from init script. Consumer is lm-polling daemon
# Evaluate options passed to laptop_mode in here
if [ "$1" = "status" ] ; then
@@ -599,9 +602,6 @@ lmt_load_config ()
exit 1
fi
- INIT=0 # Display info in init script format?
- FORCE=0 # Force reapplying the current state?
- INITSCRIPT_STOP=0 # Track stop command from init script. Consumer is lm-polling daemon
while [ "$1" != "" ] ; do
case "$1" in
init) INIT=1 ;;
--
1.8.1.5

@ -0,0 +1,26 @@
From 7fb36a367d5faa935b31b2191e7255149c8a9823 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Sat, 16 Mar 2013 23:42:21 +0200
Subject: [PATCH 18/20] install: remove unused substitute for udev rule
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
install.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/install.sh b/install.sh
index b36c8ca..900a596 100755
--- a/install.sh
+++ b/install.sh
@@ -201,8 +201,6 @@ fi
if ( ! $INSTALL -D -m 644 etc/rules/99-laptop-mode.rules "$DESTDIR/etc/udev/rules.d/99-laptop-mode.rules" ) ; then
echo "$0: Failed to install udev rule into /etc/udev/rules.d/ Installation failed."
exit 23
-else
- sed -i -e "s|@LIB_D@|$LIB_D|g" $DESTDIR/etc/udev/rules.d/99-laptop-mode.rules
fi
# udev helper tool
--
1.8.1.5

@ -0,0 +1,53 @@
From 2113b1d1919a08fb1f8877e909a9b28c631bb138 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Sat, 16 Mar 2013 23:40:56 +0200
Subject: [PATCH 19/20] install: use customizable udev directory
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
install.sh | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/install.sh b/install.sh
index 900a596..85a7cd4 100755
--- a/install.sh
+++ b/install.sh
@@ -29,6 +29,7 @@
[ -z "$MAN_D" ] && MAN_D="/usr/man"
[ -z "$LIB_D" ] && LIB_D="/lib"
+[ -z "$UDEV_D" ] && UDEV_D="$LIB_D/udev"
if [ -z "$ACPI" ] ; then
ACPI=auto
@@ -115,7 +116,7 @@ $INSTALL -d -m 755 "$DESTDIR/usr/lib/tmpfiles.d"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/conf.d"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/modules"
$INSTALL -d -m 755 "$DESTDIR/usr/sbin"
-$INSTALL -d -m 755 "$DESTDIR/$LIB_D/udev"
+$INSTALL -d -m 755 "$DESTDIR/$UDEV_D/rules.d"
$INSTALL -d -m 755 "$DESTDIR/$LIB_D/systemd/system"
$INSTALL -d -m 755 "$DESTDIR/$MAN_D/man8"
@@ -198,14 +199,14 @@ if [ -f "$DESTDIR/usr/lib/pm-utils/sleep.d/99laptop-mode" ]; then
fi
# udev rule
-if ( ! $INSTALL -D -m 644 etc/rules/99-laptop-mode.rules "$DESTDIR/etc/udev/rules.d/99-laptop-mode.rules" ) ; then
- echo "$0: Failed to install udev rule into /etc/udev/rules.d/ Installation failed."
+if ( ! $INSTALL -D -m 644 etc/rules/99-laptop-mode.rules "$DESTDIR/$UDEV_D/rules.d/99-laptop-mode.rules" ) ; then
+ echo "$0: Failed to install udev rule into $UDEV_D/rules.d/ Installation failed."
exit 23
fi
# udev helper tool
-if ( ! $INSTALL -D -m 755 etc/rules/lmt-udev "$DESTDIR/$LIB_D/udev/lmt-udev" ) ; then
- echo "$0: Failed to install udev helper tool into $LIB_D/udev Installation failed."
+if ( ! $INSTALL -D -m 755 etc/rules/lmt-udev "$DESTDIR/$UDEV_D/lmt-udev" ) ; then
+ echo "$0: Failed to install udev helper tool into $UDEV_D Installation failed."
fi
# systemd service
--
1.8.1.5

@ -0,0 +1,68 @@
From 523a3fdbf3d7bd897b0fe55fb6da50758eb83b7e Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Sun, 17 Mar 2013 00:09:50 +0200
Subject: [PATCH 20/20] install: make systemd optional and configurable
locations
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
install.sh | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/install.sh b/install.sh
index 85a7cd4..ed019f7 100755
--- a/install.sh
+++ b/install.sh
@@ -30,6 +30,9 @@
[ -z "$MAN_D" ] && MAN_D="/usr/man"
[ -z "$LIB_D" ] && LIB_D="/lib"
[ -z "$UDEV_D" ] && UDEV_D="$LIB_D/udev"
+[ -z "$SYSTEMD" ] && SYSTEMD="yes"
+[ -z "$SYSTEMD_UNIT_D" ] && SYSTEMD_UNIT_D="$LIB_D/systemd/system"
+[ -z "$TMPFILES_D" ] && TMPFILES_D="$LIB_D/tmpfiles.d"
if [ -z "$ACPI" ] ; then
ACPI=auto
@@ -112,12 +115,10 @@ $INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/nolm-ac-start"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/nolm-ac-stop"
$INSTALL -d -m 755 "$DESTDIR/usr/share/laptop-mode-tools/modules"
$INSTALL -d -m 755 "$DESTDIR/usr/share/laptop-mode-tools/module-helpers"
-$INSTALL -d -m 755 "$DESTDIR/usr/lib/tmpfiles.d"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/conf.d"
$INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/modules"
$INSTALL -d -m 755 "$DESTDIR/usr/sbin"
$INSTALL -d -m 755 "$DESTDIR/$UDEV_D/rules.d"
-$INSTALL -d -m 755 "$DESTDIR/$LIB_D/systemd/system"
$INSTALL -d -m 755 "$DESTDIR/$MAN_D/man8"
ALREADY_EXISTED=0
@@ -209,14 +210,19 @@ if ( ! $INSTALL -D -m 755 etc/rules/lmt-udev "$DESTDIR/$UDEV_D/lmt-udev" ) ; the
echo "$0: Failed to install udev helper tool into $UDEV_D Installation failed."
fi
-# systemd service
-if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.service "$DESTDIR/$LIB_D/systemd/system/laptop-mode.service" ) ; then
- echo "$0: Failed to install systemd service into $LIB_D/systemd/system/ Installation failed."
-fi
+if [ "${SYSTEMD}" = "yes" ]; then
+ $INSTALL -d -m 755 "$DESTDIR/$SYSTEMD_UNIT_D"
+ $INSTALL -d -m 755 "$DESTDIR/$TMPFILES_D"
+
+ # systemd service
+ if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.service "$DESTDIR/$SYSTEMD_UNIT_D/laptop-mode.service" ) ; then
+ echo "$0: Failed to install systemd service into $SYSTEMD_UNIT_D Installation failed."
+ fi
-# and systemd's tmpfiles.d
-if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.conf.tmpfiles "$DESTDIR/usr/lib/tmpfiles.d/laptop-mode.conf" ) ; then
- echo "$0: Failed to install systemd tmpfiles into /usr/lib/tmpfiles.d/ Installation failed."
+ # and systemd's tmpfiles.d
+ if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.conf.tmpfiles "$DESTDIR/${TMPFILES_D}/laptop-mode.conf" ) ; then
+ echo "$0: Failed to install systemd tmpfiles into ${TMPFILES_D} Installation failed."
+ fi
fi
ACPI_DONE=0
--
1.8.1.5

@ -0,0 +1,94 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.62-r2.ebuild,v 1.1 2013/03/16 22:53:01 alonbl Exp $
EAPI=5
inherit eutils multilib systemd udev
MY_P=${PN}_${PV}
DESCRIPTION="Linux kernel laptop_mode user-space utilities"
HOMEPAGE="http://www.samwel.tk/laptop_mode/"
SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="+acpi apm bluetooth scsi systemd"
RDEPEND="net-wireless/wireless-tools
sys-apps/ethtool
sys-apps/hdparm
acpi? ( sys-power/acpid )
apm? ( sys-apps/apmd )
bluetooth? ( net-wireless/bluez:= )
scsi? ( sys-apps/sdparm )
systemd? ( sys-apps/systemd )"
DEPEND=""
S=${WORKDIR}/${MY_P}
src_prepare() {
# This should avoid conflict with pm-powersave wrt #327443 and #396703
cat <<-EOF > "${T}"/${PN}
HOOK_BLACKLIST="00powersave"
EOF
epatch "${FILESDIR}/${PV}"/*.patch
}
src_compile() { :; }
src_install() {
DESTDIR="${D}" \
INIT_D="none" \
MAN_D="/usr/share/man" \
LIB_D="/usr/$(get_libdir)" \
UDEV_D="$(udev_get_udevdir)" \
SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
ACPI="$(use acpi && echo force || echo disabled)" \
PMU="$(false && echo force || echo disabled)" \
APM="$(use apm && echo force || echo disabled)" \
SYSTEMD="$(use systemd && echo yes || echo no)" \
sh ./install.sh || die
dodoc Documentation/*.txt README
newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
# See src_prepare()
insinto /etc/pm/config.d
doins "${T}"/${PN}
}
pkg_postinst() {
if use acpi || use apm; then
if use acpi; then
daemon_name="acpid"
elif use apm; then
deamon_name="apmd"
fi
if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
ewarn "To enable automatic power state event handling,"
ewarn "e.g. enabling laptop_mode after unplugging the battery,"
ewarn "both laptop_mode and the ${daemon_name} daemon must be"
ewarn "added to default runlevel:"
if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
ewarn "# rc-update add laptop_mode default"
fi
if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
ewarn "# rc-update add ${daemon_name} default"
fi
fi
else
ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
ewarn "automatically disable laptop_mode on low battery."
ewarn
ewarn "This means you can lose up to 10 minutes of work if running"
ewarn "out of battery while laptop_mode is enabled."
ewarn
ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
ewarn "information."
ewarn
fi
}

@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer><email>alonbl@gentoo.org</email></maintainer>
<use>
<flag name='scsi'>Adds dependency on sdparm to control non-SATA SCSI drivers</flag>
</use>
<maintainer>
<email>alonbl@gentoo.org</email>
</maintainer>
<upstream>
<maintainer status="active">
<email>gentoo-lmt@researchut.com</email>
</maintainer>
</upstream>
<use>
<flag name='scsi'>Adds dependency on sdparm to control non-SATA SCSI drivers</flag>
</use>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-3.1.3.ebuild,v 1.1 2013/02/05 12:58:22 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-3.1.3.ebuild,v 1.2 2013/03/16 18:10:31 pinkbyte Exp $
EAPI=4
inherit eutils
@ -11,7 +11,7 @@ SRC_URI="http://calcurse.org/files/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 ~x86"
IUSE=""
CC_LINGUAS=( de en es fr nl pt_BR ru )
IUSE+=" ${CC_LINGUAS[@]/#/linguas_}"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.0.ebuild,v 1.1 2013/03/12 17:42:57 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.0.ebuild,v 1.2 2013/03/17 12:25:30 jlec Exp $
EAPI=5
@ -32,7 +32,7 @@ S="${WORKDIR}/${MY_P}"
COMMON_DEPEND="
app-text/hunspell
app-text/poppler[qt4]
app-text/poppler:=[qt4]
sys-libs/zlib
x11-libs/libX11
x11-libs/libXext

@ -1,4 +1 @@
DIST texstudio-2.3.tar.gz 25524647 SHA256 ace47800118d3bdeb80dedcda6e659142f4ed5e5c2d8e9eb945ebd7ae8293d93 SHA512 c43864f51be4344adc10140b75a78f11e75f32afdea4c3310efd5897a6e628192dd4335b8250f2a2de8e287d9533864dca26e0a65d6d0f16322a4b3c18e81f86 WHIRLPOOL 4bcaff04bdabd7cb6156330c8e1e66d68fc9f781797eca8ef00198a48d509eed724b3c05a78bcce579f1c1fdbb76a25b6fd4708c05134ed251dcf2585daac955
DIST texstudio-2.4.tar.gz 13809336 SHA256 95ecd0e7aab5840b147c6bee68d3c5877d3cce0006117894b3056da211dc77a9 SHA512 394ddf6529284fced1db647db40b054490a49e01ed3b52515a880930f53a757a590b415c4b703442f89191e2be36d56ddb714ecc3445b3e49b37c1ad282a97e0 WHIRLPOOL 2373f9420c9d59d2c56d34c9485f699fe251785f366fb83ef03baa4a26a47fd81feaa287ca02fba55b92cd35e7ae6981254449d2f4916594b4bc292a887715dd
DIST texstudio-2.5.2.tar.gz 20731701 SHA256 50cc2163b872590c0af8edd22f1795aaa424a821956c38db24e5d72ecdad4f08 SHA512 d85cb4375a6828bac17e9d0cf97158e54fcd492ddfbc5e632dec9ca52616b3a2fd83f9ec696285d2ebe8627b78b26fd2a37fc9f0d10c96f2ec87b0c6de1bd061 WHIRLPOOL 183ebf3f4b97917449ceea991288ddc1f4a8b6c383d5ed2592ba8de2a05048df2eae5b69a4e0f57db87ef661b7b8086ac9c4ec55bff13ab8236ee81a95d7c64c
DIST texstudio-2.5.tar.gz 16197967 SHA256 0e24af04aa6ab6e4b52c6c787c4a5687c3208457ad3bb5eb670b9703bb529d2a SHA512 89324ab50366ab78f89001a971a443cda5adf3d6dc2371f9ff2b40668ed582ca0b6af55def150f1fa2b837467576de97441828d508d6b03c12d95099d5fdae2c WHIRLPOOL 3a4dca74208e59e6944de5ef632c72aa25cc49a645732494f5a1c0430b7872ddbac5f619063eb1e0be2006582adac3f09f35e246e66604f926e9de4b43432726

@ -1,66 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.3-r1.ebuild,v 1.3 2013/03/02 19:38:36 hwoarang Exp $
EAPI=4
inherit base fdo-mime qt4-r2
DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
HOMEPAGE="http://texstudio.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="video"
COMMON_DEPEND="
app-text/hunspell
app-text/poppler[qt4]
x11-libs/libX11
x11-libs/libXext
>=dev-qt/qtgui-4.6.1:4
>=dev-qt/qtcore-4.6.1:4
>=dev-qt/qtscript-4.6.1:4
>=dev-qt/qttest-4.6.1:4
>=dev-qt/qtwebkit-4.6.1:4
video? ( media-libs/phonon )"
RDEPEND="${COMMON_DEPEND}
virtual/latex-base
app-text/psutils
app-text/ghostscript-gpl
media-libs/netpbm"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
S="${WORKDIR}"/${P/-/}
PATCHES=(
"${FILESDIR}"/${P}-hunspell.patch
"${FILESDIR}"/${P}-gcc47.patch
"${FILESDIR}"/${P}-test.patch
"${FILESDIR}"/${P}-xdg-open.patch
)
src_prepare() {
find hunspell -delete
sed 's:hunspell/hunspell:hunspell:g' -i *.h || die
if use video; then
sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
fi
qt4-r2_src_prepare
}
src_install() {
make_desktop_entry texstudio "LaTeX Editor" texstudio "text/X-tex"
for i in 16x16 22x22 32x32 48x48 64x64; do
insinto /usr/share/icons/hicolor/${i}
newins utilities/${PN}${i}.png ${PN}.png
done
qt4-r2_src_install
}
pkg_postinst() {
fdo-mime_desktop_database_update
}

@ -1,65 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.4.ebuild,v 1.3 2013/03/02 19:38:36 hwoarang Exp $
EAPI=4
inherit base fdo-mime qt4-r2
DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
HOMEPAGE="http://texstudio.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="video"
COMMON_DEPEND="
app-text/hunspell
app-text/poppler[qt4]
x11-libs/libX11
x11-libs/libXext
>=dev-qt/qtgui-4.6.1:4
>=dev-qt/qtcore-4.6.1:4
>=dev-qt/qtscript-4.6.1:4
>=dev-qt/qttest-4.6.1:4
>=dev-qt/qtwebkit-4.6.1:4
video? ( media-libs/phonon )"
RDEPEND="${COMMON_DEPEND}
virtual/latex-base
app-text/psutils
app-text/ghostscript-gpl
media-libs/netpbm"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
S="${WORKDIR}"/${P/-/}
PATCHES=(
"${FILESDIR}"/${P}-hunspell.patch
"${FILESDIR}"/${P}-desktop.patch
# Get it from fedora once they have bumped
# "${FILESDIR}"/${P}-xdg-open.patch
)
src_prepare() {
find hunspell -delete
sed 's:hunspell/hunspell:hunspell:g' -i *.h || die
if use video; then
sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
fi
qt4-r2_src_prepare
}
src_install() {
for i in 16x16 22x22 32x32 48x48 64x64; do
insinto /usr/share/icons/hicolor/${i}
newins utilities/${PN}${i}.png ${PN}.png
done
qt4-r2_src_install
}
pkg_postinst() {
fdo-mime_desktop_database_update
}

@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.5.ebuild,v 1.2 2013/03/02 19:38:36 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.5.2-r1.ebuild,v 1.1 2013/03/17 12:27:57 jlec Exp $
EAPI=4
EAPI=5
inherit base fdo-mime qt4-r2
@ -17,7 +17,7 @@ IUSE="video"
COMMON_DEPEND="
app-text/hunspell
app-text/poppler[qt4]
app-text/poppler:=[qt4]
x11-libs/libX11
x11-libs/libXext
>=dev-qt/qtgui-4.6.1:4
@ -37,16 +37,16 @@ DEPEND="${COMMON_DEPEND}
S="${WORKDIR}"/${P/-/}
PATCHES=(
"${FILESDIR}"/${P}-hunspell.patch
"${FILESDIR}"/${PN}-2.5-hunspell.patch
# 441914
# "${FILESDIR}"/${P}-qtsingle.patch
"${FILESDIR}"/${PN}-2.4-desktop.patch
# Get it from fedora
"${FILESDIR}"/${P}-viewers-use-xdg-open.patch
"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
)
src_prepare() {
find hunspell -delete
find hunspell utilities/poppler-data -delete || die
if use video; then
sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
fi

@ -0,0 +1,43 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/getdelta/getdelta-0.7.9-r2.ebuild,v 1.1 2013/03/17 04:55:34 patrick Exp $
inherit eutils
DESCRIPTION="dynamic deltup client"
HOMEPAGE="http://linux01.gwdg.de/~nlissne/"
SRC_URI="http://linux01.gwdg.de/~nlissne/${PN}-0.7.8.tar.bz2"
SLOT="0"
IUSE=""
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~sparc ~x86"
RDEPEND="app-portage/deltup
dev-util/bdelta"
src_prepare() {
epatch "${FILESDIR}"/${P}.patch
}
src_install () {
# portage has moved make.globals, so we just hotfix it
sed -i -e "s:/etc/make.globals:/usr/share/portage/config/make.globals:g" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.globals path"
# make.conf has now two locations. This should fix it ( #461726 )
sed -i -e "s:source /etc/make.conf:source /etc/make.conf || source /etc/portage/make.conf:" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.conf path"
sed -i -e "s:/bin/sh:/bin/bash:" "${WORKDIR}"/getdelta.sh || die
dobin "${WORKDIR}"/getdelta.sh || die
}
pkg_postinst() {
elog "You need to put"
elog "FETCHCOMMAND=\"/usr/bin/getdelta.sh \\\${URI}\""
elog "into your /etc/make.conf to make use of getdelta"
# make sure permissions are ok
touch "${ROOT}"/var/log/getdelta.log
mkdir -p "${ROOT}"/etc/deltup
chown -R portage:portage "${ROOT}"/{var/log/getdelta.log,etc/deltup}
chmod -R ug+rwX "${ROOT}"/{var/log/getdelta.log,etc/deltup}
}

@ -1,2 +1 @@
DIST apvlv-0.1.2-Source.tar.gz 331595 SHA256 65f010287dd98644d25997f95054bc95abc22fd8d5e2d7bc3b3b59978fbb470a SHA512 a2cfd3fda715a37480c4d4f9899d8debfd683154beade5e49340715df35837e7c0c9f296db304dace067dfdf0a03b2db4ec1244a0197c03efa0c2c2b0e6c80ff WHIRLPOOL 0cad1b8e25c9e681048e5112a0b004010c631b4b7d9ac1863a0dd767ee9cb6570fb99c337085f83c64526d43497fe664f4dd5249768a69e26d199a34debd2eec
DIST apvlv-0.1.4-Source.tar.gz 337182 SHA256 f803de89aed82fea08f9386a6d6ddec999d0c96bb68c85e4cd527803838d17cd SHA512 798db075e702b02323e4df9f2ed07478aca975feca9ec7cae386792cdb4dbdcf016e7569e8f16bce6ffea0fe5482b5ea8551de10cbd0652f5607e5f0c0ea024b WHIRLPOOL fc9b66d829de17442efe7f782e44dd8024fbaf680a12a260504592bd8a44f48e7d5ace30f18f3ddec4df178fc772f4046ba0fe3e0c100195d86f05bea9703a0a

@ -1,57 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/apvlv/apvlv-0.1.2-r1.ebuild,v 1.6 2012/08/08 16:57:17 dilfridge Exp $
EAPI=4
inherit eutils cmake-utils
MY_P="${P}-Source"
DESCRIPTION="Alf's PDF Viewer Like Vim"
HOMEPAGE="http://naihe2010.github.com/apvlv/"
SRC_URI="mirror://github/naihe2010/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="debug djvu"
RDEPEND=">=x11-libs/gtk+-2.10.4:2
>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
djvu? ( app-text/djvu )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S=${WORKDIR}/${MY_P}
src_prepare() {
# bug #349979
EPATCH_OPTS="-l" epatch \
"${FILESDIR}"/${PN}-0.1.0-poppler-0.16.patch \
"${FILESDIR}"/${PN}-0.1.2-poppler-0.18.patch
# Remove prefixes so it works with the cmake-utils eclass
sed -i -e "s:APVLV_::" CMakeLists.txt src/CMakeLists.txt || die
# Don't install tex file
sed -i -e "s:Startup.tex::" CMakeLists.txt || die
}
src_configure() {
mycmakeargs=(
-DSYSCONFDIR=/etc/${PN}
-DDOCDIR=/usr/share/${PN}
-DMANDIR=/usr/share/man
-DWITH_UMD=OFF
$(cmake-utils_use_enable debug)
$(cmake-utils_use_with djvu)
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
dodoc AUTHORS NEWS README THANKS TODO
newicon icons/pdf.png ${PN}.png
make_desktop_entry ${PN} "Alf's PDF Viewer Like Vim" ${PN} "Office;Viewer"
}

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/apvlv/apvlv-0.1.4.ebuild,v 1.2 2012/08/08 16:57:17 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/apvlv/apvlv-0.1.4.ebuild,v 1.4 2013/03/17 13:19:04 ssuominen Exp $
EAPI=4
EAPI=5
inherit eutils cmake-utils
@ -13,13 +13,13 @@ SRC_URI="mirror://github/naihe2010/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="debug djvu"
RDEPEND="
>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)]
>=x11-libs/gtk+-2.10.4:2
djvu? ( app-text/djvu )
djvu? ( app-text/djvu:= )
"
DEPEND="${RDEPEND}
virtual/pkgconfig

@ -1,11 +0,0 @@
--- apvlv-0.1.0-Source/src/ApvlvFile.cpp.orig
+++ apvlv-0.1.0-Source/src/ApvlvFile.cpp
@@ -285,7 +285,7 @@
{
PopplerRectangle rect = { x1, y1, x2, y2 };
PopplerPage *page = poppler_document_get_page (mDoc, pn);
- *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
+ *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
if (*out != NULL)
{
return true;

@ -1,151 +0,0 @@
http://bugs.gentoo.org/385057
http://projects.archlinux.org/svntogit/community.git/tree/trunk/poppler-gdk.patch?h=packages/apvlv
--- src/ApvlvFile.cpp
+++ src/ApvlvFile.cpp
@@ -29,6 +29,10 @@
#include "ApvlvUtil.hpp"
#include "ApvlvView.hpp"
+#ifndef POPPLER_WITH_GDK
+#include "poppler-gdk.h"
+#endif
+
#ifdef HAVE_LIBUMD
#define LIBUMD_ENABLE_GTK
#include <umd.h>
--- src/poppler-gdk.h
+++ src/poppler-gdk.h
@@ -0,0 +1,132 @@
+#include <goo/gtypes.h>
+
+static void
+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
+ GdkPixbuf *pixbuf)
+{
+ int cairo_width, cairo_height, cairo_rowstride;
+ unsigned char *pixbuf_data, *dst, *cairo_data;
+ int pixbuf_rowstride, pixbuf_n_channels;
+ unsigned int *src;
+ int x, y;
+
+ cairo_width = cairo_image_surface_get_width (surface);
+ cairo_height = cairo_image_surface_get_height (surface);
+ cairo_rowstride = cairo_image_surface_get_stride (surface);
+ cairo_data = cairo_image_surface_get_data (surface);
+
+ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
+ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
+
+ if (cairo_width > gdk_pixbuf_get_width (pixbuf))
+ cairo_width = gdk_pixbuf_get_width (pixbuf);
+ if (cairo_height > gdk_pixbuf_get_height (pixbuf))
+ cairo_height = gdk_pixbuf_get_height (pixbuf);
+ for (y = 0; y < cairo_height; y++)
+ {
+ src = (unsigned int *) (cairo_data + y * cairo_rowstride);
+ dst = pixbuf_data + y * pixbuf_rowstride;
+ for (x = 0; x < cairo_width; x++)
+ {
+ dst[0] = (*src >> 16) & 0xff;
+ dst[1] = (*src >> 8) & 0xff;
+ dst[2] = (*src >> 0) & 0xff;
+ if (pixbuf_n_channels == 4)
+ dst[3] = (*src >> 24) & 0xff;
+ dst += pixbuf_n_channels;
+ src++;
+ }
+ }
+}
+
+static void
+_poppler_page_render_to_pixbuf (PopplerPage *page,
+ int src_x, int src_y,
+ int src_width, int src_height,
+ double scale,
+ int rotation,
+ GBool printing,
+ GdkPixbuf *pixbuf)
+{
+ cairo_t *cr;
+ cairo_surface_t *surface;
+
+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+ src_width, src_height);
+ cr = cairo_create (surface);
+ cairo_save (cr);
+ switch (rotation) {
+ case 90:
+ cairo_translate (cr, src_x + src_width, -src_y);
+ break;
+ case 180:
+ cairo_translate (cr, src_x + src_width, src_y + src_height);
+ break;
+ case 270:
+ cairo_translate (cr, -src_x, src_y + src_height);
+ break;
+ default:
+ cairo_translate (cr, -src_x, -src_y);
+ }
+
+ if (scale != 1.0)
+ cairo_scale (cr, scale, scale);
+
+ if (rotation != 0)
+ cairo_rotate (cr, rotation * G_PI / 180.0);
+
+ if (printing)
+ poppler_page_render_for_printing (page, cr);
+ else
+ poppler_page_render (page, cr);
+ cairo_restore (cr);
+
+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
+ cairo_set_source_rgb (cr, 1., 1., 1.);
+ cairo_paint (cr);
+
+ cairo_destroy (cr);
+
+ copy_cairo_surface_to_pixbuf (surface, pixbuf);
+ cairo_surface_destroy (surface);
+}
+
+/**
+ * poppler_page_render_to_pixbuf:
+ * @page: the page to render from
+ * @src_x: x coordinate of upper left corner
+ * @src_y: y coordinate of upper left corner
+ * @src_width: width of rectangle to render
+ * @src_height: height of rectangle to render
+ * @scale: scale specified as pixels per point
+ * @rotation: rotate the document by the specified degree
+ * @pixbuf: pixbuf to render into
+ *
+ * First scale the document to match the specified pixels per point,
+ * then render the rectangle given by the upper left corner at
+ * (src_x, src_y) and src_width and src_height.
+ * This function is for rendering a page that will be displayed.
+ * If you want to render a page that will be printed use
+ * poppler_page_render_to_pixbuf_for_printing() instead
+ *
+ * Deprecated: 0.16
+ **/
+void
+poppler_page_render_to_pixbuf (PopplerPage *page,
+ int src_x, int src_y,
+ int src_width, int src_height,
+ double scale,
+ int rotation,
+ GdkPixbuf *pixbuf)
+{
+ g_return_if_fail (POPPLER_IS_PAGE (page));
+ g_return_if_fail (scale > 0.0);
+ g_return_if_fail (pixbuf != NULL);
+
+ _poppler_page_render_to_pixbuf (page, src_x, src_y,
+ src_width, src_height,
+ scale, rotation,
+ gFalse,
+ pixbuf);
+}

@ -1,2 +1 @@
DIST dos2unix-6.0.2.tar.gz 73801 SHA256 6a46e4e2e0cb2ed2b609a11f9c7245aa45ac57ea75a3452b1bca8960184441be SHA512 261e544032cff7fc1d518ccca4096b41b59155545aff6a5f840925d8c7a93a604a8f7c41b31d97dd205bef830fdde28e7a3d70a4aaa42181bc4433c1b06a38e6 WHIRLPOOL 79f88962bf51b88706037f1ec7dabb4076003706f3b8f711d50f923425a8aada557fbecf22a2c9b881c04337138db6548b26506a06fbc0fe9e6791242ec763e7
DIST dos2unix-6.0.3.tar.gz 77227 SHA256 f5268c5b28a1983537210c72b3fd43f4aad17a8dacb6727b615b56dca2ef9a04 SHA512 00cce5d7fe7c1fcb81b973a1119aa956a0dd648b775a0cc1692270acec7e9b4caefb1c179e5bdf2834cad60622ffdf2a93ff4db5634f39f0545d63e394a03af2 WHIRLPOOL 925082691597946dce07f2b3bfbcae7bd0d944a4868d3d489cf7025fd5a055965fc76c269a62b025eaedb61741a5cc3c70612de547e47030034ea94d79bf9940

@ -1,60 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.2.ebuild,v 1.12 2013/03/09 02:12:25 radhermit Exp $
EAPI=4
inherit toolchain-funcs
DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
SRC_URI="
http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls"
RDEPEND="
!app-text/hd2u
!app-text/unix2dos
virtual/libintl"
DEPEND="
${RDEPEND}
nls? ( sys-devel/gettext )
dev-lang/perl"
src_prepare() {
sed \
-e '/^LDFLAGS/s|=|+=|' \
-e '/^CC/s|=|?=|' \
-e '/CFLAGS_OS \+=/d' \
-e '/LDFLAGS_EXTRA \+=/d' \
-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-i Makefile || die
if use debug ; then
sed -e "/^DEBUG/s:0:1:" \
-e "/EXTRA_CFLAGS +=/s:-g::" \
-i Makefile || die
fi
tc-export CC
}
lintl() {
# same logic as from virtual/libintl
use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
}
src_compile() {
emake prefix="${EPREFIX}/usr" \
$(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=")
}
src_install() {
emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
$(use nls || echo "ENABLE_NLS=") install
}

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/kbibtex-0.4.1.ebuild,v 1.3 2012/12/16 16:33:32 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/kbibtex-0.4.1.ebuild,v 1.4 2013/03/17 12:31:16 dilfridge Exp $
EAPI=4
EAPI=5
inherit versionator kde4-base
@ -22,7 +22,7 @@ SLOT="4"
IUSE="debug"
DEPEND="
app-text/poppler[qt4]
app-text/poppler:=[qt4]
dev-libs/libxml2
dev-libs/libxslt
virtual/tex-base

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2djvu/pdf2djvu-0.7.16.ebuild,v 1.1 2013/01/09 16:30:04 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2djvu/pdf2djvu-0.7.16.ebuild,v 1.2 2013/03/17 13:22:13 ssuominen Exp $
EAPI=5
inherit toolchain-funcs
@ -15,11 +15,11 @@ KEYWORDS="~amd64 ~x86"
IUSE="+graphicsmagick nls openmp test"
RDEPEND="
>=app-text/djvu-3.5.21
>=app-text/poppler-0.16.7
dev-libs/libxml2
dev-libs/libxslt
graphicsmagick? ( media-gfx/graphicsmagick )
>=app-text/djvu-3.5.21:=
>=app-text/poppler-0.16.7:=
dev-libs/libxml2:=
dev-libs/libxslt:=
graphicsmagick? ( media-gfx/graphicsmagick:= )
"
DEPEND="${RDEPEND}
dev-cpp/pstreams

@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2oo/pdf2oo-20090715.ebuild,v 1.7 2010/06/15 16:19:24 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2oo/pdf2oo-20090715.ebuild,v 1.8 2013/03/17 12:34:02 dilfridge Exp $
EAPI=2
EAPI=5
DESCRIPTION="Converts pdf files to odf"
HOMEPAGE="http://sourceforge.net/projects/pdf2oo/"
@ -15,11 +15,11 @@ IUSE=""
RDEPEND="app-arch/zip
|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
>=app-text/poppler-0.12.3-r3[utils]"
>=app-text/poppler-0.12.3-r3:=[utils]"
S=${WORKDIR}/${PN}
src_install() {
dobin pdf2oo || die
dodoc README || die
dobin pdf2oo
dodoc README
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-data/poppler-data-0.4.6.ebuild,v 1.1 2012/10/18 21:15:04 reavertm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-data/poppler-data-0.4.6.ebuild,v 1.3 2013/03/17 12:23:22 ago Exp $
EAPI="4"
@ -9,7 +9,7 @@ HOMEPAGE="http://poppler.freedesktop.org/"
SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="BSD GPL-2 MIT"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""

@ -1,4 +1,2 @@
DIST poppler-0.20.4.tar.gz 2154257 SHA256 bdb9b2579bc43f034a69612fc1eebead0c468767c949c6c6548ee71b71abd72a SHA512 3e0603cae90667fec11cbd4e2778d779d56a7b38f621c47cabba8be31fb1cdac8dcbf936295560528098838aa0db516baaeb4234dd585947413816db344bb778 WHIRLPOOL 8c56d7da64f9e86290142efd6364b458f449ff9f306b170348c4d5965100c17470ae4069bcea1033d65f62870aaf144fc7fb2b53d3044f1bc0b0c483f0deffa4
DIST poppler-0.20.5.tar.gz 2158387 SHA256 c6d7048a5f011dbde1f579d21bcfdd652b472d9d1c607dde9aa89eff960454b6 SHA512 2c9245d8a43c1daedcedc7916540cb5e9def8429382e9b3f3992d4a1fad081c035a9fc07d63998e210257d3dfd0b3b754e31be8f75fd2d94a8e50c7efbd1bb01 WHIRLPOOL cab7068d0b1b678797b9d63aa71e42bb3b70fd6d3f956a43b093734f445ce577a75638ebc4c2a2786ac592c2860f1090db22743cf01da8dab65ceb9a16ebc136
DIST poppler-0.22.1.tar.gz 2213552 SHA256 12b6a6d3c0bfda065653b7507cda49e22773693c913f8e563d55fb33031197c0 SHA512 038729dbdba8800f4944613fe40c6925cf424ee86e88048ffe50c72c5e86650dfd79fe39296480c837873dbf8f2c0acee8d803721c24203d9e355858a10ef9e2 WHIRLPOOL f513a89a8fd761f25b4ee5ee3f7c365d1a1e0bd55e08686b57eba36cb413c1a485a5188eb2fd2111a4dd120277bc5387565f1339185f16d9fb1cd96e4489988e
DIST poppler-0.22.2.tar.gz 2215737 SHA256 108736ef84069317f6c5beacb5268f3b799ecf401e353e239611772eae8a662d SHA512 ce962f12a87f873a46cf8d02c0620694893a6e1857ac680174c4d9388d2255b5011e62e28b34a6e0abec9c8779530bf91ac123206a619a6eba59be92adb02d42 WHIRLPOOL 80b744f1cf4687a936a1eb9ce40567602935535e8fc1faca010171e433ea4948284b8eba3fca866b6b27034319efa46d54d1e2f71ba14c8e5554ee3b137d935d

@ -0,0 +1,28 @@
From 66e13949ce245e4e444028be627250dacd698b8f Mon Sep 17 00:00:00 2001
From: Adrian Johnson <ajohnson@redneon.com>
Date: Sun, 17 Mar 2013 19:39:14 +1030
Subject: [PATCH] cairo: Don't change image interpolation when printing
Bug 62418
---
poppler/CairoOutputDev.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index dfa3e0e..127aa24 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -1790,6 +1790,10 @@ CairoOutputDev::getFilterForSurface(cairo_surface_t *image,
if (orig_width == 0 || orig_height == 0)
return CAIRO_FILTER_NEAREST;
+ /* When printing, don't change the interpolation. */
+ if (printing)
+ return CAIRO_FILTER_NEAREST;
+
int scaled_width, scaled_height;
getScaledSize (orig_width, orig_height, &scaled_width, &scaled_height);
--
1.7.10.4

@ -1,101 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.20.4.ebuild,v 1.12 2013/03/12 12:26:07 kensington Exp $
EAPI=4
inherit cmake-utils
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
HOMEPAGE="http://poppler.freedesktop.org/"
SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils"
# No test data provided
RESTRICT="test"
COMMON_DEPEND="
>=media-libs/fontconfig-2.6.0
>=media-libs/freetype-2.3.9
sys-libs/zlib
cairo? (
dev-libs/glib:2
>=x11-libs/cairo-1.10.0
introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
)
curl? ( net-misc/curl )
jpeg? ( virtual/jpeg )
jpeg2k? ( media-libs/openjpeg )
lcms? ( media-libs/lcms:2 )
png? ( >=media-libs/libpng-1.4:0 )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4
)
tiff? ( media-libs/tiff:0 )
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
RDEPEND="${COMMON_DEPEND}
!dev-libs/poppler
!dev-libs/poppler-glib
!dev-libs/poppler-qt3
!dev-libs/poppler-qt4
!app-text/poppler-utils
cjk? ( >=app-text/poppler-data-0.4.4 )
"
PATCHES=(
"${FILESDIR}/${PN}-0.20.1-lcms-automagic.patch"
)
DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
src_configure() {
mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT4_TESTS=OFF
-DBUILD_CPP_TESTS=OFF
-DENABLE_SPLASH=ON
-DENABLE_ZLIB=ON
-DENABLE_XPDF_HEADERS=ON
$(cmake-utils_use_enable curl LIBCURL)
$(cmake-utils_use_enable cxx CPP)
$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
$(cmake-utils_use_enable utils)
$(cmake-utils_use_with cairo)
$(cmake-utils_use_with introspection GObjectIntrospection)
$(cmake-utils_use_with jpeg)
$(cmake-utils_use_with png)
$(cmake-utils_use_with qt4)
$(cmake-utils_use_with tiff)
)
if use lcms; then
mycmakeargs+=(-DENABLE_CMS=lcms2)
else
mycmakeargs+=(-DENABLE_CMS=)
fi
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
if use cairo && use doc; then
# For now install gtk-doc there
insinto /usr/share/gtk-doc/html/poppler
doins -r "${S}"/glib/reference/html/*
fi
}
pkg_postinst() {
ewarn "After upgrading app-text/poppler you may need to reinstall packages"
ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
ewarn "to run revdep-rebuild"
}

@ -1,19 +1,19 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.1.ebuild,v 1.3 2013/03/12 12:26:07 kensington Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2-r1.ebuild,v 1.3 2013/03/17 13:48:33 ago Exp $
EAPI=4
EAPI=5
inherit cmake-utils
inherit cmake-utils toolchain-funcs
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
HOMEPAGE="http://poppler.freedesktop.org/"
SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/35"
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
# No test data provided
RESTRICT="test"
@ -50,9 +50,21 @@ RDEPEND="${COMMON_DEPEND}
cjk? ( >=app-text/poppler-data-0.4.4 )
"
DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
DOCS=(AUTHORS NEWS README README-XPDF TODO)
PATCHES=(
"${FILESDIR}/${P}-nojpeg.patch"
"${FILESDIR}/${P}-interp.patch"
)
src_configure() {
# this is needed for multilib, see bug 459394
local ft_libdir ft_includedir
ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
einfo "Detected FreeType at ${FREETYPE_DIR}"
mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT4_TESTS=OFF
@ -92,6 +104,7 @@ src_install() {
pkg_postinst() {
ewarn "After upgrading app-text/poppler you may need to reinstall packages"
ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
ewarn "to run revdep-rebuild"
ewarn "linking to it. For EAPI=5 subslot-capable packages this may be done"
ewarn "automatically. Anyway, if you're not a portage-2.2_rc user, you're advised"
ewarn "to run revdep-rebuild."
}

@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.3 2013/03/13 23:48:02 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.5 2013/03/16 17:13:11 dilfridge Exp $
EAPI=5
inherit cmake-utils
inherit cmake-utils toolchain-funcs
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
HOMEPAGE="http://poppler.freedesktop.org/"
@ -50,13 +50,20 @@ RDEPEND="${COMMON_DEPEND}
cjk? ( >=app-text/poppler-data-0.4.4 )
"
DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
DOCS=(AUTHORS NEWS README README-XPDF TODO)
PATCHES=(
"${FILESDIR}/${P}-nojpeg.patch"
)
src_configure() {
# this is needed for multilib, see bug 459394
local ft_libdir ft_includedir
ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
einfo "Detected FreeType at ${FREETYPE_DIR}"
mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT4_TESTS=OFF

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3.7-r2.ebuild,v 1.2 2013/03/02 19:44:53 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3.7-r2.ebuild,v 1.4 2013/03/17 13:48:56 ago Exp $
EAPI=5
PLOCALES="ast bs ca cs da de el en_GB es eu fi fr he hr id it ky my pl pt_BR ro ru sk tr ug uk zh_CN"
@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_}/+download/${P/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="amd64 ~arm x86"
IUSE="cups dbus sqlite +svg synctex"
RDEPEND="app-text/poppler[qt4]

@ -1,2 +1,3 @@
DIST xapian-omega-1.2.12.tar.gz 624039 SHA256 c235a27c94b754432a264f11d6d8e912ca71ed20a0192bf5331ef610fac32142 SHA512 e8158438740b48895043e9861a1da6f6a9416231f64f7b9ddeb9e4e82c838f3436ad514eb9a541e495099a46684f78d5483de0f0fa4e226fbf4aac667dc42329 WHIRLPOOL 677178fdd55a770f8d88ddacdafc797809f26cee7e6bd2f48768d25ceda041a2aec042f24587e996d631072b7620b3c259b6640aa53cc1ff1be5db0f7be07df7
DIST xapian-omega-1.2.13.tar.gz 627177 SHA256 ae35e37f3fddf1330004f41531b9c8be447c95f9bb8b2f135541a78c2c816d34 SHA512 2104c3b6f2d6fb12e70c9f62a4aaec808efd79a9067a1b0dda97f4d0b207f98028284436f0120d535b244f5f942428c8291be08cedb27b1a3a4c436fa8a1aa1a WHIRLPOOL 7825186ac6c87cbd829f5fd0b0bb4da7ce9f11f652451672db6c697b6f28967abb0b15ec9703ddd549b2ac75c58ea6e4895ddbcafa08c79ae4d999587231da11
DIST xapian-omega-1.2.14.tar.gz 627479 SHA256 dd8662cd5c941ffe936d18ae6971dd6bb1abb539b4f8719b93e85c9fc034e412 SHA512 fcebcf6954b55b9ef2ba6e11d37a8e0fd42da84ccdb31c1ca2e887119a4071bfde4a44e170d9123132b00c4a3e813e60dbd55bf8c4aca5a5409d6bd50c34d13f WHIRLPOOL 4c0b42fd0e8a3d36bd82ab55150ee5a2eaeb9d05ca78b20885bbc7d67c64327ca0a148b8379858eafa3463ff194c74aab39e35497380d6fc1cff658bf78aee43

@ -0,0 +1,30 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.14.ebuild,v 1.1 2013/03/16 09:26:40 blueness Exp $
EAPI="5"
DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.gz"
HOMEPAGE="http://www.xapian.org/"
S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND=">=dev-libs/xapian-${PV}
dev-lang/perl
dev-libs/libpcre
sys-libs/zlib"
RDEPEND="${DEPEND}"
src_install () {
emake DESTDIR="${D}" install
#move docs to /usr/share/doc/${PF}.
mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
}

@ -1,6 +1,2 @@
DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 SHA256 4375f116ff82cae1e9497f1b76797a519319bf4012d4aa1262caee75406aeea4 SHA512 358bb1c6c5a0c08410d8bd076eeb24d88ec4e928035c4b90d28e712568d9662e86fcb5d5939ec7598a46b1b49ac4107423766f4e4f3854965b4e2c766c705a83 WHIRLPOOL d99cb830bafc3e8a1625c3f4093068c2285a82968f071f948e49bafbd3ac5cbd854784c79981c92b297ebf2fc8d8f75c333cce49626904754fca61c535251dae
DIST xournal-0.4.5_p20111022.tar.xz 332700 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f SHA512 04c8ec6c95f040adca53014f7b893c483d7b2eed798d0969d1da0ed35b971ba5cbe3e1cfa8191af835c41d5ea09025181c6a7fd8c4f497fc12561696ca505fad WHIRLPOOL cae25038a9b642703c2665cd3bd72511b475fa519a6fa78090827d9d0959911655b526f92cf0fa25716bfdaf062a9c13526eec6137e3bc9aebcd527b11e05b5b
DIST xournal-0.4.6-r1-gentoo.patch.xz 40772 SHA256 96eb1cab0c6f18aaec0d90acb91c3a50e9c6a97c50f33c455ef11d9582b16f17 SHA512 70d04421654f89f165ef9c8e795f018e73e08375491c28e587cfff09c42a3e4811c02e28b0cad6e18b0ed45ef2bffda62894018064b0543b7279b2760a0dff6d WHIRLPOOL 32438f482b6505acf82f309c31dfc769a3e2b2306705a7c9ce68c47dee78e8864087c5c646a98334b0658d1e8fe5e053a9b1cfea36824e165193ff0b5800918d
DIST xournal-0.4.6.tar.xz 335128 SHA256 4310fe579b8e99a66c40ba923fe0dce2e8543ad69c7660a01a675637970057d3 SHA512 5fda5c6f0f4d8130176178c9300d5961d5e6aa251d953e14789ab055f2be58bf7ebc8933b73dc6254b62a1182225c9a11b8470f75ee2eb9b4a9247bf0ea7fa30 WHIRLPOOL 20480a3443f2c28992a4911ea442efeb99df5fcbcf87145d89bae4bf7d36764e6d913be6180ede389bac02e921afda1156953efb3f685db9a3f885ec3da93e9d
DIST xournal-0.4.7-gentoo.patch.xz 14252 SHA256 6c92540096109522a24e3c25a6091b6770f5a0f42ba95fab319170f00ab24b6f SHA512 b7fbf94aef87b258b7f655acfb2edb2d882ac04fcb868d749b03f540a0a0ac4e40e1fc8a0cc39eb2d2f02f2066fcc518f7e52fec7d478335167ce5b04df9c9a0 WHIRLPOOL 123fb12647f97975edce78cc5fdef53ec5cfdab47ddb482d563cc4756c82f0693ccf89d483d27963f91c1496b84a2d6bb699f4c366201f34143793ea5b64e7f4
DIST xournal-0.4.7.tar.gz 553391 SHA256 d1ceb9c3a0b0172f7c2389bfe188a13cdc9f9f4c3ddc30095d635edf1367ac89 SHA512 476048b36c73b412dc7e003df5b61b3d694570fde77cbde057e887c1251c4ef18389567f2a63259b4e93a14ef4681536dcbb0f04ead28b60d70c9a4bd33a1cb0 WHIRLPOOL d85f5c267052ea26886fcf83b08b1c3c7780429fe374e40ffa18b9261289311663cff561e2ae378f02803c629a1448e663127152ec0f54ceeba61efa43b6200b

@ -1,10 +0,0 @@
diff -ruN xournal-0.4.5_p20111022.orig/src/Makefile.am xournal-0.4.5_p20111022/src/Makefile.am
--- xournal-0.4.5_p20111022.orig/src/Makefile.am 2012-06-24 12:57:21.453958621 +0200
+++ xournal-0.4.5_p20111022/src/Makefile.am 2012-06-24 12:58:07.696957705 +0200
@@ -30,5 +30,5 @@
xournal_LDFLAGS = -mwindows
xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
else
- xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
+ xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
endif

@ -1,55 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild,v 1.5 2012/06/24 11:03:29 dilfridge Exp $
EAPI=4
GCONF_DEBUG=no
inherit gnome2 autotools
DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
HOMEPAGE="http://xournal.sourceforge.net/"
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-patchset.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="+pdf"
COMMONDEPEND="
app-text/poppler[cairo]
dev-libs/atk
dev-libs/glib
gnome-base/libgnomecanvas
media-libs/freetype
media-libs/fontconfig
sys-libs/zlib
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/pango
"
RDEPEND="${COMMONDEPEND}
pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
"
DEPEND="${COMMONDEPEND}
virtual/pkgconfig
"
src_prepare() {
epatch "${WORKDIR}"/0*.patch
epatch "${FILESDIR}/${P}-underlinking-2.patch"
sed -e "s:n http:n Gentoo release ${PVR}\\\\n http:" -i "${S}"/src/xo-interface.c
rm -f "${S}/aclocal.m4" # bug 423285
eautoreconf
}
src_install() {
emake DESTDIR="${D}" install
emake DESTDIR="${D}" desktop-install
dodoc ChangeLog AUTHORS README
dohtml -r html-doc/*
}

@ -1,53 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r1.ebuild,v 1.1 2012/06/24 11:08:44 dilfridge Exp $
EAPI=4
GCONF_DEBUG=no
inherit gnome2 autotools
DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
HOMEPAGE="http://xournal.sourceforge.net/"
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+pdf"
COMMONDEPEND="
app-text/poppler[cairo]
dev-libs/atk
dev-libs/glib
gnome-base/libgnomecanvas
media-libs/freetype
media-libs/fontconfig
sys-libs/zlib
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/pango
"
RDEPEND="${COMMONDEPEND}
pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
"
DEPEND="${COMMONDEPEND}
virtual/pkgconfig
"
src_prepare() {
epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
sed -e "s:n http:n Gentoo release ${PVR}\\\\n http:" -i "${S}"/src/xo-interface.c
eautoreconf
}
src_install() {
emake DESTDIR="${D}" install
emake DESTDIR="${D}" desktop-install
dodoc ChangeLog AUTHORS README
dohtml -r html-doc/*
}

@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.7.ebuild,v 1.4 2013/02/14 20:19:46 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.7.ebuild,v 1.5 2013/03/17 12:25:53 dilfridge Exp $
EAPI=4
EAPI=5
GCONF_DEBUG=no
@ -32,7 +32,7 @@ else
fi
COMMONDEPEND="
app-text/poppler[cairo]
app-text/poppler:=[cairo]
dev-libs/atk
dev-libs/glib
gnome-base/libgnomecanvas

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-9999.ebuild,v 1.3 2012/07/09 02:34:32 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-9999.ebuild,v 1.4 2013/03/17 12:25:53 dilfridge Exp $
EAPI=4
EAPI=5
GCONF_DEBUG=no
@ -32,7 +32,7 @@ else
fi
COMMONDEPEND="
app-text/poppler[cairo]
app-text/poppler:=[cairo]
dev-libs/atk
dev-libs/glib
gnome-base/libgnomecanvas

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.2.ebuild,v 1.2 2013/01/27 21:54:41 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.2.ebuild,v 1.3 2013/03/17 13:14:48 ssuominen Exp $
EAPI=5
inherit toolchain-funcs
@ -14,10 +14,10 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
RDEPEND="app-text/poppler[cairo]
RDEPEND="app-text/poppler:=[cairo]
>=app-text/zathura-0.2.2
>=dev-libs/girara-0.1.5:2
x11-libs/cairo"
x11-libs/cairo:="
DEPEND="${RDEPEND}
virtual/pkgconfig"

@ -1,2 +1,3 @@
DIST pgpool-II-3.2.0.tar.gz 1599391 SHA256 2e41ce78154fc7e9e13eb34f0b60e352d6183de08c4040bea9fbdd914e3e28e0 SHA512 9c9d56bed525c3d8508cde32cd6ac8b13df6dd28366b90157c46c2900eef93fa90254de49b1b574f83fe76525f27a2e8c23d7dcec02cad566aaeff62a6b3282d WHIRLPOOL 25e8f086ea48300affe7195ffcbeee1faa8cde344a99d6caccb0041db04e8040bd2750148c1fde94342b4c544c328f9f97d0b1cf9394443cf37a0d003ace0a90
DIST pgpool-II-3.2.1.tar.gz 1605959 SHA256 015284c4d83cf8367580fb58469e20330330204d914d00df2fe9ee5a57b3055b SHA512 4b7b947e8d8bdbeabf669323f37f05b38a48a1c397b54875547e85e66e4ea9ec13c6bdbe8d5b996b96db4f85640ca0d2cbc62e74ba0fb56d989d916104a0869f WHIRLPOOL b3bff26e44bb7910e2e74e1e2ab377c9e3e868b509cc958133be26b2bc42d1437cd7292506840d0d1f137d42ebd66f751fbab6f5b47508af94ca363df9cd5722
DIST pgpool-II-3.2.2.tar.gz 1555174 SHA256 307bab80dcefdcc5c1a2a7b2f294d5734d9c258985503e550b3cbf8d1858cfb0 SHA512 e02091ab5aa336d01e3a0d314b856868452880c4f86aa92e4f73105d4e9aa0c21914e18587f06a2f67282e30e3a50ffff0c0b3825efc5f91529de06206dbdfb8 WHIRLPOOL f0dd8ac3ff2a233a1591c34379f9740d39b6ccdb07542bef530fa21413a2ccab5292f69381172b4b5078cf547827e6c15c028bd5eb03b28faf3d93b49fbd0966

@ -0,0 +1,117 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.2.2.ebuild,v 1.1 2013/03/17 05:19:17 patrick Exp $
EAPI=4
[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}"
ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool"
ECVS_MODULE="pgpool-II"
[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs"
inherit base autotools ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="Connection pool server for PostgreSQL"
HOMEPAGE="http://www.pgpool.net/"
[[ ${PV} == 9999 ]] || SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ ${PV} == 9999 ]] || \
KEYWORDS="~amd64 ~x86"
IUSE="memcached pam ssl static-libs"
RDEPEND="
dev-db/postgresql-base
memcached? ( dev-libs/libmemcached )
pam? ( sys-auth/pambase )
ssl? ( dev-libs/openssl )
"
DEPEND="${RDEPEND}
sys-devel/bison
!!dev-db/pgpool
"
AUTOTOOLS_IN_SOURCE_BUILD="1"
S=${WORKDIR}/${MY_P}
pkg_setup() {
enewgroup postgres 70
enewuser pgpool -1 -1 -1 postgres
# We need the postgres user as well so we can set the proper
# permissions on the sockets without getting into fights with
# PostgreSQL's initialization scripts.
enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
}
src_prepare() {
epatch "${FILESDIR}/pgpool_run_paths.patch"
local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
sed 's|.*\"\(.*\)\"|\1|g')
local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
-i *.conf.sample* pool.h || die
sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
-i *.conf.sample* pool.h || die
}
src_configure() {
local myconf
use memcached && \
myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
use pam && myconf+=' --with-pam'
econf \
--disable-rpath \
--sysconfdir="${EROOT%/}/etc/${PN}" \
$(use_with ssl openssl) \
$(use_enable static-libs static) \
${myconf}
}
src_compile() {
emake
cd sql
emake
}
src_install() {
emake DESTDIR="${D}" install
cd sql
emake DESTDIR="${D}" install
cd "${S}"
# `contrib' moved to `extension' with PostgreSQL 9.1
local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} > 90 ]] ; then
cd "${ED%/}$(pg_config --sharedir)"
mv contrib extension || die
cd "${S}"
fi
newinitd "${FILESDIR}/${PN}.initd" ${PN}
newconfd "${FILESDIR}/${PN}.confd" ${PN}
# Documentation
dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
dohtml -r doc
# Examples and extras
insinto "/usr/share/${PN}"
doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
# One more thing: Evil la files!
find "${ED}" -name '*.la' -exec rm -f {} +
}

@ -2,3 +2,5 @@ DIST slony1-2.1.1-docs.tar.bz2 1314445 SHA256 1569d3b36289708648c69743880c8a76a7
DIST slony1-2.1.1.tar.bz2 1483119 SHA256 eb89490731be0f53586e98ae39132a544cee8167dbee77b9ce92800ba9d3bd63 SHA512 4ace7e77602baadd0e2532ab4a4c9d9df95caf65670f81569ada385170b4ebfa0b23c5e49dc613346dc82769113d752e57551adf12585403da2080e3802660c4 WHIRLPOOL 0a1f1f38d676802ae63b787bdf854ad38108b48f780fed3560e0485cfe81740e68aa10af3fb25bba257ad78ef1910152be1e06dd44a66e7d859a9d415c1e7580
DIST slony1-2.1.2-docs.tar.bz2 1314286 SHA256 6f99ec5fbc218a7edf7923c1fd8a3b5f68e07c267df09c67db10259a43d26954 SHA512 fa6240fe70fc485ca6d88ebfe8883942cce8cd9d6847a0e3737fecd939012aec6ad924bd128af7f7a78c3f8c1ac5772b83ef91230a30d6f6d1c495f2922912d1 WHIRLPOOL 4b278fb22612ba3de34c7712110319896dfa782f740bd52688bc9cb4da8d9523ad5a0aa4c869389c4d5befb78ded85170b215fd1a111244bc7d2da8bd7d0f7f0
DIST slony1-2.1.2.tar.bz2 1512301 SHA256 ae25f9b0ea91cf4884abf302b87c36effbc43e68be5b6665a31d03ed0cce182f SHA512 9c3669a12f893c832a82af43f8c9fe0637ec6266a0a938498c1ee397e62c9b18acd1c9331c11594a7e2aa574d14255e8cb5116038797854b12fd7b393f8866e3 WHIRLPOOL 8f65bbda3376e8d82d39cdca091118a8c0c82d4fa863e282fe02ab842dd214b3f461b80df7c9703e6921da3cb4e5f60bf1d578d6b1367a8d94fb625ef77fd2ba
DIST slony1-2.1.3-docs.tar.bz2 1314210 SHA256 8588df1b06086809ce0fef7e1348405bf701c959e2b0affda9d6305f201d6fb4 SHA512 a37bc8432d19833c9cbcc7494c783fabce6d2b5feedf4001e031ff5e5039630497e9b7e4ca4d237d53f41109368cd33708400e64f0c2f45cef3a9916ad9cf4e7 WHIRLPOOL 7d7e0db61956919f5d4fdf96a946b81e9b3502f2c8e5f6fc9b525cb89c37d44cadf349f607fd13a89561c87d1ca2bd722e4ca57b250f809b9c25cd1c56bd523b
DIST slony1-2.1.3.tar.bz2 1512693 SHA256 048b94c990afceb892f8f6631268bb66e93a3c630afc694b3a09f051c338790b SHA512 f02320e3bb85848b93bc43a7d4e0dbb367afcb8af2100cda840888dcd219fead78bd1ac927493bd173cef2bc1195ba4f860679eed0606dd0a2cf9652d671b493 WHIRLPOOL 51641f4dfa78210ab0ecc2827932dc06389867c18df6dfb61d8b43c03ad00d2ac09c529e4171ece07139a803ef45f12c15ac14da39e6bb269bb5a0d7a0270943

@ -0,0 +1,73 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-2.1.3.ebuild,v 1.1 2013/03/17 05:26:17 patrick Exp $
EAPI="4"
inherit eutils versionator
IUSE="doc perl"
DESCRIPTION="A replication system for the PostgreSQL Database Management System"
HOMEPAGE="http://slony.info/"
# ${P}-docs.tar.bz2 contains man pages as well as additional documentation
MAJ_PV=$(get_version_component_range 1-2)
SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
http://main.slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2"
LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
DEPEND="|| (
dev-db/postgresql-server:9.2
dev-db/postgresql-server:9.1
dev-db/postgresql-server:9.0
dev-db/postgresql-server:8.4
dev-db/postgresql-server:8.3
)
dev-db/postgresql-base[threads]
perl? ( dev-perl/DBD-Pg )
"
pkg_setup() {
local PGSLOT="$(postgresql-config show)"
if [[ ${PGSLOT//.} < 83 ]] ; then
eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.3 or higher."
eerror "Set an appropriate slot with postgresql-config."
die "postgresql-config not set to 8.3 or higher."
fi
# if [[ ${PGSLOT//.} > 90 ]] ; then
# ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
# ewarn "This is neither supported here nor upstream."
# ewarn "Any bugs you encounter should be reported upstream."
# fi
}
src_prepare() {
epatch "${FILESDIR}/${PN}-2.1.2-ldflags.patch"
}
src_configure() {
local myconf
use perl && myconf='--with-perltools'
econf ${myconf}
}
src_install() {
emake DESTDIR="${D}" install
dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
doman "${S}"/doc/adminguide/man{1,7}/*
if use doc ; then
cd "${S}"/doc
dohtml -r *
fi
newinitd "${FILESDIR}"/slony1.init slony1
newconfd "${FILESDIR}"/slony1.conf slony1
}

@ -8,4 +8,5 @@ DIST nqp-2012.10.tar.gz 1131851 SHA256 a459f026e85f921421fdd7b9ecc2be0c6e6b3d60d
DIST nqp-2012.11.tar.gz 1213328 SHA256 54ed2343d33d13ebb685cadf6043e199636721c4d98edf683e63943c4d70ecea SHA512 3ca5e31013046b6c074f22fda74e87e28a5e51fd7a330c63f088284d38284d66f8c04c15cb9302914db2d8fb8877b14832119e9844536d11901549d20a5a020c WHIRLPOOL 0cecb7fcf4798461f3dadb2af13cd41fddc0a1e48a0108e1d2812448186bff6b1fbff3a13a9a808bb2a4b290ce824fb061c121760d7c6e23aa33b1ff73f89e72
DIST nqp-2012.12.tar.gz 1214233 SHA256 3976d02e987fadf5bb67bd31ffaf5d4f5d0879686030d83bcfe4c363f01ac29d SHA512 4148a52c1f17b0daf0f4d84e8b9eb18e63b2ae849e6839f98f9237a64ce12d59a88dabce1ae354df82c1d773ca13dfc2f99c125771a97fb1df9e21fad6adf6e7 WHIRLPOOL b0fd48e65c37cf5a574b1c84f9f4774b5495889eb7657d019635529b1174f8e3a30974b8c5573fbc1311253b2d36fc971a2dee9727bbd2139b5c5b77337d72c4
DIST nqp-2013.01.tar.gz 1226091 SHA256 24e7467c6b7812ccf9cd348d81b58d11866de8013502d602157d2282469363f8 SHA512 0bfaa797792c1a0f5f17e101d8ed8d2a64f6ebed6dbc2d0afe6b28dc779f35a95bb7bb2882978d99fb1e5b75c709d8ac521794e66eb7080f9dc06118cef531b8 WHIRLPOOL 7e2f92901e175a5222abe44ff2bc5fc7c5d4e268ed6427740c2881a5c37685ff6bd8e5e2315b71070ed5fef7bb35aa527f4723f5e0ae5968d2213de72dec4f61
DIST nqp-2013.02.1.tar.gz 1435679 SHA256 b787010886e9b0a4ae36d85aec56e9f1b4fa82840f0b667dcb28c2e776de8be9 SHA512 4ddf509275fd9d397f3fd344ce39dfdb51818b6b85fbccebfa49d77be5ffb3d999409076a777acb5d553fbbdc2a76ebe8b45fca30cc326b3f8e40ba117c680d3 WHIRLPOOL 9472e05c9928020f17275cdda1606b68a2e6757dbb2c1b5e24b275ae0438e93e00fd4d144a458ef760312fef72b637ea46ebbe00239c9ad79180ad3f59ddccd5
DIST nqp-2013.02.tar.gz 1435599 SHA256 5ac65aaacccf56699bb4be5d03742086ecfcccb19c0cb457110a82eb0fbeaee0 SHA512 d1f22c2848bafa6c51f7c0c88f88cb931fedf9a87829107fa53af40c7d9959915f8d38448f3c696707bbaf1a4b8e786fe3ab19565d2d5c2d97c95cfa49fa0186 WHIRLPOOL d5ba849ff9b450f1d8898565a25d8b97c2e770b0875a48cb26f53e5e839e0fab811e061a4f292e90e15ade1e02c6663653f7b5b28f4925a7c4e7e6d891960655

@ -0,0 +1,51 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/nqp-2013.02.1.ebuild,v 1.1 2013/03/17 05:11:14 patrick Exp $
EAPI=3
inherit eutils multilib
PARROT_VERSION="4.4.0"
DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
HOMEPAGE="http://rakudo.org/"
SRC_URI="http://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="Artistic-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND=">=dev-lang/parrot-${PARROT_VERSION}[unicode]"
DEPEND="${RDEPEND}
dev-lang/perl"
src_prepare() {
cd "${WORKDIR}"
ln -s * "${S}" || die
cd "${S}"
echo "${PV}" > VERSION
}
src_configure() {
perl Configure.pl || die
}
src_compile() {
emake -j1 || die
}
src_test() {
emake -j1 test || die
}
src_install() {
emake DESTDIR="${ED}" install || die
dodoc CREDITS README || die
if use doc; then
dodoc docs/* || die
fi
}

@ -8,4 +8,5 @@ DIST rakudo-2012.10.tar.gz 1100471 SHA256 5601ce92f1bad3b88e53188a8a70106814c86c
DIST rakudo-2012.11.tar.gz 1111827 SHA256 45b52e1eeb37271a0efe8fa09e9a7fcc6890ef303d44eacb3deabb245b5dde6a SHA512 51625a3f6e75ceea71f842c33661c05258ef6cdb05a731b3244a63b2fe36af284294105e3ecb54bab7f6ec6170c7887d355bddea6ae14b51de10ba2a767dcfcb WHIRLPOOL a14102beb1af462c71fa79c93f8e0aea10e504910cc53ae39d30a86a726625becee5614d7f7ec05838c042d1f48d5fd2ab5f1293d07304a8dca39a5c22c6bc30
DIST rakudo-2012.12.tar.gz 1123419 SHA256 9e15d682811c6cbf59eb4466bad76b0289d511b653258ac3366d2fdbd82223ab SHA512 2bc54d71964393cc80e2c93613e99c344150a5b5ebfb1ce03af9814ab40c60b6dcade82445a98b4683c782ae2230e2040d0cb2db50a5c3c6443fcc6b5970ef96 WHIRLPOOL 698dfb6eb9b0e2bca17ba9d302530628b0d6fb9d3197f6a5481ffbaae5f48c3859762405e0df6898fbbb358bcf0bdd966a2051895d8f2916e8543439f803d0b3
DIST rakudo-2013.01.tar.gz 1128694 SHA256 14abd9d42b9a9fac38ef4d68f969f7773e603703b36084634967bf61b50ed26f SHA512 18b210276f40504af99c07401fa8d1ed45c6b849eb6c31924d1419f0d433a32f7562c828563333b2854e6bdf9eae757c1b82f28220a925add2a88714c01b2ed1 WHIRLPOOL d36a782fc02e717b892c047c4b27378f69d08de916051c3636ed95e19e0d21b6522b4ba093a90a1cdc559919d5e96ea131751272dd04f50ea870abbcd58f9af2
DIST rakudo-2013.02.1.tar.gz 1145289 SHA256 915d368df12250d2a462abd3b3dc5885aea4296ccde780a8f73a6469d320e56c SHA512 2e37fe2c25d055301249512c82f2eb26a57ed169e24ab49a04da5c8daa4852a4695eb8bcfce72c576e54226fe62b7ae47aed35f64cb34c505a942bc2e55a41d3 WHIRLPOOL d316e3f428c2e18115637417ffff607f1a11524904b4758a70aad8ec6dda0f38742ac92f6b4cc42ec6609c4f325b89a12326211628ba36baa60dc121782177b2
DIST rakudo-2013.02.tar.gz 1146326 SHA256 c07275fcc003634366b4127ee7b1be73235e966496e03b367fcf281de95bf68d SHA512 9ce587b4a623b1bcbede4a62ad652fbdb68bf00444833ddf01818bd7e2a683cde967b9ff6dda062563b5ed1a57387062eb4a67bec450f068add9f5c751a2748f WHIRLPOOL 0ea3090ba43d65574e82365b612f3a5a69b9a47f030ac1f5c6aa44eeb1c35d8791f94d26aa3038aa7499d4bde30576ed855e1c8866aa5554358e3300d2d01ba7

@ -0,0 +1,49 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/rakudo-2013.02.1.ebuild,v 1.1 2013/03/17 05:12:15 patrick Exp $
EAPI=3
PARROT_VERSION="4.4.0"
NQP_VERSION="${PV}"
inherit eutils multilib
DESCRIPTION="A Perl 6 implementation built on the Parrot virtual machine"
HOMEPAGE="http://rakudo.org/"
SRC_URI="http://rakudo.org/downloads/${PN}/${P}.tar.gz"
LICENSE="Artistic-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND=">=dev-lang/parrot-${PARROT_VERSION}[unicode]
>=dev-lang/nqp-${NQP_VERSION}"
DEPEND="${RDEPEND}
dev-lang/perl"
src_prepare() {
sed -i "s,\$(DOCDIR)/rakudo$,&-${PVR}," tools/build/Makefile.in || die
}
src_configure() {
perl Configure.pl || die
}
src_test() {
emake -j1 test || die
}
src_install() {
emake DESTDIR="${ED}" install || die
dodoc CREDITS README docs/ChangeLog docs/ROADMAP || die
if use doc; then
dohtml -A svg docs/architecture.html docs/architecture.svg || die
dodoc docs/*.pod || die
docinto announce
dodoc docs/announce/* || die
fi
}

@ -1 +1,2 @@
DIST CVector-1.0.3.1.tar.gz 19761 SHA256 6492b2beb26c3179cdd19abc90dc47a685be471c594d5ab664283e1d3586acdc SHA512 41300e46873efa8a2cfc44c76788025385fa7b7a108cf9dd95e4e28d515d825d4a44786a7ffb130d727a42907d56e4f62e6f75a02c96333b6afdc06c336d538e WHIRLPOOL 507a2bf047bf84e7f5dab06fc6e715384bf013944331b1f8356cbb6e5fa2997442bfe1c3b95b426154e13cd9253a0330f0abb58b93f13b957836ba80fc49f9d6
DIST CVector-1.0.3.tar.gz 41642 SHA256 d3fa92de3cd5ba8697abdbb52080248b2c252a81cf40a8ec639be301518d0ce3 SHA512 f43030d95aeb6ef230dada13903ad56049acd15379a0c04e08b6ce8d7df7baffa3bac166af0c3c93f018e00058e07680af655e71bc0d542a6da2ad1f18e95788 WHIRLPOOL 67c3a9c043388c05a418973f687eb5aee9e09a297b127deb93c1166eda5159f0b0fc63015ec68b5097551966ffe4229c60bdda671362b0e5470fd8891bd37413

@ -0,0 +1,44 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/cvector/cvector-1.0.3.1.ebuild,v 1.1 2013/03/16 18:16:02 jlec Exp $
EAPI=5
inherit base eutils toolchain-funcs versionator
MY_PN=CVector
MY_P="${MY_PN}-${PV}"
DESCRIPTION="An ANSI C implementation of dynamic arrays to provide a crude approximation to the C++ vector class"
HOMEPAGE="http://cvector.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(get_version_component_range 1-3)/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}"/${MY_P}
PATCHES=(
"${FILESDIR}"/${P}-LDFLAGS.patch
"${FILESDIR}"/1.0.3-dynlib.patch
)
src_compile() {
emake \
CC=$(tc-getCC) \
CXX=$(tc-getCXX) \
CFLAGS="${CFLAGS}" \
all
}
src_install() {
ln -sf libCVector.so.$(get_version_component_range 1-3) libCVector.so.$(get_major_version) || die
ln -sf libCVector.so.$(get_version_component_range 1-3) libCVector.so || die
dolib.so libCVector.so*
doheader *.h
dodoc README_CVector.txt
}

@ -0,0 +1,17 @@
--- Makefile 2009-07-08 04:02:56.000000000 +0200
+++ Makefile.new 2009-07-25 11:59:27.000000000 +0200
@@ -89,10 +89,10 @@
endif
COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
-BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
-BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALL_PREFIX)/include
-BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALL_PREFIX)/include
+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined $(LDFLAGS)
+BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)
+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -shared
+BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static
INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish

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

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

Loading…
Cancel
Save