Sync with portage [Wed Aug 22 10:20:06 MSK 2012].

mhiretskiy
root 12 years ago
parent e02b79c2a7
commit d8cfd74f8c

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/dhex/dhex-0.67.ebuild,v 1.3 2012/08/10 13:06:12 johu Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/dhex/dhex-0.67.ebuild,v 1.4 2012/08/22 00:20:32 blueness Exp $
EAPI=4
@ -14,7 +14,7 @@ SRC_URI="http://www.dettus.net/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="sys-libs/ncurses"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.1 2012/08/15 18:55:19 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.2 2012/08/21 19:20:42 ulm Exp $
EAPI=4
@ -240,10 +240,10 @@ src_compile() {
src_install () {
emake install DESTDIR="${D}"
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|| die "removing duplicate emacs executable failed"
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
rm "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} \
|| die "Removing link to emacs executable failed"
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|| die "Moving emacs executable failed"
# move man pages to the correct place
local m

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/shed-1.15.ebuild,v 1.2 2012/08/18 03:43:33 ottxor Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/shed-1.15.ebuild,v 1.3 2012/08/22 00:19:16 blueness Exp $
EAPI="4"
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="sys-libs/ncurses"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild,v 1.2 2012/08/19 00:07:14 johu Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild,v 1.3 2012/08/21 21:25:52 cardoe Exp $
EAPI=4
@ -18,6 +18,8 @@ IUSE="+consolekit"
RDEPEND="x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libX11
x11-libs/libXinerama
>=x11-libs/libpciaccess-0.10
>=app-emulation/spice-protocol-0.10.1
consolekit? ( sys-auth/consolekit sys-apps/dbus )"
DEPEND="virtual/pkgconfig

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20.ebuild,v 1.2 2012/08/21 15:55:24 polynomial-c Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20.ebuild,v 1.3 2012/08/22 00:31:50 blueness Exp $
EAPI=4
@ -273,7 +273,7 @@ src_install() {
fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
if ! use headless ; then
for each in VBox{SDL,Headless} ; do
for each in VBox{SDL,SVC,Headless} ; do
doins $each || die
fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
fperms 4750 /usr/$(get_libdir)/${PN}/${each}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.30 2012/05/31 23:49:02 zmedico Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.31 2012/08/22 00:31:50 blueness Exp $
EAPI=2
@ -147,7 +147,7 @@ src_install() {
fi
if ! use headless; then
for each in VBox{SDL,Headless} ; do
for each in VBox{SDL,SVC,Headless} ; do
doins $each
fowners root:vboxusers /usr/lib/${PN}/${each}
fperms 4750 /usr/lib/${PN}/${each}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.0.ebuild,v 1.3 2012/08/20 21:01:45 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.0.ebuild,v 1.4 2012/08/21 19:06:56 dilfridge Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -43,7 +43,7 @@ SLOT="4"
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
word-perfect xbase +xml +xslt"
# please do not sort here, order is same as in CMakeLists.txt
@ -113,6 +113,7 @@ RDEPEND="
dev-libs/libpqxx
)
semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
spacenav? ( dev-libs/libspnav )
ssl? ( dev-libs/openssl )
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff )
@ -150,9 +151,9 @@ src_configure() {
"-DGHNS=ON"
"-DWITH_X11=ON"
"-DWITH_Qt4=ON"
"-DBUILD_libmsooxml=ON"
"-DWITH_Iconv=ON"
"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
"-DBUILD_libmsooxml=ON" # only internal code, no deps
"-DWITH_Iconv=ON" # available on all supported arches and many more
"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
)
# default disablers
@ -164,7 +165,6 @@ src_configure() {
"-DWITH_TINY=OFF"
"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
)
# regular options
@ -198,6 +198,7 @@ src_configure() {
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use semantic-desktop NEPOMUK)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
$(cmake-utils_use_with tiff TIFF)

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.27 2012/08/20 21:01:45 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.28 2012/08/21 19:06:56 dilfridge Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -43,7 +43,7 @@ SLOT="4"
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
word-perfect xbase +xml +xslt"
# please do not sort here, order is same as in CMakeLists.txt
@ -113,6 +113,7 @@ RDEPEND="
dev-libs/libpqxx
)
semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
spacenav? ( dev-libs/libspnav )
ssl? ( dev-libs/openssl )
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff )
@ -150,8 +151,8 @@ src_configure() {
"-DGHNS=ON"
"-DWITH_X11=ON"
"-DWITH_Qt4=ON"
"-DBUILD_libmsooxml=ON"
"-DWITH_Iconv=ON"
"-DBUILD_libmsooxml=ON" # only internal code, no deps
"-DWITH_Iconv=ON" # available on all supported arches and many more
"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
)
@ -164,7 +165,6 @@ src_configure() {
"-DWITH_TINY=OFF"
"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
)
# regular options
@ -198,6 +198,7 @@ src_configure() {
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use semantic-desktop NEPOMUK)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
$(cmake-utils_use_with tiff TIFF)

@ -19,6 +19,7 @@
<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
<flag name="openctl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
<flag name="xbase">Enable support for xbase compatible database formats</flag>
<flag name="xslt">Enable xslt and exslt support format support</flag>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.4.ebuild,v 1.1 2012/07/03 13:06:54 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.4.ebuild,v 1.2 2012/08/22 00:05:10 ago Exp $
EAPI=3
@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
IUSE="cups debug nls +latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.2.3.ebuild,v 1.5 2012/08/09 16:12:06 nativemad Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.2.3.ebuild,v 1.6 2012/08/21 21:46:54 xmw Exp $
# ebuild generated by hackport 0.2.14
@ -15,7 +15,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.10.4

@ -0,0 +1 @@
DIST niecza-20.zip 1878083 SHA256 2ca2542c563130c5d4b45d5bd251601472695457568fc63cab6b6cbe3969c0e7 SHA512 2d587029a1037fca3901c0c1caadd6f6e5d9951d6804c54ef0262b69a7429c13458bd4e6eeb83a823ecb02afe93a3e9d0364065f1ca37412c674533a290363a6 WHIRLPOOL 580a62dbfdec49546c19b567b477727f3ff41a355b5d8cf50afa0418feda7768012049bf86737e97eb489b7871432835169b007a7ec7f65d3ed1ef487a7d0c09

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

@ -0,0 +1,34 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza-bin/niecza-bin-20.ebuild,v 1.1 2012/08/22 03:28:07 patrick Exp $
EAPI=4
inherit eutils multilib
DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
HOMEPAGE="https://github.com/sorear/niecza"
MY_PN="niecza"
MY_P="${MY_PN}-${PV}"
SRC_URI="https://github.com/downloads/sorear/${MY_PN}/${MY_P}.zip"
LICENSE="Artistic-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-lang/mono"
DEPEND="${RDEPEND}"
S=${WORKDIR}
src_configure() { :; }
src_compile() { :; }
src_install() {
mkdir ${D}/opt/niecza-bin -p
cp -r ${WORKDIR}/* ${D}/opt/niecza-bin || die "Failed to copy"
einfo "The binary is installed to /opt/niecza-bin/run/Niecza.exe"
}

@ -0,0 +1 @@
DIST niecza-19.zip 728618 SHA256 b320a72e77531515bafb2c1e1588572f39f24e9c38305eb4cbe60569e87845e9 SHA512 3be02a89f9698724fd4a5d8aad0dd2946a5cb4ace9bf519d0ddb52d159596beeeb162884a8b98b4fcdf8b322149ae222b3dd11caeb369218d73afe3194ab186c WHIRLPOOL 5e627ce9d885ed059bda2a898518bce551d82ca7801f5239b010316d5ce2aaf7c70ca063c73b204f06b72825158650a30653092ba86156e25021ad4bc67569b5

@ -0,0 +1,13 @@
--- Makefile 2012-06-25 22:30:16.000000000 +0800
+++ Makefile.new 2012-08-22 10:55:22.879717085 +0800
@@ -37,10 +37,6 @@
$(RUN_CLR) run/Kernel.dll -gen-app Niecza boot/obj
.fetch-stamp: FETCH_URL
- -rm -rf boot/
- mkdir boot
- wget --no-check-certificate -Oboot/niecza.zip $$(cat FETCH_URL)
- cd boot && unzip niecza.zip
NIECZA_KEEP_IL=1 $(RUN_CLR) boot/run/Niecza.exe -C $(libunits)
$(CP) boot/run/Kernel.dll boot/obj/
touch .fetch-stamp

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

@ -0,0 +1,57 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-19.ebuild,v 1.2 2012/08/22 03:34:07 patrick Exp $
EAPI=4
inherit eutils multilib
GITHUB_CRAP="sorear-niecza-3743eb0"
DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
HOMEPAGE="https://github.com/sorear/niecza"
#SRC_URI="https://github.com/downloads/sorear/${PN}/${P}.zip"
SRC_URI="https://github.com/sorear/niecza/zipball/v19 -> niecza-19.zip"
LICENSE="Artistic-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-lang/mono"
DEPEND="${RDEPEND}
|| ( dev-lang/niecza-bin dev-lang/niecza )"
S=${WORKDIR}/${GITHUB_CRAP}
src_prepare() {
epatch "${FILESDIR}"/fix-bootstrap.patch || die "Failed to fix"
cd "${S}"
# bootstrap only works from git dirs? sigh :)
sed -i -e 's:@git describe --tags:echo "v19":' Makefile
# silly workaround for stuff trying to write everywhere: copy the installed niecza here (sigh)
# since we have different installation paths for the bin version we need to check here
mkdir boot -p
if has_version dev-lang/niecza; then
cp -r /opt/niecza/* boot/
else
cp -r /opt/niecza-bin/* boot/
fi
}
src_configure() { :; }
src_compile() {
emake -j1 || die
}
src_test() {
emake -j1 test || die
}
src_install() {
mkdir -p "${D}"/opt/niecza
for i in docs lib obj run README.pod; do
cp -r "${S}"/$i "${D}"/opt/niecza/ || die "Failed to install"
done
}

@ -0,0 +1,55 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-9999.ebuild,v 1.1 2012/08/22 03:50:29 patrick Exp $
EAPI=4
inherit eutils git-2
GITHUB_CRAP="sorear-niecza-3743eb0"
DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
HOMEPAGE="https://github.com/sorear/niecza"
EGIT_REPO_URI="https://github.com/sorear/niecza.git"
LICENSE="Artistic-2"
SLOT="0"
IUSE=""
RDEPEND="dev-lang/mono"
DEPEND="${RDEPEND}
|| ( dev-lang/niecza-bin dev-lang/niecza )"
S=${WORKDIR}/${GITHUB_CRAP}
src_prepare() {
epatch "${FILESDIR}"/fix-bootstrap.patch || die "Failed to fix"
cd "${S}"
# bootstrap only works from git dirs? sigh :)
sed -i -e 's:@git describe --tags:echo "v19":' Makefile
# silly workaround for stuff trying to write everywhere: copy the installed niecza here (sigh)
# since we have different installation paths for the bin version we need to check here
mkdir boot -p
if has_version dev-lang/niecza; then
cp -r /opt/niecza/* boot/
else
cp -r /opt/niecza-bin/* boot/
fi
}
src_configure() { :; }
src_compile() {
emake -j1 || die
}
src_test() {
emake -j1 test || die
}
src_install() {
mkdir -p "${D}"/opt/niecza
for i in docs lib obj run README.pod; do
cp -r "${S}"/$i "${D}"/opt/niecza/ || die "Failed to install"
done
}

@ -0,0 +1,73 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Tue Aug 21 18:14:15 UTC 2012
Subject: build system
respect flags
--- Makefile
+++ Makefile
@@ -67,7 +67,7 @@
# CFLAGS
#CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
+CXXFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
USBOBJ = rcxlib/RCX_USBTowerPipe_none.o
@@ -87,20 +87,20 @@
# Linux
# uncomment this next line if you have the USB tower library installed
# USBOBJ = rcxlib/RCX_USBTowerPipe_linux.o
- CFLAGS += -I/usr/local/include/LegoUSB -Wno-deprecated
+ CXXFLAGS += -I/usr/include/LegoUSB -Wno-deprecated
else
ifneq (,$(findstring $(OSTYPE), SunOS))
# Solaris
- CFLAGS += -DSOLARIS
+ CXXFLAGS += -DSOLARIS
else
ifneq (,$(strip $(findstring $(OSTYPE), FreeBSD)))
# FreeBSD
USBOBJ = rcxlib/RCX_USBTowerPipe_fbsd.o
DEFAULT_SERIAL_NAME = "/dev/cuad0"
- CFLAGS += -Wno-deprecated
+ CXXFLAGS += -Wno-deprecated
else
# default Unix build without USB support
- CFLAGS += -O6
+ CXXFLAGS += -O6
endif
endif
endif
@@ -113,7 +113,7 @@
ifndef DEFAULT_SERIAL_NAME
DEFAULT_SERIAL_NAME = "/dev/ttyS0"
endif
-CFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)'
+CXXFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)'
#
# Object files
@@ -164,10 +164,10 @@
$(MKDIR) bin
bin/nqc : compiler/parse.cpp $(OBJ)
- $(CXX) -o $@ $(OBJ) $(LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
bin/mkdata : mkdata/mkdata.cpp nqc/SRecord.cpp
- $(CXX) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp
#
# clean up stuff
@@ -227,7 +227,7 @@
# general rule for compiling
#
.cpp.o:
- $(CXX) -c $(CFLAGS) $< -o $*.o
+ $(CXX) -c $(CXXFLAGS) $< -o $*.o
#

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.4 2012/07/04 19:46:56 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.5 2012/08/21 18:33:20 hasufell Exp $
EAPI=4
@ -20,13 +20,12 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"
pkg_setup() {
tc-export CXX
}
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc-4.7.patch
sed \
-e 's|$(CXX) -o |$(CXX) $(LDFLAGS) -o |g' \
-e 's|/usr/local|/usr|' \
-i Makefile \
|| die "sed Makefile"
epatch "${FILESDIR}"/${P}-{gcc-4.7,flags}.patch
}
src_configure() {
@ -35,10 +34,6 @@ src_configure() {
fi
}
src_compile() {
emake CXX=$(tc-getCXX) LDFLAGS="${LDFLAGS}"
}
src_install() {
dobin bin/*
newman nqc-man-2.1r1-0.man nqc.1

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-9999.ebuild,v 1.2 2012/08/21 08:30:04 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-9999.ebuild,v 1.3 2012/08/22 03:42:00 patrick Exp $
EAPI=4
inherit autotools git-2
@ -16,9 +16,6 @@ EGIT_REPO_URI="https://github.com/dylan-lang/opendylan.git"
LICENSE="Opendylan"
SLOT="0"
# not tested on x86
KEYWORDS="~amd64"
IUSE=""
DEPEND="dev-libs/boehm-gc[threads]

@ -1,5 +1,5 @@
DIST v8-3.11.10.17.tar.bz2 10115761 SHA256 9b15a405097f4ba8c3b0f2ef8bc8d6604e5cfa146d1fe96f8bd5b8a65c536941 SHA512 eea861f77ca324885aa42a6c49cc0a6731f2f6d10b505f5f881912a391e8d988a29f194d21a8aefbd942ea3f2d4dbc7330ea10d34450fde9c6fd05ee81731bbb WHIRLPOOL f3747e91982003f460d24e227f76b772c98f5037c216eccadcd78690b42ca17788bb7bffca77291ad1da5e0332b9f8320ac3d3675dd5fb12278dad5d5466e85e
DIST v8-3.11.10.18.tar.bz2 10115489 SHA256 daf26727982f258721ea686e9f54317b58c07e765a10ddcc493e75a56963bad0 SHA512 a387ee09f1df5d2d7d457c45b7714acfaef331c6d9c7959bc26c838de8e79658a7b50c6293327e4f185543b4f54cadcd08ba87bbe34d1cbf5830671732dd3e14 WHIRLPOOL e610920ea4465b135df1f561536cb7071677890945d8160b1cb03c5f490eda7846040bf494b08bbfda76f7b9841aa171904860d4e145056f29601ef3ee41f76f
DIST v8-3.12.16.tar.bz2 10179067 SHA256 ae78a0b5d0d5254c928ceb49ad15dd42fda7bf7f94a48f0cd8abfdbf7830e536 SHA512 e717281226da94669b340244ee0fcf899cdbe05215f093f177cae9c8b2e2b183ad7a98035d1894b6c5b07dccace6d9ca406ba3d818913a972673b11d99afb77e WHIRLPOOL 17313ed6599bc56ec12b5fb6f39f260225fedb016b3e4a5aea9abeace3d4bf42e4b69ba5186a5920ae4d0a5f859caa34d39dbd084f71ab72e1c885b824e0c96b
DIST v8-3.12.19.1.tar.bz2 10183101 SHA256 9a631fca8905f6a438a7394711ecef34cfda40f5f59634840efea34079d33b4e SHA512 ee8d150a124c9a76c2bfc4af8979ebf6ee92a67334190fe6b14ebfbb6b2f13b404ed64f8d103d1decc820252b8e999e77a9f3989e762f399f8e9aa6537979da5 WHIRLPOOL 8db519a824c05daa252a80757bbde5c911759e26f1e778e1189e1e4173e004b78290288dc53dad1952a118182b48755ac3c8f16f841bf17453bb85ce878d80e7
DIST v8-3.12.19.3.tar.bz2 10182696 SHA256 7269cd3f37beaecf672a433d5c91915d5f96559de626de1262479c982ee196e4 SHA512 8cc77e4d4ff488674463b23a49c15c4281f1d3fba80ea3391f797fd2f4e202f79e5386ad721de72e50c92dd6a7114de43d0df4b0ae789ad4d9e558973eec9b30 WHIRLPOOL 3bf8fa6975e8038eec26ba946c7aace3c7e9db181749cb548885b8eea5a8e7ad81455c259ac1995809ef37b0ffdf2cc90becfce092ea92dbccf345f7118c9aad
DIST v8-3.12.19.4.tar.bz2 10181859 SHA256 13522f20c82c2d97f01eadfd3c883bcb02f1ae419f845abd3ff1211e0d490f9b SHA512 be082425ce7841c115895b8ff67b076b0adc8d6e8ddd4504b746652097cc4f2de4f75684c1c3f961c18fe43c912c398f63960416a01d37ad7f6f414a0bd793f1 WHIRLPOOL 2f38ed9831651e56408248782702e76f90c6f877145993bce2b1921953e834505797b8b208f56d1b85636916fe8cf3f62917de5ccb2a774008de0cb926bb5dce

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.1.ebuild,v 1.1 2012/08/08 01:29:53 floppym Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.4.ebuild,v 1.1 2012/08/21 23:23:00 floppym Exp $
EAPI="4"

@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/legousbtower/legousbtower-0.5.4.ebuild,v 1.5 2010/12/30 18:44:10 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/legousbtower/legousbtower-0.5.4.ebuild,v 1.6 2012/08/21 18:41:48 hasufell Exp $
inherit linux-mod
@ -27,7 +27,7 @@ src_install() {
else
insinto /usr/include/LegoUSB
doins include/legousbtower.h
insinto /etc/udev/rules.d
insinto /lib/udev/rules.d
doins "${FILESDIR}"/20-lego.rules
fi
dodoc README

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/cryptokit-1.6.ebuild,v 1.3 2012/08/18 14:46:53 blueness Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/cryptokit-1.6.ebuild,v 1.4 2012/08/21 18:35:59 johu Exp $
EAPI="3"
@ -13,7 +13,7 @@ HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
SRC_URI="http://forge.ocamlcore.org/frs/download.php/891/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~x86 ~x86-fbsd"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
IUSE="zlib"
DEPEND="zlib? ( >=sys-libs/zlib-1.1 )"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.0.ebuild,v 1.2 2012/08/02 15:39:35 blueness Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.0.ebuild,v 1.3 2012/08/21 19:17:00 johu Exp $
inherit findlib
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ppc ~x86"
KEYWORDS="~amd64 ppc x86"
IUSE="doc opengl truetype" #noimage nomixer
DEPEND=">=dev-lang/ocaml-3.04

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.1.2.ebuild,v 1.3 2012/08/03 18:18:23 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.1.2.ebuild,v 1.4 2012/08/21 19:13:23 johu Exp $
EAPI="3"
@ -13,7 +13,7 @@ HOMEPAGE="http://ounit.forge.ocamlcore.org/"
SRC_URI="http://forge.ocamlcore.org/frs/download.php/886/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ppc ~x86"
KEYWORDS="amd64 ppc x86"
DEPEND=""
RDEPEND="${DEPEND}"
IUSE=""

@ -1,2 +1,3 @@
DIST jruby-openssl-0.7.4.gem 623104 SHA256 b0d67db29038e9e7ceefbff28a96f72bdb989e53808bc3b62ee167707179260d SHA512 de569ecd9f20320040bfe843717e7c7bb79dc08bf9d32154244575029aaf850024a983f3e38eb55798c65752095b965ef1de2c4c45d614e122fd4c0eef6279bc WHIRLPOOL db696c523b8faf2a1a3aa5eedbedb95710cd1aab6ab7655dfacc8da59cea75c09d600990fe43f406a3f3c6e1cfc8b0fd419fc5dae9fbfdb5aae82bc8a6ecf797
DIST jruby-openssl-0.7.6.1.gem 690688 SHA256 17c236725a4e3bbe04d1810fb3c08e6196ab2ff00ceb7d9b43860a6825a68bc4 SHA512 9cf3fea6038d3f0af8eced2afff10b6aea3eebd2cf75f37fca0a2ddcb78bd8a25f1aa9d0cf369d99fb17672c5e5c63ea385e13e0d2b195e29879789d4b74c0dc WHIRLPOOL 24216abd938a63e5005c62ad35f9f4cc01a94881e4a92e6aad6f47de311058131400f5c619b02051d53fe8211218622f3b44ba302ecc8bebd69f20bf33233ee2
DIST jruby-openssl-0.7.7.gem 692736 SHA256 2ea826de1f16434e4e4d8c4506b93bdaa79489f2ddb326549fd9a5300bd7d65e SHA512 55056d955f59496500ca0ae0e3645dd844f88b89b6221065f809ffc33585acd1b489329bdef50878ec47bbae1500f6ffb69df1cd852f09e4b25b66824badb32c WHIRLPOOL df8fd894fcf3b41dd48cd8838d84516fc8025c12c1a8ba96506dd4aa7b37df866e0258b3feac412479e3741f46798307ddec433639e6e1c341b21c2ac9548fc0

@ -0,0 +1,36 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jruby-openssl/jruby-openssl-0.7.7.ebuild,v 1.1 2012/08/21 18:36:34 graaff Exp $
EAPI=4
USE_RUBY=jruby
RUBY_FAKEGEM_TASK_DOC="redocs"
RUBY_FAKEGEM_DOCDIR="doc"
inherit ruby-fakegem
DESCRIPTION="A Ruby SSL library that works with JRuby"
HOMEPAGE="http://rubyforge.org/projects/jruby-extras"
LICENSE="MIT || ( CPL-1.0 GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="${RDEPEND} >=dev-java/jruby-1.5.6"
DEPEND="${DEPEND} >=dev-java/jruby-1.5.6"
ruby_add_bdepend "doc? ( dev-ruby/hoe )"
ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/mocha )"
ruby_add_rdepend ">=dev-ruby/bouncy-castle-java-1.5.0146.1"
all_ruby_prepare() {
# Remove a test that only works with JCE installed.
sed -i -e 's/OpenSSL::OPENSSL_VERSION_NUMBER > 0x00907000/false/' test/test_cipher.rb || die
# Remove tests depending on a build_lib that is not shipped
rm test/test_java.rb || die
}

@ -1,3 +1,4 @@
DIST json-1.5.4.gem 678912 SHA256 3acf6c344e5f9089b6e4d675d18384bb61a36c81d038ce9a65906987711c789e SHA512 f38768fb3bb2f9a5348d662b65c608eec635aa6ae931245d8afeca03ced587ad55186d78f95a1dad95700621bad526ea2eac51e4db4c66b46c726eaa4f02a897 WHIRLPOOL ffb1903ee5bb2193c5cc08e5ee872fca92a4981663fa77ce9f27ff897ce6279fd793eec2df92716c09deab62afa9bc1876c02a542e06b2722b0bf991eb61d051
DIST json-1.6.7.gem 143872 SHA256 02ad99f012ea4aaaab5b15fd3b0b44ac05aed08ef29e0173d46fcf01d63a070f SHA512 200c0fa2dfecdf78bc8d9faa6b8cccaaa61966d2314f2d7aee0ac778bd0a0959894c8c5bebf6cb858a084b041fd68fe5106ab6545be3bf7b3dc28e7449efe1d9 WHIRLPOOL 2a58c1219f5b82255a947fcea79aaccbe71b31e930efc9c3eb7d1a06f6e9f20c8fcc5e31f3fd07337d43e49723139ba0575c8027faa362cca25adc05bf3b6af9
DIST json-1.7.4.gem 145920 SHA256 d2129e3fa9f5ed1629367559a0740d8d920e0f5d328e7450a380ee8040eb9e4d SHA512 c0e5deceb3f67009abc6297ab5845885256bfc23079fdd09ed2e8ba4a05fb836be50cc64f00768cd7c0f2997f4dcdf02e096b116ca453913aba08d808ca3883c WHIRLPOOL 694311f2614cecfc6352ede4b8f2d69b029c037a16cdf0ab9dc793483fd0c269ba3efae99fb13bb14d0eda896b3f545afdfe2891faf3369514e72da5ca4be0d6
DIST json-1.7.5.gem 145920 SHA256 e064596aed55983ece9b4864a347ace1b2f0d3541292c5bf4be955994f8d8e7c SHA512 840f83f7f56becb9e3f53e951e51d2d340148387cac92822f36b3f61766e55e4c04a7c958d39457ddd351ac510ab7e373cc1b773c0203b0ca0ece83a1d384b3d WHIRLPOOL 4b69f87fbb617e6cdbcd76299d666bdac940ad280fa76ef1ea8783316703f88fbcde86d1606025edc7dae13b9b6bd33ff41387c8b3f1fc38326e226b0fff3c78

@ -0,0 +1,65 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.7.5.ebuild,v 1.1 2012/08/21 19:04:25 graaff Exp $
EAPI=4
USE_RUBY="ruby18 ree18 ruby19 jruby"
RUBY_FAKEGEM_TASK_DOC="doc"
RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_GEMSPEC="json.gemspec"
inherit multilib ruby-fakegem
DESCRIPTION="A JSON implementation as a Ruby extension."
HOMEPAGE="http://json.rubyforge.org/"
LICENSE="|| ( Ruby GPL-2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
RDEPEND="${RDEPEND}"
DEPEND="${DEPEND}
dev-util/ragel"
ruby_add_bdepend "dev-ruby/rake"
all_ruby_prepare() {
# Avoid building the extension twice!
# And use rdoc instead of sdoc which we don't have packaged
# And don't call git to list files. We're using the pregenerated spec anyway.
sed -i \
-e 's| => :compile||' \
-e 's| => :clean||' \
-e 's|sdoc|rdoc|' \
-e 's|`git ls-files`|""|' \
Rakefile || die "rakefile fix failed"
}
each_ruby_compile() {
# Since 1.5.0 a Java extension is provided but it does not compile.
if [[ $(basename ${RUBY}) != "jruby" ]]; then
${RUBY} -S rake compile || die "extension compile failed"
fi
}
each_ruby_test() {
JSON=pure \
${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "pure ruby tests failed"
if [[ $(basename ${RUBY}) != "jruby" ]]; then
JSON=ext \
${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "ext ruby tests failed"
fi
}
each_ruby_install() {
each_fakegem_install
if [[ $(basename ${RUBY}) != "jruby" ]]; then
ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.17.ebuild,v 1.1 2012/08/11 08:38:31 graaff Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.17.ebuild,v 1.2 2012/08/22 00:18:15 flameeyes Exp $
EAPI=4
USE_RUBY="ruby18 ree18"
@ -45,3 +45,8 @@ ruby_add_bdepend "
doc? (
>=dev-ruby/redcloth-4.1.1
)"
all_ruby_prepare() {
# allow newer thor
sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.8.ebuild,v 1.1 2012/08/11 08:38:31 graaff Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.8.ebuild,v 1.2 2012/08/22 00:18:15 flameeyes Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 ree18"
@ -51,4 +51,7 @@ all_ruby_prepare() {
# Remove items from the common Gemfile that we don't need for this
# test run. This also requires handling some gemspecs.
sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die
# allow newer thor
sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
}

@ -2,6 +2,7 @@ DIST git-1.6.4.5.tar.bz2 2176867 SHA256 5e570a62d443a32ef013561817b87b4e8968407e
DIST git-1.7.10.2.tar.gz 3809702 SHA256 335e978814659f328e377715b13a33336859275ae6f215bf28bbbb2ae711bb43 SHA512 52ba7168d50128cf9abc2052400050f14f073c5398c8075d1e3e7695f2d701b107f74e24ca1b2b671a03411010eee86f46c0500de487d5b54d496f1e8d093403 WHIRLPOOL 3913dee3d07acc1a91a4bf553bec9c4fe41321a81d67d10cdbfab5ba81da9a1b010c3be4307616960749840fa85137c237eaf027bdfca6800e95e262752d203f
DIST git-1.7.10.tar.gz 3753777 SHA256 d2a88d1564ebe468bb6a58a4edb57f5e06bda9846300cdbedbef8f7bccaf4ea6 SHA512 01c622c284a4a661c67facfe6776a86163b68612d7233a887be06cc49e2ba7c7eab36ac5033ee6eec6a56b36ceed1fc85d45f6118d9038fdea82f2bb2b9fd2a7 WHIRLPOOL 7f4f10b60cd2c9ce2e508815d8774424307bcd7272e0500dfe12b84042b998173a187511bbe5d52bde3f387dbb7aef06cf3b8e4e76ee0c6aa442868e5d6551a1
DIST git-1.7.11.1.tar.gz 4000383 SHA256 b0d90066f3e929b84787d10270461d0d81314898b8f335884e257f4b3091e89e SHA512 23df9e81db3e5df6e6d5fd8a0156b4e645cfcf6ea4c1c03503d9bd780b51b3127a20c6e72a2b41d24c29ab9ef85264b95071ad7074abab6b09074f0de5b0ac4f WHIRLPOOL 4ff6ef2ee0dfa86af4f79a78383c30b963899ed4410f7981f2ca4dce80d80a4d95b252b793b6e8b6e86fa2a885ab3d8fe1812a3232a7f1b371c62a5a801dede9
DIST git-1.7.12.tar.gz 4092043 SHA256 3b8661782dc280d3d4be5193bcb8a1895c1ba272cf02efb70857bbcc4415f505 SHA512 1353eca72d664bcceb900bbe90003ceb2b8f73db8e3a402e8f2c142f3e933fc19f95c4c5118a1c57221d6513dba3e1912f40169cf36ff8abea97dbf2f8e84502 WHIRLPOOL 11ede1f8383136d0ace13c99e7345c738e911f8038e09cad0aaf8e7cbba789d753b5c337f053b3a145d6a35d29285558571b893fa9f3bc6ac76ec8e25c4fc4f8
DIST git-1.7.2.5.tar.bz2 2561345 SHA256 d84e6d76fe9d30af5515ea8177b0d8bfe774ee0836d21ed450cb4d52f5aa6311 SHA512 b78e59ea0b110c24121116abbbc191910ba8feae9ca2c89d661abc456cadfa21e42bdc72c961a94a46b47b20f64cd8bf23d0ed600ae40afb8572eb3455ea3ea4 WHIRLPOOL 36dc12f00c84f339502f9b3104a183e855e2b7eb5e11ef46c162804df0613dada52a237f1854177909ddd7d29bf9f317e3dfb6fe223f3e18db4518e7c35a6a1c
DIST git-1.7.3.4.tar.bz2 2635522 SHA256 3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171 SHA512 93cb7a86020488bcb1e367442978c1f2c57be0c623f2f8d7d5cf385fcf2e43fff03354b18985e1560ef807f05d251ea1041440b09216408863cbc1ab7510a09a WHIRLPOOL bbe4f3c71d5322749203eec852aba838f591d24abcdc09949d0727155fa9ecdad9cc127de998173fc3e35459440d173317fda456822645f73c52c28fa37bcfd8
DIST git-1.7.8.6.tar.gz 3546112 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0c8112735456a22fdf1f6db9 SHA512 84b0341d040a0f99a40d2d316498a964cf386818673ccf04aacb3b2a7e3c09b275f819a7cd9746dec67e1d0300e13fe5706a57c94ae2d26fd1b82e9b93f405ae WHIRLPOOL 804e70176a229123e09348b6585a461bc162edf9786d617926f42fdab6e615ffba9a9b2b6654562d9757e96bdb3603aaa2ee78ac8c0f124d413409b0fcc7cfa8
@ -16,6 +17,7 @@ DIST git-htmldocs-1.6.4.5.tar.bz2 772113 SHA256 12c13ead869918d8470d68c7331675c5
DIST git-htmldocs-1.7.10.2.tar.gz 1764063 SHA256 4cb17519eb621060d657c71ba8b10d755a6ea71123642ed6cc73d24ce8f0b734 SHA512 bb2d0b1e5914aaa10e0c13e2c31e45fdc62d413b06eaff3766279c39cc89a81fddcb902b3f3ba2b77118a94b52fc3b32f48c4a0131c8144966efa5349d6ef54e WHIRLPOOL 46043e51bfbb0279b9cde5ac2ac836416ebc77005cf4ee43696196fdf80eb33fe4933b8ece206ab5308be61230750e5262e785af8c944718f0c347d03dc09ab7
DIST git-htmldocs-1.7.10.tar.gz 1759866 SHA256 049fb01aaaeb9b3dd7bb93e5d601fce33164ad4127519d797e950e0e02f54137 SHA512 2d201f29f1beb0ba7db4ed61fab75b50afc0da3fd6d60337830f178da064bb0c01061ea1bcf6ec3afbdec87d16f54ce8dee82fb8c03c630a62b27f1841049823 WHIRLPOOL 7c1ca7b3ab93e6567b7e483959be106c2abbed0ff5c62fe347abb1a622aa546f6f74ba0163379652d61aae46642d65e3f455df08501aeb47d7a54299b4843c25
DIST git-htmldocs-1.7.11.1.tar.gz 1775348 SHA256 24cf2400deba4b07a8723e59e033848dd56f3539a5196b5f35aa0782dd682ecb SHA512 0ac99da600ecbc368ba987a387115bf01fe612b2e5675a0f8d95bfa6d039eaa148e7a5ba0bc270352de4aeb14de29962239dc3e799d31986869080afb5c78439 WHIRLPOOL 25cc47ff335c377e95a1dc1cdb557af758f60bf1bde8aeafdcb626bf964a70f40d61f23b6d5ffab93465c513ebb8ba0f0abe277a4d11719024387de7c84371c0
DIST git-htmldocs-1.7.12.tar.gz 1787511 SHA256 7f58468a20ca7f7d225698d0747902c34f891c88df6beff270b739d6adf4d271 SHA512 6f76f5a2b1bccaddf2ff48a0454c8710c74a197d1ff60bd081fbd67c8c0b3baf21ee2d6c6c27b9cfdc975ce14550be3482241540da6cafa0761c291fd40cc46d WHIRLPOOL 1bd554a612afc58486fc1db4e7fc5cb8d110eb4a6d3eaffc757031248a17421796015f086fe3509b183e64bd84a656623ca8e3fa83ae72078dfdce8159121473
DIST git-htmldocs-1.7.2.5.tar.bz2 919247 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337 SHA512 e8b2bc14b1a687f76256dfcfae893252b091c6d60dcd0fc53da50ceaee1434d5c976f1d09d45f8cc5a2991a9051ee8d0482a281fe7559225b6c750fe241b713c WHIRLPOOL d1ea7a272ba728e01523439ac897e1ecbc22917aceaa8871ade522d18db37df0d305fd3dd1782ef20dc1c935ec3965ebbe86d4cc29419a9e82aee831002eabed
DIST git-htmldocs-1.7.3.4.tar.bz2 929858 SHA256 24f03bcd6b5c3745c2395cf49260cdbf7fe80292883b0b4da3e1ac636aee6fba SHA512 3cda317a0608ef1ee18752fd9f0cba8bc91c3f5d66e0e1d8ee4beb63b7e50dd562721fe53bde3244528a915ad463fc60d13896f3344a7679256c11c79fdb33e4 WHIRLPOOL b83941afd6aaafa5354711fdeefa5cbce7e2b255c0ccab411f94dee48d97838fd7224d098c085eec5e1dfd3eb0599b1a39c8cddeeb1b727a15a2398d4c4b6d11
DIST git-htmldocs-1.7.8.6.tar.gz 1688622 SHA256 7c7447fe136349b1807caba1c00fe6a46866c9b54cba068f322967c0f8b2c0bf SHA512 31a88363aad7a20a5633530a080258807ef52c1a4074dd308d00540f1dc2b6e1c68d1bb43fa55b14b0fff5e3c24034a15debc9236ad3a2eafa8440982a5462cd WHIRLPOOL a8bc612b3d3a453eb46cc7a79fd929b2ac1c9858a52b3687c59fd113c582c4330f44e1dd64f5c4b755ab49aefc03295a19c440af12001f2f42e5ab1836775f7f
@ -30,6 +32,7 @@ DIST git-manpages-1.6.4.5.tar.bz2 254368 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0
DIST git-manpages-1.7.10.2.tar.gz 511363 SHA256 bc57810ec8d87f7a10f320e31ceeb1f9eaf254e62e0f6414af67f17d0cf7d522 SHA512 f62c5996675273f4180de7515782025075ff6c0256b3d41b13916fd0fae1902a61cc554e24aa565b7bee61efb900ff072119332215d55a2819a02eed476f2245 WHIRLPOOL 5496599e839d17e0ce4194598c1e46aba80cd3c2a6352a7168a975a768d3ce71fdca413fe957cd9b2ab2af35adbf401497984ad66858a333f11ea7c8889d6841
DIST git-manpages-1.7.10.tar.gz 510752 SHA256 19f2b47b436166a6d5958142d8517f057a9532d58249344c482462dbf204d703 SHA512 e6481a3d768ec2ad1f6e22e6e1630c934cb4dd719c86d2b6a5ac46d0f22d213c6602508ef44a584557bec123aa076e60087843e5ad0548dbe5a9de0f419e9e27 WHIRLPOOL f66e2eff2efd5b22db19e2d4d39b84fd1339cd2819cfb370391c2b8788651071a71c49120df22c0e750d07be45eb936122785b4e797ada5b50011bd78e0866b9
DIST git-manpages-1.7.11.1.tar.gz 514150 SHA256 aaf8593c85400406ccd1a87af21401ed967fa9d4ff6f0cf04a1e121af1b47e77 SHA512 6b1580600c74b32131cbb07923494581a97c7690283c416c5cc18ceb3ceefd9593e3710c3f3da44b0c0bf82921d1ba91f206497860ea0e07641482cb76052d3e WHIRLPOOL cae734b0db0caa72501753b12b0e547438106dcac8d4b358defc00e96a392f6d3e926ae53dd02e5016e19a553c5328d196dbd657c1f7fe9bd174d76636812d2d
DIST git-manpages-1.7.12.tar.gz 517802 SHA256 146a4e0899a028fd4256654e472ecfe3bef995fb029ea71c35ff9618f14dc127 SHA512 bc407311884e343a550f3280fd48efc8acf63d7682ad9b787c79f64de6268da3183ad9fb09d8354b3c1b8b76539e28d40aee595a5a49cfe9f6c1c147e52ba1be WHIRLPOOL 3fef3a1187574abcfc583a1fddd160fa0512f3466d58420442ca11afc15acc6c0343dd08a05f265fd44b51eb0c1fc5728a2b8cc7b647fcbd3fb3e8529dd47e5a
DIST git-manpages-1.7.2.5.tar.bz2 289543 SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e SHA512 b4065ef9ed7beb84d56fdfeadf9608c0b6bd36a06460b68ba575583062612f469e7db1d08c232f3a9253ca0b957bacc508fd4ec702070eb4c84d174af1828ab9 WHIRLPOOL d22249c22ad9da862cb842e37463cff3a7967de70441a851640641d78d185da916db9f3d3fec328bc10e48bc318b2b4fa085fae81c2576a758dededf153cc78b
DIST git-manpages-1.7.3.4.tar.bz2 294381 SHA256 2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75 SHA512 d73e3d11a0b551d35cfb3fbc214ecec34ea7cb79e11e9453be5dd7c649f7fd93b7ab286590cb6101d5f011b35ee0469443325cd9636520717dc15057f34c413d WHIRLPOOL b17d6e9fefdb02faf4a33ad7ca4707432274e0a929e274d5347fb9917250e76295f2d28da930dff16d9cee4a5fc6fdfbf5b9b700a6d8fdcc218df6ded5088c1a
DIST git-manpages-1.7.8.6.tar.gz 501678 SHA256 559b7a6ba8eaad655d725765b75aff9c6a5aaed2cc77abcdd2f88c773a0b3a6d SHA512 925c1775e0d57ee832c0794a8adaa5ebe332556358dbe75cedf9298d1f2e39b31e43693d8873667fdd1795e9e7dd71be83880d78d6ff6454959f325fc518bd88 WHIRLPOOL 2ef274e721013070440f8addbc4fd5cfb886db3b78f3a961bf7add2864e9ae609340ca26de88e3edcbd7513ebab1f46ef8d25d3e06bfe760233afdb1d7ccba4a

File diff suppressed because it is too large Load Diff

@ -0,0 +1,368 @@
From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
From: Robin Johnson <robbat2@gentoo.org>
Date: Wed, 22 Aug 2012 04:25:06 +0000
Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
utilities
Forward-ported from 1.7.10.2 to current git.git v1.7.12 tag PLUS fix-svn branch.
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/Makefile git-1.7.12/Makefile
--- git-1.7.12.orig/Makefile 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/Makefile 2012-08-22 04:23:48.335032122 +0000
@@ -224,6 +224,8 @@
#
# Define NO_TCLTK if you do not want Tcl/Tk GUI.
#
+# Define NO_CVS if you do not want any CVS interface utilities.
+#
# The TCL_PATH variable governs the location of the Tcl interpreter
# used to optimize git-gui for your system. Only used if NO_TCLTK
# is not set. Defaults to the bare 'tclsh'.
@@ -405,6 +407,7 @@
PROGRAM_OBJS =
PROGRAMS =
SCRIPT_PERL =
+SCRIPT_PERL_CVS =
SCRIPT_PYTHON =
SCRIPT_SH =
SCRIPT_LIB =
@@ -445,18 +448,19 @@
SCRIPT_PERL += git-add--interactive.perl
SCRIPT_PERL += git-difftool.perl
SCRIPT_PERL += git-archimport.perl
-SCRIPT_PERL += git-cvsexportcommit.perl
-SCRIPT_PERL += git-cvsimport.perl
-SCRIPT_PERL += git-cvsserver.perl
SCRIPT_PERL += git-relink.perl
SCRIPT_PERL += git-send-email.perl
SCRIPT_PERL += git-svn.perl
+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
+SCRIPT_PERL_CVS += git-cvsimport.perl
+SCRIPT_PERL_CVS += git-cvsserver.perl
+
SCRIPT_PYTHON += git-remote-testgit.py
SCRIPT_PYTHON += git-p4.py
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
- $(patsubst %.perl,%,$(SCRIPT_PERL)) \
+ $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
git-instaweb
@@ -2088,8 +2092,18 @@
$(QUIET_GEN)$(cmd_munge_script) && \
mv $@+ $@
+_SCRIPT_PERL_BUILD =
+_SCRIPT_PERL_NOBUILD =
+
ifndef NO_PERL
-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
+
+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
+
+ifndef NO_CVS
+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
+else # NO_CVS
+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
+endif # NO_CVS
perl/perl.mak: perl/PM.stamp
@@ -2101,7 +2115,7 @@
perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
$(QUIET_GEN)$(RM) $@ $@+ && \
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
sed -e '1{' \
@@ -2126,14 +2140,17 @@
chmod +x $@+ && \
mv $@+ $@
else # NO_PERL
-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
+endif # NO_PERL
+
+# This is any perl scripts that were disabled it might be empty...
+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
unimplemented.sh >$@+ && \
chmod +x $@+ && \
mv $@+ $@
-endif # NO_PERL
ifndef NO_PYTHON
$(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9200-git-cvsexportcommit.sh git-1.7.12/t/t9200-git-cvsexportcommit.sh
--- git-1.7.12.orig/t/t9200-git-cvsexportcommit.sh 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9200-git-cvsexportcommit.sh 2012-08-22 04:19:23.650741974 +0000
@@ -12,6 +12,11 @@
test_done
fi
+if ! test_have_prereq CVS; then
+ skip_all='skipping git cvsexportcommit tests, cvs not available'
+ test_done
+fi
+
cvs >/dev/null 2>&1
if test $? -ne 1
then
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9400-git-cvsserver-server.sh git-1.7.12/t/t9400-git-cvsserver-server.sh
--- git-1.7.12.orig/t/t9400-git-cvsserver-server.sh 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9400-git-cvsserver-server.sh 2012-08-22 04:19:23.650741974 +0000
@@ -11,9 +11,15 @@
. ./test-lib.sh
if ! test_have_prereq PERL; then
- skip_all='skipping git cvsserver tests, perl not available'
+ skip_all='skipping git-cvsserver tests, perl not available'
test_done
fi
+
+if ! test_have_prereq CVS; then
+ skip_all='skipping git-cvsserver tests, cvs not available'
+ test_done
+fi
+
cvs >/dev/null 2>&1
if test $? -ne 1
then
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.12/t/t9401-git-cvsserver-crlf.sh
--- git-1.7.12.orig/t/t9401-git-cvsserver-crlf.sh 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9401-git-cvsserver-crlf.sh 2012-08-22 04:19:23.650741974 +0000
@@ -38,15 +38,20 @@
fi
}
-cvs >/dev/null 2>&1
-if test $? -ne 1
+if ! test_have_prereq PERL
then
- skip_all='skipping git-cvsserver tests, cvs not found'
+ skip_all='skipping git-cvsserver tests, perl not available'
test_done
fi
-if ! test_have_prereq PERL
+if ! test_have_prereq CVS
then
- skip_all='skipping git-cvsserver tests, perl not available'
+ skip_all='skipping git-cvsserver tests, cvs not available'
+ test_done
+fi
+cvs >/dev/null 2>&1
+if test $? -ne 1
+then
+ skip_all='skipping git-cvsserver tests, cvs not found'
test_done
fi
"$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9600-cvsimport.sh git-1.7.12/t/t9600-cvsimport.sh
--- git-1.7.12.orig/t/t9600-cvsimport.sh 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9600-cvsimport.sh 2012-08-22 04:19:23.650741974 +0000
@@ -3,14 +3,25 @@
test_description='git cvsimport basic tests'
. ./lib-cvs.sh
-test_expect_success PERL 'setup cvsroot environment' '
+if ! test_have_prereq PERL
+then
+ skip_all='skipping git cvsimport tests, perl not available'
+ test_done
+fi
+if ! test_have_prereq CVS
+then
+ skip_all='skipping git cvsimport tests, cvs not available'
+ test_done
+fi
+
+test_expect_success 'setup cvsroot environment' '
CVSROOT=$(pwd)/cvsroot &&
export CVSROOT
'
-test_expect_success PERL 'setup cvsroot' '$CVS init'
+test_expect_success 'setup cvsroot' '$CVS init'
-test_expect_success PERL 'setup a cvs module' '
+test_expect_success 'setup a cvs module' '
mkdir "$CVSROOT/module" &&
$CVS co -d module-cvs module &&
@@ -42,23 +53,23 @@
)
'
-test_expect_success PERL 'import a trivial module' '
+test_expect_success 'import a trivial module' '
git cvsimport -a -R -z 0 -C module-git module &&
test_cmp module-cvs/o_fortuna module-git/o_fortuna
'
-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
+test_expect_success 'pack refs' '(cd module-git && git gc)'
-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
+test_expect_success 'initial import has correct .git/cvs-revisions' '
(cd module-git &&
git log --format="o_fortuna 1.1 %H" -1) > expected &&
test_cmp expected module-git/.git/cvs-revisions
'
-test_expect_success PERL 'update cvs module' '
+test_expect_success 'update cvs module' '
(cd module-cvs &&
cat <<EOF >o_fortuna &&
O Fortune,
@@ -86,7 +97,7 @@
)
'
-test_expect_success PERL 'update git module' '
+test_expect_success 'update git module' '
(cd module-git &&
git config cvsimport.trackRevisions true &&
@@ -97,7 +108,7 @@
'
-test_expect_success PERL 'update has correct .git/cvs-revisions' '
+test_expect_success 'update has correct .git/cvs-revisions' '
(cd module-git &&
git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
@@ -105,7 +116,7 @@
test_cmp expected module-git/.git/cvs-revisions
'
-test_expect_success PERL 'update cvs module' '
+test_expect_success 'update cvs module' '
(cd module-cvs &&
echo 1 >tick &&
@@ -114,7 +125,7 @@
)
'
-test_expect_success PERL 'cvsimport.module config works' '
+test_expect_success 'cvsimport.module config works' '
(cd module-git &&
git config cvsimport.module module &&
@@ -126,7 +137,7 @@
'
-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+test_expect_success 'second update has correct .git/cvs-revisions' '
(cd module-git &&
git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
@@ -135,7 +146,7 @@
test_cmp expected module-git/.git/cvs-revisions
'
-test_expect_success PERL 'import from a CVS working tree' '
+test_expect_success 'import from a CVS working tree' '
$CVS co -d import-from-wt module &&
(cd import-from-wt &&
@@ -148,12 +159,12 @@
'
-test_expect_success PERL 'no .git/cvs-revisions created by default' '
+test_expect_success 'no .git/cvs-revisions created by default' '
! test -e import-from-wt/.git/cvs-revisions
'
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
test_done
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.12/t/t9601-cvsimport-vendor-branch.sh
--- git-1.7.12.orig/t/t9601-cvsimport-vendor-branch.sh 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9601-cvsimport-vendor-branch.sh 2012-08-22 04:19:23.650741974 +0000
@@ -34,6 +34,17 @@
test_description='git cvsimport handling of vendor branches'
. ./lib-cvs.sh
+if ! test_have_prereq PERL
+then
+ skip_all='skipping git cvsimport tests, perl not available'
+ test_done
+fi
+if ! test_have_prereq CVS
+then
+ skip_all='skipping git cvsimport tests, cvs not available'
+ test_done
+fi
+
setup_cvs_test_repository t9601
test_expect_success PERL 'import a module with a vendor branch' '
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.12/t/t9602-cvsimport-branches-tags.sh
--- git-1.7.12.orig/t/t9602-cvsimport-branches-tags.sh 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9602-cvsimport-branches-tags.sh 2012-08-22 04:19:23.650741974 +0000
@@ -6,6 +6,17 @@
test_description='git cvsimport handling of branches and tags'
. ./lib-cvs.sh
+if ! test_have_prereq PERL
+then
+ skip_all='skipping git cvsimport tests, perl not available'
+ test_done
+fi
+if ! test_have_prereq CVS
+then
+ skip_all='skipping git cvsimport tests, cvs not available'
+ test_done
+fi
+
setup_cvs_test_repository t9602
test_expect_success PERL 'import module' '
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9603-cvsimport-patchsets.sh git-1.7.12/t/t9603-cvsimport-patchsets.sh
--- git-1.7.12.orig/t/t9603-cvsimport-patchsets.sh 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9603-cvsimport-patchsets.sh 2012-08-22 04:19:23.650741974 +0000
@@ -14,6 +14,17 @@
test_description='git cvsimport testing for correct patchset estimation'
. ./lib-cvs.sh
+if ! test_have_prereq PERL
+then
+ skip_all='skipping git cvsimport tests, perl not available'
+ test_done
+fi
+if ! test_have_prereq CVS
+then
+ skip_all='skipping git cvsimport tests, cvs not available'
+ test_done
+fi
+
setup_cvs_test_repository t9603
test_expect_failure 'import with criss cross times on revisions' '
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/test-lib.sh git-1.7.12/t/test-lib.sh
--- git-1.7.12.orig/t/test-lib.sh 2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/test-lib.sh 2012-08-22 04:19:23.650741974 +0000
@@ -618,6 +618,7 @@
esac
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
+test -z "$NO_CVS" && test_set_prereq CVS
test -z "$NO_PERL" && test_set_prereq PERL
test -z "$NO_PYTHON" && test_set_prereq PYTHON
test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE

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

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

@ -4,3 +4,4 @@ DIST subversion-1.7.1.tar.bz2 5973480 SHA256 d34bde626fac1aa553f5c9aeedf961999a7
DIST subversion-1.7.2.tar.bz2 5944987 SHA256 7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517 SHA512 87bbc21af68ec98e15142511ababc7b28e427450803c47c4a191e0f1de9f2ebf6e94e4063bf91df23ae30b6aecac28d64fa18793027f6d928e19f10ba91d2785 WHIRLPOOL 9d34f171eea8af2481bbc3516c6e0ff97238385cd86d75edb5fc8e602ddb5da3c14b45c29ac57a32ba3800a70dfc689e27c423a9d470134b02eed846ce530e6a
DIST subversion-1.7.4.tar.bz2 5978020 SHA256 c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f SHA512 fd99a089bb2673f61686199446f6df0795b45be101a7e823ec481597ff5c17c11843c9e36deb5e178712a96291b146efaa3111eb59097146f5fae38d20de77ba WHIRLPOOL aa80f7bf327dd869dbd87dbce3a6a12fb462c687f01155c98f91058c33c2b5a74d5e0ae3a6f4c72d305a20cd2f0d0922213565be3400282e4fb1124977efcdfb
DIST subversion-1.7.5.tar.bz2 6002955 SHA256 cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec SHA512 8447e0b9c4b0647480e55b0d8c09cf2940bf3d3ecda6cae28717423086a8334d36ce62ef066f8c1d918e85395287fed0a3e38d6c128a6d48559bac2cd95e85d4 WHIRLPOOL 5fba33c8a7171d2c6b0aaf1416934c598a5ee46e20b00bb4b0d832d6e08d6a0f85ade4752ece29b1fb51539317790f4f3a7bd381382ed1d0fa79179441dd4613
DIST subversion-1.7.6.tar.bz2 6006767 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05 SHA512 bced624139b3a284918edce59419a9933080ecfd861e8eaf3a7abc56c72c1e9b50d8ff3fc6185783d5b537c5be87c1e328ad42288bc063103b456c3d376c42ce WHIRLPOOL 7425ad97d27cb127a6e45845ccc419d5f9bc61101c6d675565f08af96bb8f27ea06ecd1116f214f23e8465529aa17aee53c33319b618ac12e4e912e707bce2a8

@ -0,0 +1,48 @@
--- build-outputs.mk 2012-08-21 20:38:31.000000000 +0200
+++ build-outputs.mk.new 2012-08-21 20:45:08.000000000 +0200
@@ -825,7 +825,7 @@
# Section 6: Install-Group build targets
########################################
-apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
@@ -877,16 +877,17 @@
test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT)
-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
########################################
# Section 7: Install-Group install targets
########################################
-install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
+ cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
$(MKDIR) $(DESTDIR)$(bdb_libdir)
@@ -1036,7 +1037,7 @@
$(MKDIR) $(DESTDIR)$(swig_rb_libdir)
cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la
-install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la
+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
$(MKDIR) $(DESTDIR)$(toolsdir)
cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
@@ -1046,7 +1047,6 @@
cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT)
- cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
########################################

@ -0,0 +1,452 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.6.ebuild,v 1.2 2012/08/21 20:53:41 tommy Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
WANT_AUTOMAKE="none"
MY_P="${P/_/-}"
inherit autotools bash-completion-r1 db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python eutils
DESCRIPTION="Advanced version control system"
HOMEPAGE="http://subversion.apache.org/"
SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="Subversion GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
CDEPEND=">=dev-db/sqlite-3.4
>=dev-libs/apr-1.3:1
>=dev-libs/apr-util-1.3:1
dev-libs/expat
sys-libs/zlib
berkdb? ( >=sys-libs/db-4.0.14 )
ctypes-python? ( =dev-lang/python-2* )
gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
kde? ( sys-apps/dbus x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 >=kde-base/kdelibs-4:4 )
perl? ( dev-lang/perl )
python? ( =dev-lang/python-2* )
ruby? ( >=dev-lang/ruby-1.8.2:1.8 )
sasl? ( dev-libs/cyrus-sasl )
webdav-neon? ( >=net-libs/neon-0.28 )
webdav-serf? ( >=net-libs/serf-0.3.0 )"
RDEPEND="${CDEPEND}
apache2? ( www-servers/apache[apache2_modules_dav] )
java? ( >=virtual/jre-1.5 )
kde? ( kde-base/kwalletd )
nls? ( virtual/libintl )
perl? ( dev-perl/URI )"
DEPEND="${CDEPEND}
!!<sys-apps/sandbox-1.6
ctypes-python? ( dev-python/ctypesgen )
doc? ( app-doc/doxygen )
gnome-keyring? ( virtual/pkgconfig )
java? ( >=virtual/jdk-1.5 )
kde? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
webdav-neon? ( virtual/pkgconfig )"
want_apache
pkg_setup() {
if use berkdb; then
local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
| sed 's:.*b::')"
einfo
if [[ -z "${SVN_BDB_VERSION}" ]]; then
if [[ -n "${apu_bdb_version}" ]]; then
SVN_BDB_VERSION="${apu_bdb_version}"
einfo "Matching db version to apr-util"
else
SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
fi
fi
einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
einfo
if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
eerror "Aborting to avoid possible run-time crashes."
die "Berkeley DB version mismatch"
fi
fi
depend.apache_pkg_setup
java-pkg-opt-2_pkg_setup
if use ctypes-python || use python; then
python_pkg_setup
fi
if ! use webdav-neon && ! use webdav-serf; then
ewarn "WebDAV support is disabled. You need WebDAV to"
ewarn "access repositories through the HTTP protocol."
ewarn "Consider enabling one of the following USE-flags:"
ewarn " webdav-neon webdav-serf"
echo -ne "\a"
fi
if use debug; then
append-cppflags -DSVN_DEBUG -DAP_DEBUG
fi
# Allow for custom repository locations.
SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \
"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
"${FILESDIR}"/${P}-revert-mod_dontdothat-move.patch
fperms +x build/transform_libtool_scripts.sh
sed -i \
-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
# this bites us in particular on Solaris
sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
die "/bin/sh is not POSIX shell!"
eautoconf
elibtoolize
sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
}
src_configure() {
local myconf
if use python || use perl || use ruby; then
myconf+=" --with-swig"
else
myconf+=" --without-swig"
fi
if use java; then
myconf+=" --without-junit"
fi
if use kde || use nls; then
myconf+=" --enable-nls"
else
myconf+=" --disable-nls"
fi
case ${CHOST} in
*-aix*)
# avoid recording immediate path to sharedlibs into executables
append-ldflags -Wl,-bnoipath
;;
*-interix*)
# loader crashes on the LD_PRELOADs...
myconf+=" --disable-local-library-preloading"
;;
esac
#workaround for bug 387057
has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
#force ruby-1.8 for bug 399105
ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \
econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
$(use_with apache2 apxs "${APXS}") \
$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
$(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \
$(use_enable dso runtime-module-search) \
$(use_with gnome-keyring) \
$(use_enable java javahl) \
$(use_with java jdk "${JAVA_HOME}") \
$(use_with kde kwallet) \
$(use_with sasl) \
$(use_with webdav-neon neon) \
$(use_with webdav-serf serf "${EPREFIX}/usr") \
${myconf} \
--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
--disable-experimental-libtool \
--without-jikes \
--enable-local-library-preloading \
--disable-mod-activation \
--disable-neon-version-check \
--disable-static
}
src_compile() {
emake local-all || die "Building of core of Subversion failed"
if use ctypes-python; then
python_copy_sources subversion/bindings/ctypes-python
rm -fr subversion/bindings/ctypes-python
ctypes_python_bindings_building() {
rm -f subversion/bindings/ctypes-python
ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
emake ctypes-python
}
python_execute_function \
--action-message 'Building of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
--failure-message 'Building of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
ctypes_python_bindings_building
fi
if use python; then
python_copy_sources subversion/bindings/swig/python
rm -fr subversion/bindings/swig/python
swig_python_bindings_building() {
rm -f subversion/bindings/swig/python
ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
emake \
PYTHON_INCLUDES="-I${EPREFIX}$(python_get_includedir)" \
PYTHON_VERSION="$(python_get_version)" \
swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
swig-py
}
python_execute_function \
--action-message 'Building of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
--failure-message 'Building of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
swig_python_bindings_building
fi
if use perl; then
emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
fi
if use ruby; then
emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
fi
if use java; then
emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
fi
if use extras; then
emake tools || die "Building of tools failed"
fi
if use doc; then
doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
if use java; then
emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
fi
fi
}
src_install() {
emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
if use ctypes-python; then
ctypes_python_bindings_installation() {
rm -f subversion/bindings/ctypes-python
ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
emake DESTDIR="${D}" install-ctypes-python
}
python_execute_function \
--action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
--failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
ctypes_python_bindings_installation
fi
if use python; then
swig_python_bindings_installation() {
rm -f subversion/bindings/swig/python
ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
emake \
DESTDIR="${D}" \
PYTHON_VERSION="$(python_get_version)" \
swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
install-swig-py
}
python_execute_function \
--action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
--failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
swig_python_bindings_installation
fi
if use ctypes-python || use python; then
python_clean_installation_image -q
fi
if use perl; then
emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
fixlocalpod
find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
fi
if use ruby; then
emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
fi
if use java; then
emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
fi
# Install Apache module configuration.
if use apache2; then
keepdir "${APACHE_MODULES_CONFDIR}"
insinto "${APACHE_MODULES_CONFDIR}"
doins "${FILESDIR}/47_mod_dav_svn.conf"
fi
# Install Bash Completion, bug 43179.
newbashcomp tools/client-side/bash_completion subversion
rm -f tools/client-side/bash_completion
# Install hot backup script, bug 54304.
newbin tools/backup/hot-backup.py svn-hot-backup
rm -fr tools/backup
# Install svnserve init-script and xinet.d snippet, bug 43245.
newinitd "${FILESDIR}"/svnserve.initd2 svnserve
newconfd "${FILESDIR}"/svnserve.confd svnserve
insinto /etc/xinetd.d
newins "${FILESDIR}"/svnserve.xinetd svnserve
#adjust default user and group with disabled apache2 USE flag, bug 381385
use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \
-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-i "${ED}"etc/init.d/svnserve || die
use apache2 || sed -e "0,/apache/s//svn/" \
-e "s:apache:svnusers:" \
-i "${ED}"etc/xinetd.d/svnserve || die
# Install documentation.
dodoc CHANGES COMMITTERS README
dodoc tools/xslt/svnindex.{css,xsl}
rm -fr tools/xslt
# Install extra files.
if use extras; then
cat << EOF > 80subversion-extras
PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
EOF
doenvd 80subversion-extras
emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
rm -fr tools/client-side/svnmucc
rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
rm -fr tools/{buildbot,dev,diff,po}
insinto /usr/share/${PN}
python_convert_shebangs -r 2 tools
doins -r tools
fi
if use doc; then
dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
dodoc notes/*
if use java; then
java-pkg_dojavadoc doc/javadoc
fi
fi
find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
cd "${ED}"usr/share/locale
for i in * ; do
[[ $i == *$LINGUAS* ]] || { rm -r $i || die ; }
done
}
pkg_preinst() {
# Compare versions of Berkeley DB, bug 122877.
if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then
OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
CHANGED_BDB_VERSION="1"
fi
fi
}
pkg_postinst() {
use perl && perl-module_pkg_postinst
if use ctypes-python; then
python_mod_optimize csvn
fi
if use python; then
python_mod_optimize libsvn svn
fi
if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
ewarn "You upgraded from an older version of Berkeley DB and may experience"
ewarn "problems with your repository. Run the following commands as root to fix it:"
ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
fi
ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
}
pkg_postrm() {
use perl && perl-module_pkg_postrm
if use ctypes-python; then
python_mod_cleanup csvn
fi
if use python; then
python_mod_cleanup libsvn svn
fi
}
pkg_config() {
# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
# already has EPREFIX in it
einfo "Initializing the database in ${SVN_REPOS_LOC}..."
if [[ -e "${SVN_REPOS_LOC}/repos" ]]; then
echo "A Subversion repository already exists and I will not overwrite it."
echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
else
mkdir -p "${SVN_REPOS_LOC}/conf"
einfo "Populating repository directory..."
# Create initial repository.
"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
einfo "Setting repository permissions..."
SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
if use apache2; then
[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
else
[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
fi
chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
echo "to finish the configuration."
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.9 2012/05/11 07:46:44 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.10 2012/08/22 01:41:12 ottxor Exp $
# @ECLASS: unpacker.eclass
# @MAINTAINER:
@ -276,6 +276,25 @@ unpack_deb() {
unpacker ./data.tar*
}
# @FUNCTION: unpack_cpio
# @USAGE: <one cpio to unpack>
# @DESCRIPTION:
# Unpack a cpio archive, file "-" means stdin.
unpack_cpio() {
[[ $# -eq 1 ]] || die "Usage: ${FUNCNAME} <file>"
# needed as cpio always reads from stdin
local cpio_cmd=( cpio --make-directories --extract --preserve-modification-time )
if [[ $1 == "-" ]] ; then
unpack_banner "stdin"
"${cpio_cmd[@]}"
else
local cpio=$(find_unpackable_file "$1")
unpack_banner "${cpio}"
"${cpio_cmd[@]}" <"${cpio}"
fi
}
# @FUNCTION: _unpacker
# @USAGE: <one archive to unpack>
# @INTERNAL
@ -309,6 +328,8 @@ _unpacker() {
case ${m} in
*.tgz|*.tbz|*.tbz2|*.txz|*.tar.*|*.tar)
arch="tar --no-same-owner -xof" ;;
*.cpio.*|*.cpio)
arch="unpack_cpio" ;;
*.deb)
arch="unpack_deb" ;;
*.run)
@ -381,6 +402,8 @@ unpacker_src_uri_depends() {
for uri in "$@" ; do
case ${uri} in
*.cpio.*|*.cpio)
d="app-arch/cpio" ;;
*.rar|*.RAR)
d="app-arch/unrar" ;;
*.7z)

@ -0,0 +1,17 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Thu Aug 16 22:25:12 UTC 2012
Subject: build system
fix compilation for linkers that don't permit underlinking
--- pokerth_server.pro
+++ pokerth_server.pro
@@ -114,7 +114,7 @@
LIBS += -lpokerth_lib \
-lpokerth_db \
-lpokerth_protocol \
- -lcurl \
+ $$system(pkg-config --libs --static libcurl) \
-lircclient
win32 {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.9.5.ebuild,v 1.3 2012/08/16 08:37:46 johu Exp $
# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.9.5.ebuild,v 1.4 2012/08/21 19:44:10 hasufell Exp $
EAPI=2
inherit flag-o-matic eutils qt4-r2 games
@ -46,6 +46,8 @@ src_prepare() {
*pro \
|| die 'sed failed'
epatch "${FILESDIR}"/${P}-underlinking.patch
local boost_ver=$(best_version ">=dev-libs/boost-1.41")
boost_ver=${boost_ver/*boost-/}

@ -1,2 +1,2 @@
DIST gargoyle-2010.1-sources.zip 10771623 RMD160 68407ca19b4c3a4efc40c18a363e5e3dc15e950f SHA1 eeea17b34ba7cdeb0dc1b619b88b36ec2bb8368f SHA256 1646565625cf963bf27f0cbe91735523e1c83ea2d49bef9ff534c1ac78aa7e1d
DIST gargoyle-2011.1-sources.zip 11291660 RMD160 43de562c12a068c5d6f4fab6bb62647faadd0ff3 SHA1 8e01e458e01dd7d20fe5330f95a3e44b7cbc37d6 SHA256 8642ac38add31d47bfd531d4121dc1e956d06895a9352ce573b5007e9cae4634
DIST gargoyle-2010.1-sources.zip 10771623 SHA256 1646565625cf963bf27f0cbe91735523e1c83ea2d49bef9ff534c1ac78aa7e1d SHA512 45a24eae5b02864e8e0df2833ff53cc8aad28aed8e404bb6dd95caa48c9522989196b60b9d70702af4d5e0f7bc06af48e8067dc0580fd23d8612513305b72079 WHIRLPOOL 5cc4e2018c58b1080c5338981ea3543b45adc8bff6b7e3e6546387ad29c63dec978eddd048ccd484628645d274394ca3735c1bb1c617e691dd05787c0cb7b248
DIST gargoyle-2011.1-sources.zip 11291660 SHA256 8642ac38add31d47bfd531d4121dc1e956d06895a9352ce573b5007e9cae4634 SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f WHIRLPOOL 19e572d52ec6436c5b41d767e45d509bd965a0d4009b4445db08e79125eabb20636374bbb818ef7115a1ca9ac983a29cb2eaa3848a22e17d5e7d26284200b86f

@ -0,0 +1,31 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Tue Aug 21 19:06:54 UTC 2012
Subject: desktop file
fix QA issues:
# desktop-file-validate /usr/share/applications/gargoyle.desktop
/usr/share/applications/gargoyle.desktop: error: file contains at least one line ending with a carriage return, while lines should only be separated by a line feed character. First such line is: "[Desktop Entry]"
/usr/share/applications/gargoyle.desktop: error: (will be fatal in the future): value "gargoyle-house.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
--- garglk/gargoyle.desktop
+++ garglk/gargoyle.desktop
@@ -1,9 +1,9 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Gargoyle
-GenericName=Interactive Fiction interpreter
-Comment=Interactive Fiction multi-interpreter that supports all major IF formats
-Icon=gargoyle-house.png
-Exec=gargoyle
-Categories=Game;
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Gargoyle
+GenericName=Interactive Fiction interpreter
+Comment=Interactive Fiction multi-interpreter that supports all major IF formats
+Icon=gargoyle-house
+Exec=gargoyle
+Categories=Game;

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.3 2012/06/15 15:40:37 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.4 2012/08/21 19:18:49 hasufell Exp $
# Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
# interpreters are licensed under GPLv2, BSD or MIT license, except:
@ -10,7 +10,7 @@
# don't apply. (Fonts are installed through dependencies instead.)
EAPI=3
inherit eutils multiprocessing games
inherit eutils multiprocessing toolchain-funcs games
DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
HOMEPAGE="http://ccxvii.net/gargoyle/"
@ -33,7 +33,8 @@ RDEPEND="media-libs/freetype:2
DEPEND="${RDEPEND}
app-arch/unzip
dev-util/ftjam"
dev-util/ftjam
virtual/pkgconfig"
src_prepare() {
# Substitute custom CFLAGS/LDFLAGS.
@ -52,13 +53,17 @@ src_prepare() {
# The font name of Linux Libertine changed in version 5.
sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini
epatch "${FILESDIR}"/${P}-desktopfile.patch
}
src_compile() {
jam \
-sAR="$(tc-getAR) cru" \
-sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \
-sUSESDL=yes \
-sBUNDLEFONTS=no \
-dx \
-j$(makeopts_jobs) || die
}

@ -0,0 +1,35 @@
commit 00578c3036e0a267cd50e63d3745264a533d1899
Author: Christoph Feck <christoph@maxiom.de>
Date: Mon Aug 13 16:41:37 2012 +0200
Use forward declaration
Instead of including a file from another target, which might
not have been generated yet.
BUG: 304987
FIXED-IN: 4.9.1
(cherry picked from commit 46b9acb42eed48f0fd3b9d2391dc8a217003cafc)
diff --git a/kcontrol/randr/randrconfig.h b/kcontrol/randr/randrconfig.h
index 37f7b57..86fdefc 100644
--- a/kcontrol/randr/randrconfig.h
+++ b/kcontrol/randr/randrconfig.h
@@ -22,7 +22,6 @@
#include "ui_randrconfigbase.h"
#include "randr.h"
-#include "outputconfig.h"
#include <QWidget>
#include <QTimer>
@@ -33,6 +32,9 @@ class CollapsibleWidget;
class RandRDisplay;
class OutputGraphicsItem;
class LayoutManager;
+class OutputConfig;
+
+typedef QList<OutputConfig*> OutputConfigList;
class RandRConfig : public QWidget, public Ui::RandRConfigBase
{

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.8.5.ebuild,v 1.1 2012/08/07 11:05:02 johu Exp $
# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.8.5.ebuild,v 1.2 2012/08/21 20:21:58 johu Exp $
EAPI=4
@ -52,6 +52,8 @@ KMEXTRACTONLY="
plasma/
"
PATCHES=( "${FILESDIR}/${PN}-4.9.0-parallel-build.patch" )
add_blocker kdeaccessibility-colorschemes '<4.6.50'
src_unpack() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.9.0.ebuild,v 1.1 2012/08/01 22:17:23 johu Exp $
# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.9.0.ebuild,v 1.2 2012/08/21 20:21:58 johu Exp $
EAPI=4
@ -54,6 +54,8 @@ KMEXTRACTONLY="
add_blocker kdeaccessibility-colorschemes '<4.6.50'
PATCHES=( "${FILESDIR}/${P}-parallel-build.patch" )
src_unpack() {
if use handbook; then
KMEXTRA+="

@ -1,10 +1,10 @@
DIST sane-1.0.16-brother-driver.diff.bz2 8224 RMD160 acbe36d7c4347d49f6e8e708ea81f0ee604fec9f SHA1 2f0cf77d8bbb98b9bb6cc1f56a86f662fa9bda48 SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe
DIST sane-1.0.18-brother-driver.diff.bz2 8335 RMD160 8d86dccca4054699e367412c25d80d8641de42ca SHA1 60bf9c8d4b2fac3f250a95d1dc8043662fc974cd SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b
DIST sane-1.0.19-brother-driver.diff.bz2 8192 RMD160 23dc1428cb587b874b31dc385bdc19c9fe8bdb71 SHA1 caa82756d849d5ff4ca9b9af835243df57ee0976 SHA256 cd71eb12e99ea735e524f66fe53e75d8d6f51036242d1326d09296f3b0fdea55
DIST sane-backends-1.0.17.tar.gz 3588993 RMD160 43e440712e9da676e235dc6148c5dda347c30e22 SHA1 a73e01575458a5fb7dc265cea50c6740555e1711 SHA256 f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77
DIST sane-backends-1.0.18.tar.gz 3789493 RMD160 aa863adff417d7c33cbb85c193878aa54a056100 SHA1 f4c360b87ced287e4015a0dafd766ad885c539e1 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
DIST sane-backends-1.0.19.tar.gz 4293184 RMD160 1aaf304cbfeb3d6c95f6081d04225441a87b6644 SHA1 3ff8eefa8f32e72dcdbaa4bf20fe125df90144d5 SHA256 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
DIST sane-backends-1.0.20.tar.gz 4760873 RMD160 b80c0a15a75b3bce07060d65aecdcaf7860c323b SHA1 3b4d2ecde8be404bb44269771cf5dc6e4c10b086 SHA256 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
DIST sane-backends-1.0.21-i18n.patch 2250 RMD160 35a16305f30e41478b3de82266eff72892e248d6 SHA1 d44cf640a0c56c3249e9da5cc64b3bf452e1989a SHA256 9f0d16a32fd8b8cc9ae5e0639b1c51af2137c5106b9b318f0df818d5689f3efc
DIST sane-backends-1.0.21.tar.gz 5050344 RMD160 000ae42ffd6484c54389a9468bdde1dcfc758dde SHA1 4a2789ea9dae1ece090d016abd14b0f2450d9bdb SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
DIST sane-backends-1.0.22.tar.gz 5150661 RMD160 524713474a819331d0179fa642fef710d073f1d1 SHA1 dc04d6e6fd18791d8002c3fdb23e89fef3327135 SHA256 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54
DIST sane-1.0.16-brother-driver.diff.bz2 8224 SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe
DIST sane-1.0.18-brother-driver.diff.bz2 8335 SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b
DIST sane-1.0.19-brother-driver.diff.bz2 8192 SHA256 cd71eb12e99ea735e524f66fe53e75d8d6f51036242d1326d09296f3b0fdea55
DIST sane-backends-1.0.17.tar.gz 3588993 SHA256 f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77
DIST sane-backends-1.0.18.tar.gz 3789493 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
DIST sane-backends-1.0.19.tar.gz 4293184 SHA256 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
DIST sane-backends-1.0.20.tar.gz 4760873 SHA256 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
DIST sane-backends-1.0.21-i18n.patch 2250 SHA256 9f0d16a32fd8b8cc9ae5e0639b1c51af2137c5106b9b318f0df818d5689f3efc
DIST sane-backends-1.0.21.tar.gz 5050344 SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
DIST sane-backends-1.0.22.tar.gz 5150661 SHA256 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54 SHA512 26ed793bbb4110a7b8bc9c3b22dbc125ba1bb5f7ff89545542ec9cae9c641351e7d420d3f53982e2c6d63577a4c90b24a8f4d6b748be65c98284123f778fcba1 WHIRLPOOL 8b47c0b2b4764155d54ad61c3c6946cc2e5c0a47dd8fe650cb036a51139694d486376c8ad76759b27987f00b9594cf62e849e470873d38a767907eac5a4e0f93

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild,v 1.6 2012/06/08 03:01:10 zmedico Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild,v 1.7 2012/08/22 02:09:10 ottxor Exp $
EAPI="4"
@ -139,7 +139,7 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2 public-domain"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
pkg_setup() {
enewgroup scanner
@ -220,7 +220,7 @@ src_compile() {
src_install () {
emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
docdir=/usr/share/doc/${PF} || die
docdir="${EPREFIX}"/usr/share/doc/${PF} || die
keepdir /var/lib/lock/sane
fowners root:scanner /var/lib/lock/sane
fperms g+w /var/lib/lock/sane
@ -231,12 +231,12 @@ src_install () {
doins tools/hotplug/libsane.usermap
doexe tools/hotplug/libusbscanner
newdoc tools/hotplug/README README.hotplug
echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
echo >> "${ED}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
fi
insinto /lib/udev/rules.d
newins tools/udev/libsane.rules 41-libsane.rules
dodoc NEWS AUTHORS ChangeLog* README README.linux
echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
find "${D}" -name "*.la" | while read file; do rm "${file}"; done
echo "SANE_CONFIG_DIR=${EPREFIX}/etc/sane.d" >> "${ED}"/etc/env.d/30sane
find "${ED}" -name "*.la" | while read file; do rm "${file}"; done
}

@ -1,3 +1,3 @@
DIST xsane-0.998-patches-2.tar.xz 54804 RMD160 2ee1c2446e05f29b991e1741f5dc845fc6cae19d SHA1 2bee9c7470686694ec66e7842c42e9dcabca33b3 SHA256 84af533cba6309cf44892da8952b6203daa4dcfaf64e2efd1dddc5144e4cab4c
DIST xsane-0.998-patches.tar.xz 54828 RMD160 81eec017e8a61bf7152b9ea73e71c11de6b977ca SHA1 bda04294705a76405c85f60587a66d9fd051c506 SHA256 0ffcc52ec5b11d5e854e7df38c4ac298920116f2453056a1565dc1f83a64f72e
DIST xsane-0.998.tar.gz 2950560 RMD160 aecf63ac3f15b878d01b697ac3ca95de34d18323 SHA1 59e238b310979f71a8e15b692eab3c5b2ce6fc32 SHA256 a32e2f8057782a29619f082dcf6b5f944bf12abe3d4121c516f7c9589064c26e
DIST xsane-0.998-patches-2.tar.xz 54804 SHA256 84af533cba6309cf44892da8952b6203daa4dcfaf64e2efd1dddc5144e4cab4c
DIST xsane-0.998-patches.tar.xz 54828 SHA256 0ffcc52ec5b11d5e854e7df38c4ac298920116f2453056a1565dc1f83a64f72e SHA512 c1248ff1ffe9e8f091d3da307451055f0607ea55165cd2db042f4f05a671434cb4212c127caf110240ab6aff76462c117ba6dd06dc2582a01f4f2256037d6e13 WHIRLPOOL f85d9400e26a34b086dcdcef96f6fe33bd372d44c727e099e6928f3229d2518da77ccc00b4872ca3b68e95e87347f59c8dfefcf71aa01c798a32a51298ba3780
DIST xsane-0.998.tar.gz 2950560 SHA256 a32e2f8057782a29619f082dcf6b5f944bf12abe3d4121c516f7c9589064c26e SHA512 8cf6f01e706175cb4df88effe13c0547624bd62b08f485118279a9bcde77b9a555f3148b24f3d6348157868f50bfa450f413a20a514b4f0218579b75f642fc04 WHIRLPOOL 424c2050b2abf0d647adef7a0d22ee3c19d57ebc21d888d97667f82243c2ef10b5d99fef15a15da6f900f25f1aae3914824c87e71141a75a3dd6b1b44a0b0e4c

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.998-r1.ebuild,v 1.2 2012/05/05 07:00:20 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.998-r1.ebuild,v 1.3 2012/08/22 02:24:10 ottxor Exp $
EAPI="4"
@ -13,7 +13,7 @@ SRC_URI="http://www.xsane.org/download/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="nls jpeg png tiff gimp lcms ocr"
RDEPEND="media-gfx/sane-backends
@ -50,7 +50,7 @@ src_prepare() {
src_configure() {
local extraCPPflags
if use lcms; then
extraCPPflags="-I /usr/include/lcms"
extraCPPflags="-I ${EPREFIX}/usr/include/lcms"
fi
CPPFLAGS="${CPPFLAGS} ${extraCPPflags}" econf --enable-gtk2 \
$(use_enable nls) \
@ -68,15 +68,15 @@ src_install() {
# link xsane so it is seen as a plugin in gimp
if use gimp; then
local plugindir
if [ -x /usr/bin/gimptool ]; then
if [ -x "${EPREFIX}"/usr/bin/gimptool ]; then
plugindir="$(gimptool --gimpplugindir)/plug-ins"
elif [ -x /usr/bin/gimptool-2.0 ]; then
elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
else
die "Can't find GIMP plugin directory."
fi
dodir "${plugindir}"
dosym /usr/bin/xsane "${plugindir}"
dodir "${plugindir#${EPREFIX}}"
dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"
fi
newicon src/xsane-48x48.png ${PN}.png

@ -1,3 +1,3 @@
DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 RMD160 23bc07030416ebaca5ce4d223921e33094c37b93 SHA1 d00308c1687d9d803d26ef40c73d19a0f593c626 SHA256 221ec89fdf0772bd09c845cbb337aecf411a1aee215140b676717f49e9e65c80
DIST xv-3.10a.png.bz2 3082 RMD160 d1948f866392e80350e7b5d6aae2406ab826cc7b SHA1 d33bc9f3d43f23aaf71608ad440f9543dd850635 SHA256 244cd9da79e86e0c0bc00bfaad09a18e229795eb0146925328ad147ec7adcfe9
DIST xv-3.10a.tar.gz 2259124 RMD160 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d SHA1 9e6372f154be9e9e355972cbeb91d98d9c342474 SHA256 03eb26b1e8f315c3093f4ae794862ba46637d16c055e8efbe5e3beb5d40fc451
DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 SHA256 221ec89fdf0772bd09c845cbb337aecf411a1aee215140b676717f49e9e65c80
DIST xv-3.10a.png.bz2 3082 SHA256 244cd9da79e86e0c0bc00bfaad09a18e229795eb0146925328ad147ec7adcfe9
DIST xv-3.10a.tar.gz 2259124 SHA256 03eb26b1e8f315c3093f4ae794862ba46637d16c055e8efbe5e3beb5d40fc451

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r16.ebuild,v 1.11 2012/03/21 06:27:25 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r16.ebuild,v 1.12 2012/08/22 02:22:53 ottxor Exp $
EAPI=4
inherit eutils flag-o-matic
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
LICENSE="xv"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="jpeg tiff png"
DEPEND="x11-libs/libXt
@ -57,7 +57,7 @@ src_prepare() {
-e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile
# /usr/bin/gzip => /bin/gzip
sed -i -e 's#/usr\(/bin/gzip\)#\1#g' config.h
sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h
# Fix installation of ps docs
sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile
@ -71,8 +71,8 @@ src_compile() {
emake \
CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
PREFIX=/usr \
DOCDIR=/usr/share/doc/${PF} \
PREFIX="${EPREFIX}"/usr \
DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
LIBDIR="${T}"
}
@ -82,8 +82,8 @@ src_install() {
emake \
DESTDIR="${D}" \
PREFIX=/usr \
DOCDIR=/usr/share/doc/${PF} \
PREFIX="${EPREFIX}"/usr \
DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
LIBDIR="${T}" install
dodoc CHANGELOG BUGS IDEAS

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.3.ebuild,v 1.5 2012/04/26 20:40:16 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.3.ebuild,v 1.6 2012/08/22 02:33:56 ottxor Exp $
EAPI=4
@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
LICENSE="MIT"
SLOT="2"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc jpeg static-libs test tiff zlib"
RDEPEND="jpeg? ( virtual/jpeg )

@ -1,2 +1,2 @@
DIST libcanberra-0.28.tar.gz 487276 RMD160 a351f048376d4c66bc0c1612188e8ffbfcec136b SHA1 2a41dae039df1fea98cfb71bd7ca34e57b6e8091 SHA256 eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c
DIST libcanberra-0.29.tar.xz 315728 RMD160 a1fe15a7ce0a63ab3e5cc312a34ffe575775c0c1 SHA1 74052db5d1369a52c00aa11cd2310111380345c1 SHA256 127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72
DIST libcanberra-0.28.tar.gz 487276 SHA256 eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c SHA512 1bdfe324038794316572386e3600712ea2031f9d6bec377d2b2eacd176f39c7bdf8c84d3a8b2f366a93e50d5047d2ee6396fcb184600c0a7944104b7dd6a7ffb WHIRLPOOL 4066b677120d7ae008224bf6929053e785a8b06a6ba56e99629073d8bf58580358948a5d210bc43392d4517f81c5dc43cce1393ed86e8aae3df98194d0a03102
DIST libcanberra-0.29.tar.xz 315728 SHA256 127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.29.ebuild,v 1.1 2012/06/25 05:07:50 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.29.ebuild,v 1.2 2012/08/22 02:41:49 ottxor Exp $
EAPI="4"
@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
COMMON_DEPEND="media-libs/libvorbis
@ -44,7 +44,7 @@ src_prepare() {
src_configure() {
econf \
--docdir=/usr/share/doc/${PF} \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--disable-dependency-tracking \
$(use_enable alsa) \
$(use_enable oss) \
@ -56,7 +56,8 @@ src_configure() {
$(use_enable udev) \
$(systemd_with_unitdir) \
--disable-lynx \
--disable-gtk-doc
--disable-gtk-doc \
--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
}
src_install() {
@ -69,5 +70,5 @@ src_install() {
# prefix; if that fails, it will append the module extension for the
# current system and try that (".so" on Linux, ".bundle" on Darwin, ".dll"
# on Windows, etc.). Only if both fail will it return an error.
find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
find "${ED}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v 1.1 2012/07/21 11:27:08 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v 1.2 2012/08/22 02:51:16 ottxor Exp $
# TODO
# 1. Track upstream bug --disable-docs does not work.
@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="doc examples exif gd jpeg nls kernel_linux zeroconf"
# By default, drivers for all supported cameras will be compiled.
@ -131,11 +131,11 @@ src_configure() {
$(use_with gd) \
$(use_with jpeg) \
--with-drivers=${cameras} \
--with-doc-dir=/usr/share/doc/${PF} \
--with-html-dir=/usr/share/doc/${PF}/html \
--with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
--with-rpmbuild=$(type -P true) \
udevscriptdir=/lib/udev \
udevscriptdir="${EPREFIX}"/lib/udev \
${myconf}
# FIXME: gtk-doc is currently broken
@ -157,7 +157,7 @@ src_install() {
find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
# Clean up unwanted files
rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
if use examples; then
@ -166,25 +166,25 @@ src_install() {
fi
# FIXME: fixup autoconf bug
if ! use doc && [ -d "${D}/usr/share/doc/${PF}/apidocs.html" ]; then
rm -fr "${D}/usr/share/doc/${PF}/apidocs.html"
if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
fi
# end fixup
UDEV_RULES="/lib/udev/rules.d/70-libgphoto2.rules"
CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"
if [ -x "${D}"${CAM_LIST} ]; then
if [ -x "${ED}"${CAM_LIST} ]; then
# Let print-camera-list find libgphoto2.so
export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
# Let libgphoto2 find its camera-modules
export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}"
export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
einfo "Generating UDEV-rules ..."
mkdir -p "${D}"/${UDEV_RULES%/*}
mkdir -p "${ED}"/${UDEV_RULES%/*}
echo -e "# do not edit this file, it will be overwritten on update\n#" \
> "${D}"/${UDEV_RULES}
"${D}"${CAM_LIST} udev-rules version 136 group plugdev >> "${D}"/${UDEV_RULES} \
> "${ED}"/${UDEV_RULES}
"${ED}"${CAM_LIST} udev-rules version 136 group plugdev >> "${ED}"/${UDEV_RULES} \
|| die "failed to create udev-rules"
else
eerror "Unable to find print-camera-list"
@ -198,7 +198,7 @@ src_install() {
pkg_postinst() {
elog "Don't forget to add yourself to the plugdev group "
elog "if you want to be able to access your camera."
local OLD_UDEV_RULES="${ROOT}"etc/udev/rules.d/99-libgphoto2.rules
local OLD_UDEV_RULES="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
if [[ -f ${OLD_UDEV_RULES} ]]; then
rm -f "${OLD_UDEV_RULES}"
fi

@ -1 +1 @@
DIST libmad-0.15.1b.tar.gz 502379 RMD160 0f3415ee10b188681e282ca69dec74c46ca73b0f SHA1 cac19cd00e1a907f3150cc040ccc077783496d76 SHA256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
DIST libmad-0.15.1b.tar.gz 502379 SHA256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45 WHIRLPOOL 7453ec587711c3de1a221316e88ef9039e4d2002f5a87a3957ed479899e5cc11fb8e89128f251cfd028c1fb9b89eca6b45aa5cb07f4a5e4f9a92086180084de5

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r7.ebuild,v 1.8 2012/05/17 14:46:58 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r7.ebuild,v 1.9 2012/08/22 02:55:24 ottxor Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="debug static-libs"
DEPEND=""
@ -62,7 +62,7 @@ src_install() {
doins "${FILESDIR}"/mad.pc
# Use correct libdir in pkgconfig file
sed -i -e "s:^libdir.*:libdir=/usr/$(get_libdir):" \
sed -i -e "s:^libdir.*:libdir=${EPREFIX}/usr/$(get_libdir):" \
"${ED}"/usr/$(get_libdir)/pkgconfig/mad.pc
find "${ED}" -name '*.la' -delete

@ -1 +1 @@
DIST libogg-1.3.0.tar.xz 289384 RMD160 fb6dcdadeccabbd8555e007f9efd28fc11708ba5 SHA1 d74e7514f268d58a171b4b9baf15602fd8060c33 SHA256 231725029c843492914f24e74085e734bca6f1d6446ac72df39b0c3a9d4bc74b
DIST libogg-1.3.0.tar.xz 289384 SHA256 231725029c843492914f24e74085e734bca6f1d6446ac72df39b0c3a9d4bc74b SHA512 d99f7285d1d92940e5e82778f208afe615ff44384b373d81186a57a77d57a8c7f5e3347ea9ad99dc87cd6091e41ed8f47f0c3277e6a113dbb157c6aa6dd0f357 WHIRLPOOL 75954c92b475686f23d3da9d2970f04271865c2617a53e4e0f38336991bcc0a8171ed394b48048b4bf91aff85951381a7360ffb0509158788688666c395a3c6b

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.0.ebuild,v 1.8 2012/05/13 16:22:14 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.0.ebuild,v 1.9 2012/08/22 02:57:38 ottxor Exp $
EAPI=4
@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/ogg/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DOCS=( AUTHORS CHANGES )

@ -1 +1 @@
DIST libopenraw-0.0.9.tar.bz2 478687 RMD160 c525d8f028cec056b2217815cc7c390c80082281 SHA1 ca246099c5b4f9f1714579706f019382c547b061 SHA256 49fd1adf0a0228c7a17a79bf98d8d03664195feae1e50f4ddd1b20162626e18f
DIST libopenraw-0.0.9.tar.bz2 478687 SHA256 49fd1adf0a0228c7a17a79bf98d8d03664195feae1e50f4ddd1b20162626e18f

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/libopenraw-0.0.9.ebuild,v 1.11 2012/05/30 13:27:58 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/libopenraw-0.0.9.ebuild,v 1.12 2012/08/22 03:03:53 ottxor Exp $
EAPI=4
@ -10,7 +10,7 @@ SRC_URI="http://${PN}.freedesktop.org/download/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="gtk static-libs test"
RDEPEND="virtual/jpeg
@ -28,6 +28,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
src_configure() {
econf \
--with-boost="${EPREFIX}"/usr \
$(use_enable static-libs static) \
$(use_enable gtk gnome)
}

@ -1 +1 @@
DIST libsndfile-1.0.25.tar.gz 1060692 RMD160 7330ea9fc1cfa3809fa7d2a6e2a0593b6e0233c7 SHA1 e95d9fca57f7ddace9f197071cbcfb92fa16748e SHA256 59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882
DIST libsndfile-1.0.25.tar.gz 1060692 SHA256 59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882 SHA512 4ca9780ed0a915aca8a10ef91bf4bf48b05ecb85285c2c3fe7eef1d46d3e0747e61416b6bddbef369bd69adf4b796ff5f61380e0bc998906b170a93341ba6f78 WHIRLPOOL 37ef0a66f11d3f60741fe40bce2b255f44284cf78f7c762542def2aab0eefed1360181bb7f29b9850c11e8672a78bc5a687bc04f2cc349e45dfd24721bea8f29

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.9 2012/05/15 13:44:21 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.10 2012/08/22 03:05:37 ottxor Exp $
EAPI=4
inherit autotools eutils flag-o-matic multilib
@ -17,7 +17,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa minimal sqlite static-libs"
RDEPEND="!minimal? ( >=media-libs/flac-1.2.1
@ -52,13 +52,13 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable alsa) \
$(use_enable !minimal external-libs) \
htmldocdir=/usr/share/doc/${PF}/html \
htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
--disable-octave \
--disable-gcc-werror \
--disable-gcc-pipe
}
src_install() {
emake DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install
emake DESTDIR="${D}" htmldocdir="${EPREFIX}/usr/share/doc/${PF}/html" install
dodoc AUTHORS ChangeLog NEWS README
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.3.3.ebuild,v 1.10 2012/07/08 15:22:38 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.3.3.ebuild,v 1.11 2012/08/22 03:08:31 ottxor Exp $
EAPI=4
inherit autotools
@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="media-libs/libogg"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libxspf/libxspf-1.2.0.ebuild,v 1.11 2012/07/30 10:27:14 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libxspf/libxspf-1.2.0.ebuild,v 1.12 2012/08/22 03:12:50 ottxor Exp $
EAPI=4
inherit eutils
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
LICENSE="BSD LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ppc x86"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND=">=dev-libs/expat-2
@ -37,7 +37,7 @@ src_configure() {
export XDG_CONFIG_HOME="${T}" #398881#c2
econf \
--docdir=/usr/share/doc/${PF} \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
$(use_enable static-libs static) \
$(use_enable test) \
$(use_enable doc)

@ -1 +1 @@
DIST plotutils-2.6.tar.gz 3657562 RMD160 2a32244eb20e00b82a0742dde7b690f688e82774 SHA1 7921301d9dfe8991e3df2829bd733df6b2a70838 SHA256 4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab
DIST plotutils-2.6.tar.gz 3657562 SHA256 4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.6.ebuild,v 1.8 2012/05/09 18:09:39 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.6.ebuild,v 1.9 2012/08/22 03:14:24 ottxor Exp $
EAPI=3
inherit libtool eutils autotools
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
IUSE="+png static-libs X"
DEPEND="png? ( media-libs/libpng

@ -1,3 +1,3 @@
DIST qhull-2010.1-src.tgz 674457 RMD160 840530f0d103cfa0bd86d0226a41084866dd5ca2 SHA1 ed480912e03efdd767195c06c7e8c252c78112b1 SHA256 557085fb441b9b5a24589e08d7b1ae71ecd234fcb43ef4f8ffde141d22e316be
DIST qhull-2012.1-src.tgz 716665 RMD160 4199d326414087512efbbca25db8be51f69ef730 SHA1 60f61580e1d6fbbd28e6df2ff625c98d15b5fbc6 SHA256 a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88
DIST qhull3.1.tgz 442679 RMD160 11cad251d238725589fa0ec454caf714a98e3840 SHA1 598a297105199efd69799941acf154f69adc0607 SHA256 c4bf2035b2bdc86094b244fbe5a9ae0df9fdc2af4d96a4d0ba93a7060af2b30e
DIST qhull-2010.1-src.tgz 674457 SHA256 557085fb441b9b5a24589e08d7b1ae71ecd234fcb43ef4f8ffde141d22e316be
DIST qhull-2012.1-src.tgz 716665 SHA256 a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88
DIST qhull3.1.tgz 442679 SHA256 c4bf2035b2bdc86094b244fbe5a9ae0df9fdc2af4d96a4d0ba93a7060af2b30e

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2012.1-r1.ebuild,v 1.1 2012/06/17 23:15:17 bicatali Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2012.1-r1.ebuild,v 1.2 2012/08/22 03:17:53 ottxor Exp $
EAPI=4
@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/download/${P}-src.tgz"
SLOT="0"
LICENSE="BSD"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc static-libs"
DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )

@ -1 +1 @@
DIST SDL_sound-1.0.3.tar.gz 1127100 RMD160 8e56daa71f827a4a22e7071a4e4f37c21dd96105 SHA1 1984bc20b2c756dc71107a5a0a8cebfe07e58cb1 SHA256 3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df
DIST SDL_sound-1.0.3.tar.gz 1127100 SHA256 3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824 WHIRLPOOL 84be6ec21136603b7a557d25185a2074710d6d48449ce754fef67051feb99490ba3944198d32af28fc9b3842dba38bd2b7692f8e21417d836d157fd639993417

@ -0,0 +1,18 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Tue Aug 21 12:42:14 UTC 2012
Subject: build system
fix underlinking
--- SDL_sound-1.0.3/Makefile.am
+++ SDL_sound-1.0.3/Makefile.am
@@ -32,7 +32,8 @@
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libSDL_sound_la_LIBADD = \
decoders/libdecoders.la \
- $(TIMIDITY_LIB) $(MPGLIB_LIB)
+ $(TIMIDITY_LIB) $(MPGLIB_LIB) \
+ -lm
EXTRA_DIST = \
CREDITS \

@ -1,8 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/sdl-sound-1.0.3.ebuild,v 1.8 2012/05/05 08:02:44 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/sdl-sound-1.0.3.ebuild,v 1.9 2012/08/21 19:47:33 hasufell Exp $
EAPI=2
inherit autotools eutils
MY_P="${P/sdl-/SDL_}"
DESCRIPTION="A library that handles the decoding of sound file formats"
HOMEPAGE="http://icculus.org/SDL_sound/"
@ -26,6 +28,11 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}"/${P}-underlinking.patch
eautoreconf
}
src_configure() {
econf \
--disable-dependency-tracking \

@ -1 +1 @@
DIST t1lib-5.1.2.tar.gz 1872534 RMD160 ab22aea390356750d743c0f4b08762aa76ca2a82 SHA1 4b4fc22c8688eefaaa8cfc990f0039f95f4287de SHA256 821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59
DIST t1lib-5.1.2.tar.gz 1872534 SHA256 821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59 SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3 WHIRLPOOL cc819ac6bbef0d961e1d24d29e4fc748b1a9b9549f8409098ab7b01d0a8613b409fc833a5cfe13596e18faac98cb9f1cdc823581442c1d587a1b723aa96d9050

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.1.2.ebuild,v 1.14 2012/05/09 14:00:02 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.1.2.ebuild,v 1.15 2012/08/22 03:20:50 ottxor Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
LICENSE="LGPL-2 GPL-2"
SLOT="5"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="X doc static-libs"
RDEPEND="X? (

@ -1 +1,2 @@
DIST beets-1.0b14.tar.gz 500373 RMD160 1d4e9de5f7f8f11f9101c12da2d2469bbc4b2e4c SHA1 6cd4a3eff6fd5f7d340a5dc9ff57647bd23f4720 SHA256 7bb71cdc2e3b6a523fab5d650776643d31b638ff97ad3c36ac34b2e4f92dde5c
DIST beets-1.0b14.tar.gz 500373 SHA256 7bb71cdc2e3b6a523fab5d650776643d31b638ff97ad3c36ac34b2e4f92dde5c SHA512 d1aec6ac070c8c65cd72e8f1dcf8d854fbc267cde202ee0bfe3256899f4613286f78ac858c7e9e498c33d170aee37a1ab8d3d6255270ade05469d88812489b8b WHIRLPOOL 098f06cb1a3203aae8f8fe2af7d987b6dc103824aea902e86f2c4542f1cbf7250b43d995b2a31fbdcfd5f471570a7159428ecb0e671f755f6567bc72ad00b625
DIST beets-1.0b15.tar.gz 474108 SHA256 a670153ccbc143387d83e549bfa35be1ae17d98d3db0fc299867c2bb3a8ac864 SHA512 0324827259cdfd1a09b6eaf7703204634aeca0739e5b0007c418d787c5ead240bc9529e616e2bfe8182bda95e8debdb1b4f953d011b8b71d8e9c91dea5aa3366 WHIRLPOOL 294bbfb743034aaeaf9fcc3cbdf52f58e768fa6793ba18ab008f1e6f7ee3c298a3fd753bd026d17bd70ca8ae233407c5808e18bfc0d2596fe0eb9ad61c070004

@ -0,0 +1,83 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_beta15.ebuild,v 1.1 2012/08/21 21:23:33 sochotnicky Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
PYTHON_USE_WITH="sqlite"
SUPPORT_PYTHON_ABIS="1"
#There a few test failures with 2.6, worth investigating
RESTRICT_PYTHON_ABIS="2.5 3.* 2.7-pypy-*"
inherit distutils
MY_PV=${PV/_beta/b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
SRC_URI="http://beets.googlecode.com/files/${MY_P}.tar.gz"
HOMEPAGE="http://beets.radbox.org/"
KEYWORDS="~amd64 ~x86"
SLOT="0"
LICENSE="MIT"
IUSE="chroma doc lastgenre bpd replaygain web"
RDEPEND="
dev-python/munkres
dev-python/python-musicbrainz-ngs
dev-python/unidecode
media-libs/mutagen
chroma? ( dev-python/pyacoustid )
lastgenre? ( dev-python/pylast )
bpd? ( dev-python/bluelet )
replaygain? ( media-sound/rgain )
web? ( dev-python/flask )
doc? ( dev-python/sphinx )"
DEPEND="${RDEPEND}
dev-python/setuptools"
S=${WORKDIR}/${MY_P}
src_prepare() {
distutils_src_prepare
# remove plugins that do not have appropriate dependencies installed
for flag in lastgenre bpd web chroma replaygain;do
if ! use $flag ; then
rm -r beetsplug/$flag* || \
die "Unable to remove $flag plugin"
fi
done
for flag in lastgenre bpd web;do
if ! use $flag ; then
sed -i "s:'beetsplug.$flag',::" setup.py || \
die "Unable to disable $flag plugin "
fi
done
use bpd || rm -f test/test_player.py
}
src_compile() {
distutils_src_compile
use doc && emake -C docs html
}
src_test() {
cd test
testing() {
PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" testall.py
}
python_execute_function testing
}
src_install() {
distutils_src_install
doman man/beet.1 man/beetsconfig.5
use doc && dohtml -r docs/_build/html/
}

@ -1 +1 @@
Tue, 21 Aug 2012 18:37:25 +0000
Wed, 22 Aug 2012 05:07:43 +0000

@ -1 +1 @@
Tue, 21 Aug 2012 18:37:25 +0000
Wed, 22 Aug 2012 05:07:43 +0000

@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://gnu-alpha/gzip/gzip-1.5.tar.xz mirror://gnu/gzip/gzip-1.5.tar.xz mirror://gentoo/gzip-1.5.tar.xz
_eclasses_=eutils b8eb29e3c9c4e94c65da9ebec37902a9 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 unpacker e1b907c6a72dc4c9025109f3e84129c7 user d0a4d0735a6c0183d707ca919bd72f28
_eclasses_=eutils b8eb29e3c9c4e94c65da9ebec37902a9 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=aea4adb208ce4166d34d6b8be2c1fd2c

@ -5,5 +5,5 @@ KEYWORDS=amd64 hppa ppc s390 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.megastep.org/makeself/makeself-2.1.5.run
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=345e7c11efdc82e373ebbe2e6f09af8c

@ -5,5 +5,5 @@ KEYWORDS=amd64 hppa ppc ~s390 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.megastep.org/makeself/makeself-2.1.5.run
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=7e1cc075f84d46556372389f59aeb202

@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses
DESCRIPTION=ncurses-based hex-editor with diff mode
EAPI=4
HOMEPAGE=http://www.dettus.net/dhex/
KEYWORDS=amd64 x86
KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=http://www.dettus.net/dhex/dhex_0.67.tar.gz
_eclasses_=eutils b8eb29e3c9c4e94c65da9ebec37902a9 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=9984c4621e4fe775f32022c6b58dc8c0
_md5_=9a8415f28a30d48d2e1d8ab4bb70d162

@ -9,4 +9,4 @@ LICENSE=GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2
RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) )
SLOT=24
_eclasses_=autotools d89996a2048bc6d1ae72bfa4c04517fe bzr 8bf2fb439b1b76c0c6173c8b803310ae elisp-common 5785babccf9fc9be868981620c7940d3 eutils b8eb29e3c9c4e94c65da9ebec37902a9 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool a83de71c2123161fc5a8323cb275f8e5 multilib 5782800349f728f725f9378105c6a2ab multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=3b31b0eb8c06bd32a99c9e9681081430
_md5_=c31aa7f6b10d6a88d90d3a6ed06abdfd

@ -2,10 +2,10 @@ DEFINED_PHASES=compile prepare
DESCRIPTION=Simple Hex EDitor
EAPI=4
HOMEPAGE=http://shed.sourceforge.net/
KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=mirror://sourceforge/shed/shed-1.15.tar.gz
_eclasses_=eutils b8eb29e3c9c4e94c65da9ebec37902a9 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=2a809514d8d181ff04e8720d97c444a6
_md5_=7ac3a6df52a23e85c4bab4e020f6a839

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-standard-6.0.0.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=4a4cedab63e409bcb7d5fef8175c0bc3

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-standard-6.0.1.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=526f853a691031eee1e8d878f68a6adb

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-standard-6.1.0.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=0f5b40c7a51ab647c187ac62c1418d87

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-standard-6.2.0.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=b278fb9f0686ded6825f29358abd51d6

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-pro-4.2.sh
_eclasses_=eutils b8eb29e3c9c4e94c65da9ebec37902a9 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 unpacker e1b907c6a72dc4c9025109f3e84129c7 user d0a4d0735a6c0183d707ca919bd72f28
_eclasses_=eutils b8eb29e3c9c4e94c65da9ebec37902a9 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=9008e3c81a0726a89e279b702a14cd13

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-pro-5.0.0.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=6452a15984c5f723576bb4f5a850459e

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-pro-5.0.1.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=bd2fa83d382be6114c02866794a22019

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-pro-5.0.3.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=bd26a3b3ec70d6f7786bd394734cde29

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-pro-6.0.0.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=76e9b33e8ade96d8047b8899810ae1db

@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-lib
RESTRICT=fetch strip
SLOT=0
SRC_URI=install-crossover-pro-6.1.0.sh
_eclasses_=unpacker e1b907c6a72dc4c9025109f3e84129c7
_eclasses_=unpacker 50e1227854e96469a19a63f053496328
_md5_=37da0cf0dc806708fcb785b821dbe5f0

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

Loading…
Cancel
Save