root
12 years ago
parent
153cd96578
commit
55b8d89ea8
@ -1,2 +1,3 @@
|
||||
DIST puppet-2.7.11.gem 1846272 RMD160 2ef1c5276b70acb2ad37dce6d34ee9647ea0c62b SHA1 588e3ee89eaa6babd98dc207a1e0b517be28f59c SHA256 d58c0ad7ee05364d3431fefd2894690eed3364362d759b0b2627c44f71c955d6
|
||||
DIST puppet-2.7.12.gem 1876480 RMD160 91fad29bfcdf3944aa84cd54347c928d728ccc91 SHA1 ef1afaeec34f921c055826f33b39dc88cbb52c01 SHA256 2c96c6cba32b1b413faee8a0d96b1f33be08aca99d165ea689f06a7dc1a2bc1f
|
||||
DIST puppet-2.7.13.gem 1876992 RMD160 a300a1af4ba79ba430703bc6c71774e2dd9c2d25 SHA1 8fd974b7cb9feb5b5e70e050389a37574694aa48 SHA256 1e91ee9eed15d2ca4aba691299d1bde61de310cbcee0f1a557f9d47ffd2e0bd8
|
||||
|
||||
@ -0,0 +1,180 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.13.ebuild,v 1.1 2012/04/12 13:35:57 matsuu Exp $
|
||||
|
||||
EAPI="4"
|
||||
# ruby19: dev-ruby/ruby-ldap has no ruby19
|
||||
USE_RUBY="ruby18 ruby19 ree18"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_TASK_TEST="test"
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
|
||||
|
||||
# bug #406053
|
||||
inherit elisp-common
|
||||
EMACS_SITELISP="${SITELISP}"
|
||||
inherit xemacs-elisp-common
|
||||
XEMACS_SITELISP="${SITELISP}"
|
||||
inherit eutils ruby-fakegem
|
||||
|
||||
DESCRIPTION="A system automation and configuration management software"
|
||||
HOMEPAGE="http://puppetlabs.com/"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
|
||||
|
||||
ruby_add_rdepend "
|
||||
>=dev-ruby/facter-1.5.6
|
||||
augeas? ( dev-ruby/ruby-augeas )
|
||||
diff? ( dev-ruby/diff-lcs )
|
||||
doc? ( dev-ruby/rdoc )
|
||||
ldap? ( dev-ruby/ruby-ldap )
|
||||
shadow? ( dev-ruby/ruby-shadow )
|
||||
sqlite3? ( dev-ruby/sqlite3-ruby )
|
||||
virtual/ruby-ssl"
|
||||
# couchdb? ( dev-ruby/couchrest )
|
||||
# mongrel? ( www-servers/mongrel )
|
||||
# rack? ( >=dev-ruby/rack-1 )
|
||||
# rails? (
|
||||
# dev-ruby/rails
|
||||
# >=dev-ruby/activerecord-2.1
|
||||
# )
|
||||
# stomp? ( dev-ruby/stomp )
|
||||
|
||||
DEPEND="${DEPEND}
|
||||
emacs? ( virtual/emacs )
|
||||
xemacs? ( app-editors/xemacs )"
|
||||
RDEPEND="${RDEPEND}
|
||||
emacs? ( virtual/emacs )
|
||||
xemacs? ( app-editors/xemacs )
|
||||
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
|
||||
selinux? ( sys-libs/libselinux[ruby] )
|
||||
>=app-portage/eix-0.18.0"
|
||||
|
||||
SITEFILE="50${PN}-mode-gentoo.el"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/lib/puppet puppet
|
||||
}
|
||||
|
||||
all_ruby_compile() {
|
||||
all_fakegem_compile
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile ext/emacs/puppet-mode.el
|
||||
fi
|
||||
|
||||
if use xemacs ; then
|
||||
# Create a separate version for xemacs to be able to install
|
||||
# emacs and xemacs in parallel.
|
||||
mkdir ext/xemacs
|
||||
cp ext/emacs/* ext/xemacs/
|
||||
xemacs-elisp-compile ext/xemacs/puppet-mode.el
|
||||
fi
|
||||
}
|
||||
|
||||
each_fakegem_install() {
|
||||
${RUBY} install.rb --destdir="${D}" install
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
newinitd "${FILESDIR}"/puppet.init puppet
|
||||
doconfd conf/gentoo/conf.d/puppet
|
||||
|
||||
# Initial configuration files
|
||||
insinto /etc/puppet
|
||||
# Bug #338439
|
||||
#doins conf/gentoo/puppet/*
|
||||
doins conf/redhat/puppet.conf
|
||||
|
||||
# Location of log and data files
|
||||
keepdir /var/{run,log}/puppet
|
||||
fowners -R puppet:puppet /var/{run,log}/puppet
|
||||
|
||||
if use minimal ; then
|
||||
rm "${ED}/usr/bin/puppetmasterd"
|
||||
rm "${ED}/etc/puppet/auth.conf"
|
||||
else
|
||||
newinitd "${FILESDIR}"/puppetmaster-2.7.6.init puppetmaster
|
||||
newconfd "${FILESDIR}"/puppetmaster-2.7.6.confd puppetmaster
|
||||
|
||||
insinto /etc/puppet
|
||||
doins conf/redhat/fileserver.conf
|
||||
|
||||
keepdir /etc/puppet/manifests
|
||||
keepdir /etc/puppet/modules
|
||||
|
||||
keepdir /var/lib/puppet/ssl
|
||||
keepdir /var/lib/puppet/facts
|
||||
keepdir /var/lib/puppet/files
|
||||
fowners -R puppet:puppet /var/{run,log,lib}/puppet
|
||||
fi
|
||||
|
||||
if use emacs ; then
|
||||
SITELISP="${EMACS_SITELISP}"
|
||||
elisp-install ${PN} ext/emacs/puppet-mode.el*
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
if use xemacs ; then
|
||||
SITELISP="${XEMACS_SITELISP}"
|
||||
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
|
||||
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
if use ldap ; then
|
||||
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
|
||||
fi
|
||||
|
||||
if use vim-syntax ; then
|
||||
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
|
||||
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
|
||||
fi
|
||||
|
||||
# ext and examples files
|
||||
for f in $(find ext examples -type f) ; do
|
||||
docinto "$(dirname ${f})"; dodoc "${f}"
|
||||
done
|
||||
docinto conf; dodoc conf/namespaceauth.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
|
||||
elog "cause puppet to hang while installing packages."
|
||||
elog
|
||||
elog "Puppet uses eix to get information about currently installed packages,"
|
||||
elog "so please keep the eix metadata cache updated so puppet is able to properly"
|
||||
elog "handle package installations."
|
||||
elog
|
||||
elog "Currently puppet only supports adding and removing services to the default"
|
||||
elog "runlevel, if you want to add/remove a service from another runlevel you may"
|
||||
elog "do so using symlinking."
|
||||
elog
|
||||
|
||||
if [ \
|
||||
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
|
||||
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
|
||||
-f "${EPREFIX}/etc/puppet/puppetca.conf" \
|
||||
] ; then
|
||||
elog
|
||||
elog "Please remove deprecated config files."
|
||||
elog " /etc/puppet/puppetca.conf"
|
||||
elog " /etc/puppet/puppetd.conf"
|
||||
elog " /etc/puppet/puppetmasterd.conf"
|
||||
elog
|
||||
fi
|
||||
|
||||
use emacs && SITELISP="${EMACS_SITELISP}" elisp-site-regen
|
||||
use xemacs && SITELISP="${XEMACS_SITELISP}" xemacs-elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && SITELISP="${EMACS_SITELISP}" elisp-site-regen
|
||||
use xemacs && SITELISP="${XEMACS_SITELISP}" xemacs-elisp-site-regen
|
||||
}
|
||||
@ -0,0 +1,258 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0.ebuild,v 1.1 2012/04/12 11:46:38 naota Exp $
|
||||
|
||||
EAPI="4"
|
||||
inherit autotools eutils multilib elisp-common flag-o-matic
|
||||
|
||||
DESCRIPTION="Simple, secure and flexible input method library"
|
||||
HOMEPAGE="http://code.google.com/p/uim/"
|
||||
SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
|
||||
IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
REQUIRED_USE="gtk? ( X ) qt4? ( X )"
|
||||
|
||||
RDEPEND="X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXft
|
||||
x11-libs/libXt
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libXext
|
||||
x11-libs/libXrender
|
||||
)
|
||||
anthy? (
|
||||
unicode? ( >=app-i18n/anthy-8622 )
|
||||
!unicode? ( app-i18n/anthy )
|
||||
)
|
||||
canna? ( app-i18n/canna )
|
||||
curl? ( >=net-misc/curl-7.16.4 )
|
||||
eb? ( dev-libs/eb )
|
||||
emacs? ( virtual/emacs )
|
||||
libffi? ( virtual/libffi )
|
||||
gnome? ( >=gnome-base/gnome-panel-2.14 )
|
||||
gtk? ( >=x11-libs/gtk+-2.4:2 )
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
kde? ( >=kde-base/kdelibs-4 )
|
||||
libedit? ( dev-libs/libedit )
|
||||
libnotify? ( >=x11-libs/libnotify-0.4 )
|
||||
m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
|
||||
ncurses? ( sys-libs/ncurses )
|
||||
nls? ( virtual/libintl )
|
||||
prime? ( app-i18n/prime )
|
||||
qt4? ( x11-libs/qt-gui:4[qt3support] )
|
||||
skk? ( app-i18n/skk-jisyo )
|
||||
sqlite? ( dev-db/sqlite:3 )
|
||||
ssl? ( dev-libs/openssl )
|
||||
!dev-scheme/sigscheme
|
||||
!app-i18n/uim-svn
|
||||
!<app-i18n/prime-0.9.4"
|
||||
# >=dev-scheme/sigscheme-0.8.5
|
||||
# mana? ( app-i18n/mana )
|
||||
# scim? ( >=app-i18n/scim-1.3.0 ) # broken
|
||||
# sj3? ( >=app-i18n/sj3-2.0.1.21 )
|
||||
# wnn? ( app-i18n/wnn )
|
||||
# gnome? (
|
||||
# gtk? ( >=gnome-base/gnome-panel-2.14 )
|
||||
# gtk3? ( >=gnome-base/gnome-panel-3 )
|
||||
# )
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/intltool
|
||||
dev-util/pkgconfig
|
||||
>=sys-devel/gettext-0.15
|
||||
kde? ( dev-util/cmake )
|
||||
X? (
|
||||
x11-proto/xextproto
|
||||
x11-proto/xproto
|
||||
)"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
X? (
|
||||
media-fonts/font-sony-misc
|
||||
linguas_zh_CN? (
|
||||
|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
|
||||
)
|
||||
linguas_zh_TW? (
|
||||
media-fonts/intlfonts
|
||||
)
|
||||
linguas_ja? (
|
||||
|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
|
||||
)
|
||||
linguas_ko? (
|
||||
|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
|
||||
)
|
||||
)"
|
||||
# test? ( dev-scheme/gauche )
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
|
||||
update_gtk_immodules() {
|
||||
local GTK2_CONFDIR="/etc/gtk-2.0"
|
||||
# bug #366889
|
||||
if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
|
||||
GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
|
||||
fi
|
||||
mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
|
||||
|
||||
if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
|
||||
"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
|
||||
fi
|
||||
}
|
||||
|
||||
update_gtk3_immodules() {
|
||||
if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
|
||||
"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
|
||||
"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
|
||||
|
||||
# bug 275420
|
||||
sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
|
||||
|
||||
echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
|
||||
|
||||
#./autogen.sh
|
||||
AT_NO_RECURSIVE=1 eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
if (use gtk || use gtk3) && (use anthy || use canna) ; then
|
||||
myconf="${myconf} --enable-dict"
|
||||
else
|
||||
myconf="${myconf} --disable-dict"
|
||||
fi
|
||||
|
||||
if use gtk || use gtk3 || use qt4 ; then
|
||||
myconf="${myconf} --enable-pref"
|
||||
else
|
||||
myconf="${myconf} --disable-pref"
|
||||
fi
|
||||
|
||||
if use anthy ; then
|
||||
if use unicode ; then
|
||||
myconf="${myconf} --with-anthy-utf8"
|
||||
else
|
||||
myconf="${myconf} --with-anthy"
|
||||
fi
|
||||
else
|
||||
myconf="${myconf} --without-anthy"
|
||||
fi
|
||||
|
||||
if use libnotify ; then
|
||||
myconf="${myconf} --enable-notify=libnotify"
|
||||
fi
|
||||
|
||||
#if use gnome ; then
|
||||
# myconf="${myconf} $(use_enable gtk gnome-applet)"
|
||||
# myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
|
||||
#fi
|
||||
|
||||
econf $(use_with X x) \
|
||||
$(use_with canna) \
|
||||
$(use_with curl) \
|
||||
$(use_with eb) \
|
||||
$(use_enable emacs) \
|
||||
$(use_with emacs lispdir "${SITELISP}") \
|
||||
$(use_with libffi ffi) \
|
||||
$(use_enable gnome gnome-applet) \
|
||||
$(use_with gtk gtk2) \
|
||||
$(use_with gtk3) \
|
||||
$(use_with libedit) \
|
||||
--disable-kde-applet \
|
||||
$(use_enable kde kde4-applet) \
|
||||
$(use_with m17n-lib m17nlib) \
|
||||
$(use_enable ncurses fep) \
|
||||
$(use_enable nls) \
|
||||
$(use_with prime) \
|
||||
--without-qt \
|
||||
--without-qt-immodule \
|
||||
$(use_with qt4 qt4) \
|
||||
$(use_with qt4 qt4-immodule) \
|
||||
$(use_enable qt4 qt4-qt3support) \
|
||||
$(use_with skk) \
|
||||
$(use_with sqlite sqlite3) \
|
||||
$(use_enable ssl openssl) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_with xft) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
|
||||
if use emacs; then
|
||||
cd emacs
|
||||
elisp-compile *.el || die "elisp-compile failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# parallel make install b0rked, bug #222677
|
||||
emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
|
||||
if use emacs; then
|
||||
elisp-install uim-el emacs/*.elc || die "elisp-install failed"
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
|
||||
|| die "elisp-site-file-install failed"
|
||||
fi
|
||||
|
||||
find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
|
||||
use static-libs || find "${ED}" -name '*.la' -exec rm {} +
|
||||
|
||||
sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
|
||||
insinto /etc/X11/xinit/xinput.d
|
||||
doins "${T}/uim.conf" || die
|
||||
|
||||
# collision with dev-scheme/sigscheme, bug #330975
|
||||
# find "${ED}" -name '*gcroots*' -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "New input method switcher has been introduced. You need to set"
|
||||
elog
|
||||
elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
|
||||
elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
|
||||
elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
|
||||
elog
|
||||
elog "If you would like to use uim-anthy as default input method, put"
|
||||
elog "(define default-im-name 'anthy)"
|
||||
elog "to your ~/.uim."
|
||||
elog
|
||||
elog "All input methods can be found by running uim-im-switcher-gtk, "
|
||||
elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
|
||||
elog
|
||||
elog "If you upgrade from a version of uim older than 1.4.0,"
|
||||
elog "you should run revdep-rebuild."
|
||||
|
||||
use gtk && update_gtk_immodules
|
||||
use gtk3 && update_gtk3_immodules
|
||||
if use emacs; then
|
||||
elisp-site-regen
|
||||
echo
|
||||
elog "uim is autoloaded with Emacs with a minimal set of features:"
|
||||
elog "There is no keybinding defined to call it directly, so please"
|
||||
elog "create one yourself and choose an input method."
|
||||
elog "Integration with LEIM is not done with this ebuild, please have"
|
||||
elog "a look at the documentation how to achieve this."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use gtk && update_gtk_immodules
|
||||
use gtk3 && update_gtk3_immodules
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST calligra-2.3.92.tar.bz2 123533771 RMD160 c55140a0d4e719140e8aff0cb7f5fb68dc376cf0 SHA1 460d01bbb454140e851f7ea251d3ac8e143215e5 SHA256 8faefc34428deb2ce07856e2f1a58a4d7f842faf04dda46147644f07dbdfa7a9
|
||||
DIST calligra-2.4.0.tar.bz2 123325347 RMD160 840efd6c7ff82b246950de591b9af762d37f9a95 SHA1 6026f4ddcf4bf647ea13dfb477233df472a5c007 SHA256 7c8cd1ec8cd2b26d5544f3b5a283052c5cd82f212749475b91cc340f7e4029b0
|
||||
|
||||
@ -1,205 +0,0 @@
|
||||
# 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.3.92-r1.ebuild,v 1.2 2012/04/11 21:00:29 dilfridge Exp $
|
||||
|
||||
# note: files that need to be checked for dependencies etc:
|
||||
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
|
||||
# krita/CMakeLists.txt
|
||||
|
||||
EAPI=4
|
||||
|
||||
KDE_SCM=git
|
||||
KDE_MINIMAL=4.6.4
|
||||
OPENGL_REQUIRED=optional
|
||||
|
||||
KDE_HANDBOOK=optional
|
||||
|
||||
KDE_LINGUAS_LIVE_OVERRIDE=true
|
||||
inherit kde4-base
|
||||
|
||||
DESCRIPTION="KDE Office Suite"
|
||||
HOMEPAGE="http://www.calligra.org/"
|
||||
[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="4"
|
||||
[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
|
||||
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
|
||||
gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
|
||||
+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
|
||||
+wmf word-perfect xbase +xml +xslt"
|
||||
|
||||
# please do not sort here, order is same as in CMakeLists.txt
|
||||
CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
|
||||
for cal_ft in ${CAL_FTS}; do
|
||||
IUSE+=" calligra_features_${cal_ft}"
|
||||
done
|
||||
unset cal_ft
|
||||
|
||||
REQUIRED_USE="
|
||||
calligra_features_kexi? ( calligra_features_sheets )
|
||||
calligra_features_words? ( calligra_features_sheets )
|
||||
calligra_features_krita? ( eigen exif lcms )
|
||||
calligra_features_plan? ( kdepim semantic-desktop )
|
||||
calligra_features_sheets? ( eigen )
|
||||
test? ( calligra_features_karbon )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
!app-office/karbon
|
||||
!app-office/kexi
|
||||
!app-office/koffice-data
|
||||
!app-office/koffice-l10n
|
||||
!app-office/koffice-libs
|
||||
!app-office/koffice-meta
|
||||
!app-office/kplato
|
||||
!app-office/kpresenter
|
||||
!app-office/krita
|
||||
!app-office/kspread
|
||||
!app-office/kword
|
||||
dev-lang/perl
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
$(add_kdebase_dep knewstuff)
|
||||
media-libs/libpng
|
||||
sys-libs/zlib
|
||||
attica? ( dev-libs/libattica )
|
||||
crypt? ( app-crypt/qca:2 )
|
||||
eigen? ( dev-cpp/eigen:2 )
|
||||
exif? ( media-gfx/exiv2 )
|
||||
fftw? ( sci-libs/fftw:3.0 )
|
||||
fontconfig? ( media-libs/fontconfig )
|
||||
freetds? ( dev-db/freetds )
|
||||
gif? ( media-libs/giflib )
|
||||
glew? ( media-libs/glew )
|
||||
glib? ( dev-libs/glib:2 )
|
||||
gsf? ( gnome-extra/libgsf )
|
||||
gsl? ( sci-libs/gsl )
|
||||
iconv? ( virtual/libiconv )
|
||||
jpeg? ( virtual/jpeg )
|
||||
jpeg2k? ( media-libs/openjpeg )
|
||||
kdcraw? ( $(add_kdebase_dep libkdcraw) )
|
||||
kdepim? ( $(add_kdebase_dep kdepimlibs) )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
marble? ( $(add_kdebase_dep marble) )
|
||||
mysql? ( virtual/mysql )
|
||||
okular? ( $(add_kdebase_dep okular) )
|
||||
openctl? ( >=media-libs/opengtl-0.9.15 )
|
||||
openexr? ( media-libs/openexr )
|
||||
pdf? (
|
||||
app-text/poppler
|
||||
media-gfx/pstoedit
|
||||
)
|
||||
postgres? (
|
||||
dev-db/postgresql-base
|
||||
=dev-libs/libpqxx-3*
|
||||
)
|
||||
semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
|
||||
ssl? ( dev-libs/openssl )
|
||||
sybase? ( dev-db/freetds )
|
||||
tiff? ( media-libs/tiff )
|
||||
truetype? ( media-libs/freetype:2 )
|
||||
word-perfect? (
|
||||
app-text/libwpd
|
||||
app-text/libwps
|
||||
app-text/libwpg
|
||||
)
|
||||
xbase? ( dev-db/xbase )
|
||||
xslt? ( dev-libs/libxslt )
|
||||
calligra_features_kexi? (
|
||||
>=dev-db/sqlite-3.7.9:3[extensions]
|
||||
dev-libs/icu
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.3.92-language.patch"
|
||||
"${FILESDIR}/${PN}-2.3.92-table.patch"
|
||||
"${FILESDIR}/${PN}-2.4.0-rdf.patch"
|
||||
)
|
||||
|
||||
RESTRICT=test
|
||||
# bug 394273
|
||||
|
||||
src_configure() {
|
||||
local cal_ft
|
||||
|
||||
# first write out things we want to hard-enable
|
||||
local mycmakeargs=(
|
||||
"-DWITH_Boost=ON"
|
||||
"-DWITH_LibXml2=ON"
|
||||
"-DWITH_PNG=ON"
|
||||
"-DWITH_ZLIB=ON"
|
||||
"-DGHNS=ON"
|
||||
"-DWITH_X11=ON"
|
||||
"-DWITH_Qt4=ON"
|
||||
"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
|
||||
)
|
||||
|
||||
# default disablers
|
||||
mycmakeargs+=(
|
||||
"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
|
||||
"-DWITH_LCMS=OFF" # we use lcms:2
|
||||
"-DCREATIVEONLY=OFF"
|
||||
"-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
|
||||
mycmakeargs+=(
|
||||
$(cmake-utils_use_with attica LibAttica)
|
||||
$(cmake-utils_use_with crypt QCA2)
|
||||
$(cmake-utils_use_with eigen Eigen2)
|
||||
$(cmake-utils_use_with exif Exiv2)
|
||||
$(cmake-utils_use_with fftw FFTW3)
|
||||
$(cmake-utils_use_with fontconfig Fontconfig)
|
||||
$(cmake-utils_use_with freetds FreeTDS)
|
||||
$(cmake-utils_use_with gif GIF2)
|
||||
$(cmake-utils_use_with glew GLEW)
|
||||
$(cmake-utils_use_with glib GLIB2)
|
||||
$(cmake-utils_use_with glib GObject)
|
||||
$(cmake-utils_use_with gsf LIBGSF)
|
||||
$(cmake-utils_use_with gsl GSL)
|
||||
$(cmake-utils_use_with iconv Iconv)
|
||||
$(cmake-utils_use_with jpeg JPEG)
|
||||
$(cmake-utils_use_with jpeg2k OpenJPEG)
|
||||
$(cmake-utils_use_with kdcraw Kdcraw)
|
||||
$(cmake-utils_use_with kdepim KdepimLibs)
|
||||
$(cmake-utils_use_with lcms LCMS2)
|
||||
$(cmake-utils_use_with marble Marble)
|
||||
$(cmake-utils_use_with mysql MySQL)
|
||||
$(cmake-utils_use_with okular Okular)
|
||||
$(cmake-utils_use_with openctl OpenCTL)
|
||||
$(cmake-utils_use_with openexr OpenEXR)
|
||||
$(cmake-utils_use_with opengl OpenGL)
|
||||
$(cmake-utils_use_with pdf Poppler)
|
||||
$(cmake-utils_use_with pdf Pstoedit)
|
||||
$(cmake-utils_use_with postgres PostgreSQL)
|
||||
$(cmake-utils_use_with semantic-desktop Soprano)
|
||||
$(cmake-utils_use semantic-desktop NEPOMUK)
|
||||
$(cmake-utils_use_with ssl OpenSSL)
|
||||
$(cmake-utils_use_with sybase FreeTDS)
|
||||
$(cmake-utils_use_with tiff TIFF)
|
||||
$(cmake-utils_use_with threads Threads)
|
||||
$(cmake-utils_use_with truetype Freetype)
|
||||
$(cmake-utils_use_with word-perfect WPD)
|
||||
$(cmake-utils_use_with word-perfect WPG)
|
||||
$(cmake-utils_use_with xbase XBase)
|
||||
$(cmake-utils_use_with xslt LibXslt)
|
||||
$(cmake-utils_use_build wmf libkowmf)
|
||||
$(cmake-utils_use_build mso libmsooxml)
|
||||
)
|
||||
|
||||
# applications
|
||||
for cal_ft in ${CAL_FTS}; do
|
||||
mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
|
||||
done
|
||||
mycmakeargs+=( $(cmake-utils_use_build test cstester) )
|
||||
|
||||
# filters
|
||||
|
||||
kde4-base_src_configure
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
--- plugins/textediting/spellcheck/SpellCheck.cpp.org 2012-03-29 07:19:58.808192633 +0200
|
||||
+++ plugins/textediting/spellcheck/SpellCheck.cpp 2012-03-29 07:28:13.671184157 +0200
|
||||
@@ -44,7 +44,8 @@
|
||||
m_allowSignals(true),
|
||||
m_documentIsLoading(false),
|
||||
m_isChecking(false),
|
||||
- m_spellCheckMenu(0)
|
||||
+ m_spellCheckMenu(0),
|
||||
+ m_document(0)
|
||||
{
|
||||
/* setup actions for this plugin */
|
||||
KAction *configureAction = new KAction(i18n("Configure &Spell Checking..."), this);
|
||||
@@ -141,7 +142,7 @@
|
||||
{
|
||||
m_speller.setDefaultLanguage(language);
|
||||
m_bgSpellCheck->setDefaultLanguage(language);
|
||||
- if (m_enableSpellCheck) {
|
||||
+ if (m_enableSpellCheck && m_document) {
|
||||
checkSection(m_document, 0, m_document->characterCount() - 1);
|
||||
}
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
From 0f96e4b78756deaba77b2d8d486ea5585bd8f652 Mon Sep 17 00:00:00 2001
|
||||
From: Boudewijn Rempt <boud@valdyas.org>
|
||||
Date: Thu, 29 Mar 2012 15:32:18 +0200
|
||||
Subject: [PATCH] Fix inserting table shape in non-english locale
|
||||
|
||||
Comparing a translated name with a fixed text isn't going to work...
|
||||
|
||||
BUG:297029
|
||||
BUG:293704
|
||||
|
||||
Okay to backport to 2.4?
|
||||
---
|
||||
libs/flake/KoDeferredShapeFactoryBase.h | 2 ++
|
||||
libs/flake/KoShapeFactoryBase.cpp | 9 ++-------
|
||||
sheets/shape/TableShapeDeferredFactory.h | 2 ++
|
||||
sheets/shape/TableShapeFactory.cpp | 2 +-
|
||||
sheets/shape/spreadsheetshape-deferred.desktop | 1 +
|
||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libs/flake/KoDeferredShapeFactoryBase.h b/libs/flake/KoDeferredShapeFactoryBase.h
|
||||
index 68bc5e3..7887484 100644
|
||||
--- a/libs/flake/KoDeferredShapeFactoryBase.h
|
||||
+++ b/libs/flake/KoDeferredShapeFactoryBase.h
|
||||
@@ -47,6 +47,8 @@ public:
|
||||
|
||||
virtual ~KoDeferredShapeFactoryBase();
|
||||
|
||||
+ virtual QString deferredPluginName() = 0;
|
||||
+
|
||||
/**
|
||||
* This method should be implemented by factories to create a shape that the user
|
||||
* gets when doing a base insert. For example from a script. The created shape
|
||||
diff --git a/libs/flake/KoShapeFactoryBase.cpp b/libs/flake/KoShapeFactoryBase.cpp
|
||||
index 116cacc..5c5ec48 100644
|
||||
--- a/libs/flake/KoShapeFactoryBase.cpp
|
||||
+++ b/libs/flake/KoShapeFactoryBase.cpp
|
||||
@@ -242,19 +242,14 @@ void KoShapeFactoryBase::getDeferredPlugin()
|
||||
if (d->deferredFactory) return;
|
||||
|
||||
const QString serviceType = "Calligra/Deferred";
|
||||
- QString query = QString::fromLatin1("(Type == 'Service') and (Name == '%1')").arg(d->deferredPluginName);
|
||||
- const KService::List offers = KServiceTypeTrader::self()->query(serviceType, query);
|
||||
+ const KService::List offers = KServiceTypeTrader::self()->query(serviceType, QString());
|
||||
Q_ASSERT(offers.size() > 0);
|
||||
|
||||
foreach(KSharedPtr<KService> service, offers) {
|
||||
- QString error = 0; // FIXME: From where does error get a value?
|
||||
KoDeferredShapeFactoryBase *plugin = service->createInstance<KoDeferredShapeFactoryBase>(this);
|
||||
- if (plugin) {
|
||||
+ if (plugin && plugin->deferredPluginName() == d->deferredPluginName) {
|
||||
d->deferredFactory = plugin;
|
||||
}
|
||||
- else {
|
||||
- kWarning(30003) << "loading plugin" << service->name() << "failed, " << error;
|
||||
- }
|
||||
}
|
||||
|
||||
}
|
||||
diff --git a/sheets/shape/TableShapeDeferredFactory.h b/sheets/shape/TableShapeDeferredFactory.h
|
||||
index 2668c2b..981b4d8 100644
|
||||
--- a/sheets/shape/TableShapeDeferredFactory.h
|
||||
+++ b/sheets/shape/TableShapeDeferredFactory.h
|
||||
@@ -30,6 +30,8 @@ public:
|
||||
TableDeferredShapeFactory(QObject *parent, const QVariantList&);
|
||||
~TableDeferredShapeFactory();
|
||||
|
||||
+ virtual QString deferredPluginName() { return "spreadsheetshape-deferred"; }
|
||||
+
|
||||
KoShape *createDefaultShape(KoDocumentResourceManager *documentResources = 0) const;
|
||||
private:
|
||||
KoShapeFactoryBase *m_stubFactory;
|
||||
diff --git a/sheets/shape/TableShapeFactory.cpp b/sheets/shape/TableShapeFactory.cpp
|
||||
index 0cba2a9..98102a6 100644
|
||||
--- a/sheets/shape/TableShapeFactory.cpp
|
||||
+++ b/sheets/shape/TableShapeFactory.cpp
|
||||
@@ -47,7 +47,7 @@ TableShapePlugin::TableShapePlugin(QObject * parent, const QVariantList&)
|
||||
|
||||
|
||||
TableShapeFactory::TableShapeFactory()
|
||||
- : KoShapeFactoryBase(TableShapeId, i18n("Spreadsheet"), "Spreadsheet Shape")
|
||||
+ : KoShapeFactoryBase(TableShapeId, i18n("Spreadsheet"), "spreadsheetshape-deferred")
|
||||
{
|
||||
setToolTip(i18n("Spreadsheet Shape"));
|
||||
setIcon("spreadsheetshape");
|
||||
diff --git a/sheets/shape/spreadsheetshape-deferred.desktop b/sheets/shape/spreadsheetshape-deferred.desktop
|
||||
index cb47900..da3b679 100644
|
||||
--- a/sheets/shape/spreadsheetshape-deferred.desktop
|
||||
+++ b/sheets/shape/spreadsheetshape-deferred.desktop
|
||||
@@ -39,3 +39,4 @@ Type=Service
|
||||
X-KDE-Library=spreadsheetshape-deferred
|
||||
X-Flake-MinVersion=4
|
||||
X-Flake-PluginVersion=4
|
||||
+X-DeferredID=spreadsheetshape-deferred
|
||||
--
|
||||
1.7.9.2
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST libimobiledevice-1.1.1.tar.bz2 459976 RMD160 7cc2860efc3b7d14686b776e6e9a5237804b3fc4 SHA1 eb81cb8c66beb68987fbc4126e9ca84cd19199c9 SHA256 c544d7bf0e7d6a97f3c446b2fb4597f19aac7b184ea806e16cd6a7852fd25f67
|
||||
DIST libimobiledevice-1.1.2.tar.bz2 508281 RMD160 d37acd947e104b06b7fddc8a635c92abf87ce871 SHA1 1046f29382855fc5f5a01f33e5efe3726ac65d50 SHA256 67afab6fca70f5ba7071cc7b27cd52564aac64b3a48b6b551739131382a61818
|
||||
DIST libimobiledevice-1.1.4.tar.bz2 508371 RMD160 ad90beb4b6deaf211e8ea0a3e7d73e0a5ef9b6d3 SHA1 d59d9751d9f792e8674cd87c91005d431bf56065 SHA256 67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8
|
||||
|
||||
@ -1 +1,2 @@
|
||||
DIST usbmuxd-1.0.7.tar.bz2 59152 RMD160 9fcbfa3e3bf50385b68c396f6bbac0f34971bc37 SHA1 8de79bf9cc96760ebba475de66ef4f7701f84ad6 SHA256 80a02c106f88f7cedf93f12545b906d9fe4b20f696fa4c3daf1d1bd24de65c27
|
||||
DIST usbmuxd-1.0.8.tar.bz2 59347 RMD160 63e927804a0a2270a5ae4fcfbfdda20a7ec921fd SHA1 56bd90d5ff94c1d9c528f8b49deffea25b7384e8 SHA256 899d63cb7915ee844f1d3d651bee06f3dbb862cebca849f0a57f27a0fdfcba5c
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/usbmuxd-1.0.7.ebuild,v 1.3 2011/10/04 14:02:54 nativemad Exp $
|
||||
|
||||
EAPI=3
|
||||
inherit eutils cmake-utils
|
||||
|
||||
DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
|
||||
HOMEPAGE="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
|
||||
SRC_URI="http://marcansoft.com/uploads/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2 GPL-3 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="app-pda/libplist
|
||||
virtual/libusb:1"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup plugdev
|
||||
enewuser usbmux -1 -1 -1 "usb,plugdev"
|
||||
}
|
||||
|
||||
DOCS="AUTHORS README README.devel"
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/usbmuxd-1.0.8.ebuild,v 1.2 2012/04/12 14:46:23 ssuominen Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit cmake-utils user
|
||||
|
||||
DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
|
||||
HOMEPAGE="http://www.libimobiledevice.org/"
|
||||
SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2 GPL-3 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=app-pda/libplist-1.8-r1
|
||||
virtual/libusb:1"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup plugdev
|
||||
enewuser usbmux -1 -1 -1 "usb,plugdev"
|
||||
}
|
||||
|
||||
DOCS="AUTHORS README README.devel"
|
||||
@ -0,0 +1,348 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3.ebuild,v 1.1 2012/04/12 13:41:35 djc Exp $
|
||||
|
||||
EAPI="2"
|
||||
WANT_AUTOMAKE="none"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib python toolchain-funcs
|
||||
|
||||
MY_PV="${PV%_p*}"
|
||||
MY_P="Python-${MY_PV}"
|
||||
|
||||
PATCHSET_REVISION="0"
|
||||
|
||||
DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
|
||||
HOMEPAGE="http://www.python.org/"
|
||||
SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.bz2
|
||||
mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
|
||||
|
||||
LICENSE="PSF-2"
|
||||
SLOT="2.7"
|
||||
PYTHON_ABI="${SLOT}"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
|
||||
|
||||
RDEPEND=">=app-admin/eselect-python-20091230
|
||||
app-arch/bzip2
|
||||
>=sys-libs/zlib-1.1.3
|
||||
virtual/libffi
|
||||
virtual/libintl
|
||||
!build? (
|
||||
berkdb? ( || (
|
||||
sys-libs/db:4.8
|
||||
sys-libs/db:4.7
|
||||
sys-libs/db:4.6
|
||||
sys-libs/db:4.5
|
||||
sys-libs/db:4.4
|
||||
sys-libs/db:4.3
|
||||
sys-libs/db:4.2
|
||||
) )
|
||||
gdbm? ( sys-libs/gdbm )
|
||||
ncurses? (
|
||||
>=sys-libs/ncurses-5.2
|
||||
readline? ( >=sys-libs/readline-4.1 )
|
||||
)
|
||||
sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] )
|
||||
ssl? ( dev-libs/openssl )
|
||||
tk? (
|
||||
>=dev-lang/tk-8.0
|
||||
dev-tcltk/blt
|
||||
)
|
||||
xml? ( >=dev-libs/expat-2 )
|
||||
)
|
||||
!!<sys-apps/portage-2.1.9"
|
||||
|
||||
DEPEND=">=sys-devel/autoconf-2.65
|
||||
${RDEPEND}
|
||||
dev-util/pkgconfig
|
||||
doc? ( dev-python/sphinx )
|
||||
!sys-devel/gcc[libffi]"
|
||||
|
||||
RDEPEND+=" !build? ( app-misc/mime-types )
|
||||
doc? ( dev-python/python-docs:${SLOT} )"
|
||||
PDEPEND="app-admin/python-updater"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
python_pkg_setup
|
||||
|
||||
if use berkdb; then
|
||||
ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python."
|
||||
ewarn "\"bsddb\" and \"dbhash\" modules have been additionally removed in Python 3."
|
||||
ewarn "You should use external, still maintained \"bsddb3\" module provided by dev-python/bsddb3,"
|
||||
ewarn "which supports both Python 2 and Python 3."
|
||||
else
|
||||
if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
|
||||
ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb] to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
|
||||
ewarn "You might need to migrate your databases."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Ensure that internal copies of expat, libffi and zlib are not used.
|
||||
rm -fr Modules/expat
|
||||
rm -fr Modules/_ctypes/libffi*
|
||||
rm -fr Modules/zlib
|
||||
|
||||
local excluded_patches
|
||||
if ! tc-is-cross-compiler; then
|
||||
excluded_patches="*_all_crosscompile.patch"
|
||||
fi
|
||||
|
||||
local patchset_dir
|
||||
#patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
|
||||
patchset_dir="${WORKDIR}/${MY_PV}"
|
||||
|
||||
EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
|
||||
|
||||
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
|
||||
Lib/distutils/command/install.py \
|
||||
Lib/distutils/sysconfig.py \
|
||||
Lib/site.py \
|
||||
Lib/sysconfig.py \
|
||||
Lib/test/test_site.py \
|
||||
Makefile.pre.in \
|
||||
Modules/Setup.dist \
|
||||
Modules/getpath.c \
|
||||
setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
|
||||
|
||||
# Linux-3 compat. Bug #374579 (upstream issue12571)
|
||||
cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die
|
||||
# Try to prevent PaX from interfering with ctypes (bug 329499)
|
||||
sed -i -e s/'PROT_WRITE\s*|\s*PROT_EXEC'/'PROT_WRITE'/g Modules/_ctypes/mallo*.c
|
||||
|
||||
eautoconf
|
||||
eautoheader
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use build; then
|
||||
# Disable extraneous modules with extra dependencies.
|
||||
export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
|
||||
export PYTHON_DISABLE_SSL="1"
|
||||
else
|
||||
# dbm module can be linked against berkdb or gdbm.
|
||||
# Defaults to gdbm when both are enabled, #204343.
|
||||
local disable
|
||||
use berkdb || use gdbm || disable+=" dbm"
|
||||
use berkdb || disable+=" _bsddb"
|
||||
use gdbm || disable+=" gdbm"
|
||||
use ncurses || disable+=" _curses _curses_panel"
|
||||
use readline || disable+=" readline"
|
||||
use sqlite || disable+=" _sqlite3"
|
||||
use ssl || export PYTHON_DISABLE_SSL="1"
|
||||
use tk || disable+=" _tkinter"
|
||||
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
|
||||
export PYTHON_DISABLE_MODULES="${disable}"
|
||||
|
||||
if ! use xml; then
|
||||
ewarn "You have configured Python without XML support."
|
||||
ewarn "This is NOT a recommended configuration as you"
|
||||
ewarn "may face problems parsing any XML documents."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
|
||||
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
|
||||
fi
|
||||
|
||||
if [[ "$(gcc-major-version)" -ge 4 ]]; then
|
||||
append-flags -fwrapv
|
||||
fi
|
||||
|
||||
filter-flags -malign-double
|
||||
|
||||
[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
|
||||
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=50309
|
||||
if is-flagq -O3; then
|
||||
is-flagq -fstack-protector-all && replace-flags -O3 -O2
|
||||
use hardened && replace-flags -O3 -O2
|
||||
fi
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
|
||||
./configure --{build,host}=${CBUILD} || die "cross-configure failed"
|
||||
emake python Parser/pgen || die "cross-make failed"
|
||||
mv python hostpython
|
||||
mv Parser/pgen Parser/hostpgen
|
||||
make distclean
|
||||
sed -i \
|
||||
-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
|
||||
-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
|
||||
Makefile.pre.in || die "sed failed"
|
||||
fi
|
||||
|
||||
# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
|
||||
tc-export CXX
|
||||
|
||||
# Set LDFLAGS so we link modules with -lpython2.7 correctly.
|
||||
# Needed on FreeBSD unless Python 2.7 is already installed.
|
||||
# Please query BSD team before removing this!
|
||||
append-ldflags "-L."
|
||||
|
||||
local dbmliborder
|
||||
if use gdbm; then
|
||||
dbmliborder+="${dbmliborder:+:}gdbm"
|
||||
fi
|
||||
if use berkdb; then
|
||||
dbmliborder+="${dbmliborder:+:}bdb"
|
||||
fi
|
||||
|
||||
OPT="" econf \
|
||||
--with-fpectl \
|
||||
--enable-shared \
|
||||
$(use_enable ipv6) \
|
||||
$(use_with threads) \
|
||||
$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
|
||||
--infodir='${prefix}/share/info' \
|
||||
--mandir='${prefix}/share/man' \
|
||||
--with-dbmliborder="${dbmliborder}" \
|
||||
--with-libc="" \
|
||||
--enable-loadable-sqlite-extensions \
|
||||
--with-system-expat \
|
||||
--with-system-ffi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake EPYTHON="python${PV%%.*}" || die "emake failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Tests will not work when cross compiling.
|
||||
if tc-is-cross-compiler; then
|
||||
elog "Disabling tests due to crosscompiling."
|
||||
return
|
||||
fi
|
||||
|
||||
# Byte compiling should be enabled here.
|
||||
# Otherwise test_import fails.
|
||||
python_enable_pyc
|
||||
|
||||
# Skip failing tests.
|
||||
local skipped_tests="distutils gdb"
|
||||
|
||||
for test in ${skipped_tests}; do
|
||||
mv "${S}/Lib/test/test_${test}.py" "${T}"
|
||||
done
|
||||
|
||||
# Rerun failed tests in verbose mode (regrtest -w).
|
||||
emake test EXTRATESTOPTS="-w" < /dev/tty
|
||||
local result="$?"
|
||||
|
||||
for test in ${skipped_tests}; do
|
||||
mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
|
||||
done
|
||||
|
||||
elog "The following tests have been skipped:"
|
||||
for test in ${skipped_tests}; do
|
||||
elog "test_${test}.py"
|
||||
done
|
||||
|
||||
elog "If you would like to run them, you may:"
|
||||
elog "cd '${EPREFIX}$(python_get_libdir)/test'"
|
||||
elog "and run the tests separately."
|
||||
|
||||
python_disable_pyc
|
||||
|
||||
if [[ "${result}" -ne 0 ]]; then
|
||||
die "emake test failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
|
||||
|
||||
emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
|
||||
python_clean_installation_image -q
|
||||
|
||||
sed -e "s/\(LDFLAGS=\).*/\1/" -i "${ED}$(python_get_libdir)/config/Makefile" || die "sed failed"
|
||||
|
||||
mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
|
||||
|
||||
# Fix collisions between different slots of Python.
|
||||
mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
|
||||
mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
|
||||
mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
|
||||
rm -f "${ED}usr/bin/smtpd.py"
|
||||
|
||||
if use build; then
|
||||
rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
|
||||
else
|
||||
use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
|
||||
use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,test/test_bsddb*}
|
||||
use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
|
||||
use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
|
||||
fi
|
||||
|
||||
use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
|
||||
use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe
|
||||
|
||||
dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins -r "${S}/Tools" || die "doins failed"
|
||||
fi
|
||||
|
||||
newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
|
||||
newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
|
||||
|
||||
if use kernel_linux; then
|
||||
if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
|
||||
cp -r "${ED}$(python_get_libdir)/plat-linux2" \
|
||||
"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
|
||||
else
|
||||
cp -r "${ED}$(python_get_libdir)/plat-linux3" \
|
||||
"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
|
||||
fi
|
||||
fi
|
||||
|
||||
sed \
|
||||
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
|
||||
-e "s:@PYDOC@:pydoc${SLOT}:" \
|
||||
-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
|
||||
python_updater_warning="1"
|
||||
fi
|
||||
}
|
||||
|
||||
eselect_python_update() {
|
||||
[[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/"
|
||||
|
||||
if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
|
||||
eselect python update
|
||||
fi
|
||||
|
||||
if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
|
||||
eselect python update --python${PV%%.*}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect_python_update
|
||||
|
||||
python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
|
||||
|
||||
if [[ "${python_updater_warning}" == "1" ]]; then
|
||||
ewarn "You have just upgraded from an older version of Python."
|
||||
ewarn "You should switch active version of Python ${PV%%.*} and run"
|
||||
ewarn "'python-updater [options]' to rebuild Python modules."
|
||||
local n
|
||||
for ((n = 0; n < 12; n++)); do
|
||||
echo -ne "\a"
|
||||
sleep 1
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect_python_update
|
||||
python_mod_cleanup $(python_get_libdir)
|
||||
}
|
||||
@ -1,3 +1,5 @@
|
||||
DIST v8-3.10.0.5.tar.bz2 9971192 RMD160 dde2e9f23e27f027014494742f6823315a938190 SHA1 84452ac32e49a5eea563a0ca64b1f44219f55bb8 SHA256 e2691ee5be3253b81742c00f11dcdac9d07557d1ebdd8af4653ba7ddc754e1c0
|
||||
DIST v8-3.8.9.16.tar.bz2 9863957 RMD160 9a9c4133db4b3a1767dfde5fb15960f7c80d6f48 SHA1 a0f66148665b36ec8817c7ce78fa785ae76d63fb SHA256 e653e9f4731a16881742c648a4d5d70d2f4f88919247dd4e08e7bff95e7187b4
|
||||
DIST v8-3.8.9.18.tar.bz2 9866059 RMD160 1bf90347b5eeac74aa2d5c2af5e0cfbaec10f869 SHA1 1fd8f9337f3ba0403758289f463206cd96bf20ee SHA256 b4949c1c0af7337bf4de1f2798febed5002e892bbc813f8c4acf459569e8ad99
|
||||
DIST v8-3.9.24.1.tar.bz2 9970886 RMD160 c35ed9bef53e4004ad38da623de6ba3438542e6c SHA1 844ce87eec73f93cee3e918ec71a16676f93f829 SHA256 58129d75ffa9ffc34d1236c80c592275597732fc076acc981cf3f38eb14fa206
|
||||
DIST v8-3.9.24.7.tar.bz2 9969417 RMD160 d300115b7c1b0fd00ff19f9941b3415a272419b0 SHA1 d0e56af5a89242f34237fc539b88a5b6aea3880a SHA256 a3e836664fb7155335272250d64ddd4a4cd0eee4f7a26f95e131550399524f04
|
||||
|
||||
@ -0,0 +1,118 @@
|
||||
# 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.10.0.5.ebuild,v 1.1 2012/04/12 12:36:21 phajdan.jr Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
PYTHON_DEPEND="2:2.6"
|
||||
|
||||
inherit eutils multilib pax-utils python toolchain-funcs versionator
|
||||
|
||||
DESCRIPTION="Google's open source JavaScript engine"
|
||||
HOMEPAGE="http://code.google.com/p/v8"
|
||||
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
|
||||
LICENSE="BSD"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export AR CC CXX RANLIB
|
||||
|
||||
# Use target arch detection logic from bug #354601.
|
||||
case ${CHOST} in
|
||||
i?86-*) myarch=ia32 ;;
|
||||
x86_64-*)
|
||||
if [[ $ABI = x86 ]] ; then
|
||||
myarch=ia32
|
||||
else
|
||||
myarch=x64
|
||||
fi ;;
|
||||
arm*-*) myarch=arm ;;
|
||||
*) die "Unrecognized CHOST: ${CHOST}"
|
||||
esac
|
||||
mytarget=${myarch}.release
|
||||
|
||||
soname_version="$(get_version_component_range 1-3)"
|
||||
|
||||
local snapshot=on
|
||||
host-is-pax && snapshot=off
|
||||
|
||||
# TODO: Add console=readline option once implemented upstream
|
||||
# http://code.google.com/p/v8/issues/detail?id=1781
|
||||
|
||||
emake V=1 \
|
||||
library=shared \
|
||||
werror=no \
|
||||
soname_version=${soname_version} \
|
||||
snapshot=${snapshot} \
|
||||
${mytarget} || die
|
||||
|
||||
pax-mark m out/${mytarget}/{cctest,d8,shell} || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local arg testjobs
|
||||
for arg in ${MAKEOPTS}; do
|
||||
case ${arg} in
|
||||
-j*) testjobs=${arg#-j} ;;
|
||||
--jobs=*) testjobs=${arg#--jobs=} ;;
|
||||
esac
|
||||
done
|
||||
|
||||
tools/test-wrapper-gypbuild.py \
|
||||
-j${testjobs:-1} \
|
||||
--arch-and-mode=${mytarget} \
|
||||
--no-presubmit \
|
||||
--progress=dots || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr
|
||||
doins -r include || die
|
||||
|
||||
dobin out/${mytarget}/d8 || die
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# buildsystem is too horrific to get this built correctly
|
||||
mv out/${mytarget}/lib.target/libv8.so.${soname_version} \
|
||||
out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
|
||||
fi
|
||||
|
||||
dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
|
||||
dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
|
||||
|
||||
dodoc AUTHORS ChangeLog || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
preserved_libs=()
|
||||
local baselib candidate
|
||||
|
||||
eshopts_push -s nullglob
|
||||
|
||||
for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
|
||||
baselib=${candidate##*/}
|
||||
if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
|
||||
preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
|
||||
fi
|
||||
done
|
||||
|
||||
eshopts_pop
|
||||
|
||||
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
|
||||
preserve_old_lib "${preserved_libs[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
|
||||
preserve_old_lib_notify "${preserved_libs[@]}"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,138 @@
|
||||
# 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.8.9.18.ebuild,v 1.1 2012/04/13 01:18:46 floppym Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
PYTHON_DEPEND="2:2.6"
|
||||
|
||||
inherit eutils multilib pax-utils python toolchain-funcs versionator
|
||||
|
||||
DESCRIPTION="Google's open source JavaScript engine"
|
||||
HOMEPAGE="http://code.google.com/p/v8"
|
||||
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
|
||||
LICENSE="BSD"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# don't force 32-bits mode on Darwin
|
||||
sed -i -e '/-arch i386/d' build/gyp/pylib/gyp/generator/make.py || die
|
||||
# force using Makefiles, instead of Xcode project file on Darwin
|
||||
sed -i -e '/darwin/s/xcode/make/' build/gyp/pylib/gyp/__init__.py || die
|
||||
# don't refuse to build shared_libs because we build somewhere else
|
||||
sed -i \
|
||||
-e '/params\.get.*mac.*darwin.*linux/s/mac/darwin/' \
|
||||
-e "/if GetFlavor(params) == 'mac':/s/mac/darwin/" \
|
||||
-e "/^ if flavor == 'mac':/s/mac/darwin/" \
|
||||
build/gyp/pylib/gyp/generator/make.py || die
|
||||
# make sure our v8.dylib doesn't end up being empty and give it a proper
|
||||
# install_name (soname)
|
||||
sed -i \
|
||||
-e '/^LINK_COMMANDS_MAC =/,/^SHARED_HEADER =/s#-shared#-dynamiclib -all_load -install_name '"${EPREFIX}/usr/$(get_libdir)/libv8$(get_libname $(get_version_component_range 1-3))"'#' \
|
||||
build/gyp/pylib/gyp/generator/make.py || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export AR CC CXX RANLIB
|
||||
export LINK="${CXX}"
|
||||
|
||||
# Use target arch detection logic from bug #354601.
|
||||
case ${CHOST} in
|
||||
i?86-*) myarch=ia32 ;;
|
||||
x86_64-*)
|
||||
if [[ $ABI = x86 ]] ; then
|
||||
myarch=ia32
|
||||
else
|
||||
myarch=x64
|
||||
fi ;;
|
||||
arm*-*) myarch=arm ;;
|
||||
*) die "Unrecognized CHOST: ${CHOST}"
|
||||
esac
|
||||
mytarget=${myarch}.release
|
||||
|
||||
soname_version="$(get_version_component_range 1-3)"
|
||||
|
||||
local snapshot=on
|
||||
host-is-pax && snapshot=off
|
||||
|
||||
# TODO: Add console=readline option once implemented upstream
|
||||
# http://code.google.com/p/v8/issues/detail?id=1781
|
||||
|
||||
emake V=1 \
|
||||
library=shared \
|
||||
werror=no \
|
||||
soname_version=${soname_version} \
|
||||
snapshot=${snapshot} \
|
||||
${mytarget} || die
|
||||
|
||||
pax-mark m out/${mytarget}/{cctest,d8,shell} || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local arg testjobs
|
||||
for arg in ${MAKEOPTS}; do
|
||||
case ${arg} in
|
||||
-j*) testjobs=${arg#-j} ;;
|
||||
--jobs=*) testjobs=${arg#--jobs=} ;;
|
||||
esac
|
||||
done
|
||||
|
||||
tools/test-wrapper-gypbuild.py \
|
||||
-j${testjobs:-1} \
|
||||
--arch-and-mode=${mytarget} \
|
||||
--no-presubmit \
|
||||
--progress=dots || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr
|
||||
doins -r include || die
|
||||
|
||||
dobin out/${mytarget}/d8 || die
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# buildsystem is too horrific to get this built correctly
|
||||
mv out/${mytarget}/lib.target/libv8.so.${soname_version} \
|
||||
out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
|
||||
fi
|
||||
|
||||
dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
|
||||
dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
|
||||
|
||||
dodoc AUTHORS ChangeLog || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
preserved_libs=()
|
||||
local baselib candidate
|
||||
|
||||
eshopts_push -s nullglob
|
||||
|
||||
for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname) \
|
||||
"${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
|
||||
baselib=${candidate##*/}
|
||||
if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
|
||||
preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
|
||||
fi
|
||||
done
|
||||
|
||||
eshopts_pop
|
||||
|
||||
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
|
||||
preserve_old_lib "${preserved_libs[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
|
||||
preserve_old_lib_notify "${preserved_libs[@]}"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
diff -ur poco-1.3.6p2-all.orig//components poco-1.3.6p2-all/components
|
||||
--- poco-1.3.6p2-all.orig//components 2010-07-19 13:52:31.936802078 +0200
|
||||
+++ poco-1.3.6p2-all/components 2010-07-19 13:59:37.351927395 +0200
|
||||
@@ -1,13 +1,7 @@
|
||||
-CppUnit
|
||||
Foundation
|
||||
XML
|
||||
Util
|
||||
Net
|
||||
-Crypto
|
||||
-NetSSL_OpenSSL
|
||||
Data
|
||||
-Data/SQLite
|
||||
-Data/ODBC
|
||||
-Data/MySQL
|
||||
Zip
|
||||
PageCompiler
|
||||
diff -ur poco-1.3.6p2-all.orig//Data/ODBC/Makefile poco-1.3.6p2-all/Data/ODBC/Makefile
|
||||
--- poco-1.3.6p2-all.orig//Data/ODBC/Makefile 2010-07-19 13:52:31.932802424 +0200
|
||||
+++ poco-1.3.6p2-all/Data/ODBC/Makefile 2010-07-19 13:55:24.976677962 +0200
|
||||
@@ -9,10 +9,10 @@
|
||||
include $(POCO_BASE)/build/rules/global
|
||||
|
||||
# adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
|
||||
-ODBCLIBDIR = /usr/lib
|
||||
+ODBCLIBDIR = /usr/$(LIBDIR)
|
||||
|
||||
INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
|
||||
-SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
|
||||
+SYSLIBS += -L/usr/local/$(LIBDIR)/odbc -L/usr/$(LIBDIR)/odbc -L/usr/$(LIBDIR) -L/usr/local/$(LIBDIR)
|
||||
|
||||
ifeq ($(POCO_CONFIG),MinGW)
|
||||
# Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
|
||||
@@ -24,19 +24,19 @@
|
||||
# CYGWIN platform has its own ODBC library in /lib/w32api
|
||||
SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
|
||||
else
|
||||
-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
|
||||
+ifeq (unixodbc, $(GENTOO_ODBC))
|
||||
SYSLIBS += -lodbc -lodbcinst
|
||||
COMMONFLAGS += -DPOCO_UNIXODBC
|
||||
else
|
||||
-ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
|
||||
+ifeq (unixodbc, $(GENTOO_ODBC))
|
||||
SYSLIBS += -lodbc -lodbcinst
|
||||
COMMONFLAGS += -DPOCO_UNIXODBC
|
||||
else
|
||||
-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
|
||||
+ifeq (iodbc, $(GENTOO_ODBC))
|
||||
SYSLIBS += -liodbc -liodbcinst
|
||||
COMMONFLAGS += -DPOCO_IODBC
|
||||
else
|
||||
-ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
|
||||
+ifeq (iodbc, $(GENTOO_ODBC))
|
||||
SYSLIBS += -liodbc -liodbcinst
|
||||
COMMONFLAGS += -DPOCO_IODBC
|
||||
else
|
||||
diff -ur poco-1.3.6p2-all.orig//Makefile poco-1.3.6p2-all/Makefile
|
||||
--- poco-1.3.6p2-all.orig//Makefile 2010-07-19 13:52:31.908802377 +0200
|
||||
+++ poco-1.3.6p2-all/Makefile 2010-07-19 14:00:03.814676950 +0200
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
install: libexecs
|
||||
mkdir -p $(INSTALLDIR)/include/Poco
|
||||
- mkdir -p $(INSTALLDIR)/lib
|
||||
+ mkdir -p $(INSTALLDIR)/$(LIBDIR)
|
||||
mkdir -p $(INSTALLDIR)/bin
|
||||
for comp in $(COMPONENTS) ; do \
|
||||
if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
|
||||
@@ -41,11 +41,11 @@
|
||||
find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
|
||||
fi ; \
|
||||
done
|
||||
- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
|
||||
- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
|
||||
+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
|
||||
+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
|
||||
|
||||
-libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec
|
||||
-tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests
|
||||
+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
|
||||
+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
|
||||
samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples
|
||||
|
||||
.PHONY: $(libexecs)
|
||||
@ -0,0 +1,10 @@
|
||||
--- Foundation/Makefile 2012-01-23 15:12:27.000000000 +0100
|
||||
+++ Foundation/Makefile.new 2012-04-11 14:58:14.000000000 +0200
|
||||
@@ -43,7 +43,6 @@
|
||||
pcre_utf8_objects = pcre_ucd pcre_tables
|
||||
|
||||
ifdef POCO_UNBUNDLED
|
||||
- objects += $(pcre_utf8_objects)
|
||||
SYSLIBS += -lpcre -lz
|
||||
else
|
||||
objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
|
||||
@ -0,0 +1,119 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.4.3_p1.ebuild,v 1.2 2012/04/12 15:00:40 dev-zero Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils toolchain-funcs flag-o-matic versionator
|
||||
|
||||
MY_P="${P/_}"
|
||||
MY_DOCP="${PN}-$(get_version_component_range 1-3)-all-doc"
|
||||
|
||||
DESCRIPTION="C++ class libraries that simplify and accelerate the development of network-centric, portable applications."
|
||||
HOMEPAGE="http://pocoproject.org/"
|
||||
SRC_URI="mirror://sourceforge/poco/${MY_P}-all.tar.bz2
|
||||
doc? ( mirror://sourceforge/poco/${MY_DOCP}.zip )"
|
||||
LICENSE="Boost-1.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc examples iodbc mysql odbc sqlite ssl test"
|
||||
|
||||
DEPEND=">=dev-libs/libpcre-8.13
|
||||
dev-libs/expat
|
||||
sys-libs/zlib
|
||||
mysql? ( virtual/mysql )
|
||||
odbc? ( iodbc? ( dev-db/libiodbc )
|
||||
!iodbc? ( dev-db/unixODBC ) )
|
||||
ssl? ( dev-libs/openssl )
|
||||
sqlite? ( dev-db/sqlite:3 )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}-all"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PV}-gentoo.patch \
|
||||
"${FILESDIR}"/libpcre-8.13.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
targets="libexecs"
|
||||
odbc="unixodbc"
|
||||
|
||||
if use ssl; then
|
||||
targets="${targets} NetSSL_OpenSSL-libexec Crypto-libexec"
|
||||
echo NetSSL_OpenSSL >> components
|
||||
echo Crypto >> components
|
||||
fi
|
||||
if use odbc; then
|
||||
targets="${targets} Data/ODBC-libexec"
|
||||
echo Data/ODBC >> components
|
||||
if use iodbc; then
|
||||
append-flags "-I/usr/include/iodbc"
|
||||
odbc="iodbc"
|
||||
fi
|
||||
fi
|
||||
if use sqlite; then
|
||||
targets="${targets} Data/SQLite-libexec"
|
||||
echo Data/SQLite >> components
|
||||
fi
|
||||
if use mysql; then
|
||||
targets="${targets} Data/MySQL-libexec"
|
||||
echo Data/MySQL >> components
|
||||
fi
|
||||
|
||||
if use test; then
|
||||
targets="${targets} cppunit tests"
|
||||
echo CppUnit >> components
|
||||
use ssl && targets="${targets} NetSSL_OpenSSL-tests Crypto-tests"
|
||||
use odbc && targets="${targets} Data/ODBC-tests"
|
||||
use sqlite && targets="${targets} Data/SQLite-tests"
|
||||
use mysql && targets="${targets} Data/MySQL-tests"
|
||||
fi
|
||||
|
||||
local myconf
|
||||
use test || myconf="--no-tests"
|
||||
# not autoconf
|
||||
./configure \
|
||||
--no-samples ${myconf} \
|
||||
--prefix=/usr \
|
||||
--unbundled \
|
||||
|| die "configure failed"
|
||||
|
||||
sed -i \
|
||||
-e 's|-O2||g' \
|
||||
-e "s|CC = .*|CC = $(tc-getCC)|" \
|
||||
-e "s|CXX = .*|CXX = $(tc-getCXX)|" \
|
||||
-e "s|RANLIB = .*|RANLIB = $(tc-getRANLIB)|" \
|
||||
-e "s|LIB = ar|LIB = $(tc-getAR)|" \
|
||||
-e "s|STRIP = .*|STRIP = /bin/true|" \
|
||||
-e "s|CFLAGS = |CFLAGS = ${CFLAGS}|" \
|
||||
-e "s|CXXFLAGS = |CXXFLAGS = ${CXXFLAGS} |" \
|
||||
-e "s|LINKFLAGS =|LINKFLAGS = ${LDFLAGS} |" \
|
||||
-e "s|SHAREDOPT_LINK = -Wl,-rpath,\$(LIBPATH)|SHAREDOPT_LINK =|" \
|
||||
build/config/Linux build/config/FreeBSD || die "sed failed"
|
||||
sed -i -e "s|SHLIBFLAGS)|SHLIBFLAGS) ${LDFLAGS}|" build/rules/lib || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake POCO_PREFIX=/usr GENTOO_ODBC="${odbc}" LIBDIR="$(get_libdir)" ${targets} || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake POCO_PREFIX=/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "emake install failed"
|
||||
|
||||
dodoc CHANGELOG CONTRIBUTORS NEWS README
|
||||
|
||||
use doc && dohtml -r "${WORKDIR}/${MY_DOCP}"/*
|
||||
|
||||
if use examples ; then
|
||||
for d in Net XML Data Util NetSSL_OpenSSL Foundation ; do
|
||||
insinto /usr/share/doc/${PF}/examples/${d}
|
||||
doins -r ${d}/samples
|
||||
done
|
||||
find "${D}/usr/share/doc/${PF}/examples" \
|
||||
-iname "*.sln" -or -iname "*.vcproj" -or \
|
||||
-iname "*.vmsbuild" -or -iname "*.properties" \
|
||||
| xargs rm
|
||||
fi
|
||||
}
|
||||
@ -1,4 +1 @@
|
||||
DIST quazip-0.2.3.tar.gz 298712 RMD160 a648a37e965040d134c843bee15410bca2a5d12b SHA1 a091dcc3a4d57c2112bff65c2cac70f9f99fcded SHA256 355536fb47d822d705df5125db893f63eeae1148a45739786dbbfbafe9bad995
|
||||
DIST quazip-0.3.tar.gz 161359 RMD160 0ac2b821937688b0c32547721332f1a7b41ec468 SHA1 dbb08bf3edf0d81771b373e2154d4f258070277e SHA256 a947889b9cfa15458e6f57739fb53ec4e3d6ff2d264c52036906bfa1121549c8
|
||||
DIST quazip-0.4.3.tar.gz 268597 RMD160 04079ca71406814871b495fe0cf9348bc062a711 SHA1 c52e7d8ca1f667255636be4ad385d7dcfaa85454 SHA256 ef6353108149a11108087351f9f380b73b6cdc173be4f5442b9d0ae4fda5abad
|
||||
DIST quazip-0.4.4.tar.gz 301733 RMD160 d1119262e01ec4220e34ca293c5895f151624ef3 SHA1 0bd196856debfe4510a1efe35cca26b76668fb94 SHA256 63e8ffba784a4673bc3c340fa4df79e2980f6849ba9eea0a7cd52c3071deb0b6
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From f7d821a6837b4cc9defa02f271256796394fd8c3 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Wed, 21 Sep 2011 14:37:31 +0200
|
||||
Subject: [PATCH] Allow compilation with zlib-1.2.5.1-r1
|
||||
|
||||
---
|
||||
quazip/ioapi.h | 4 ++++
|
||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/quazip/ioapi.h b/quazip/ioapi.h
|
||||
index 716dd4b..a4ac8d7 100644
|
||||
--- a/quazip/ioapi.h
|
||||
+++ b/quazip/ioapi.h
|
||||
@@ -37,6 +37,10 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
+#ifndef OF
|
||||
+# define OF(x) x
|
||||
+#endif
|
||||
+
|
||||
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, voidpf file, int mode));
|
||||
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
||||
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
|
||||
--
|
||||
1.7.6.1
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.2.3.ebuild,v 1.4 2010/10/18 10:19:57 jlec Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit multilib qt4
|
||||
|
||||
DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
|
||||
HOMEPAGE="http://quazip.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="sys-libs/zlib
|
||||
x11-libs/qt-gui:4"
|
||||
|
||||
S=${WORKDIR}/${P}/${PN}
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e "s:/usr/local:/usr:" \
|
||||
-e "s:/lib:/$(get_libdir):" \
|
||||
${PN}.pro || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake4
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_ROOT="${D}" install || die
|
||||
dodoc ../{NEWS,README}
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.3.ebuild,v 1.1 2010/10/18 10:19:57 jlec Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit multilib qt4-r2
|
||||
|
||||
DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
|
||||
HOMEPAGE="http://quazip.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="sys-libs/zlib
|
||||
x11-libs/qt-gui:4"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}"/${P}/${PN}
|
||||
|
||||
DOCS="../NEWS ../README"
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e "s:/usr/local:${EPREFIX}/usr:" \
|
||||
-e "s:/lib:/$(get_libdir):" \
|
||||
${PN}.pro || die
|
||||
qt4-r2_src_prepare
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.4.3-r1.ebuild,v 1.7 2012/02/13 12:22:50 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
|
||||
HOMEPAGE="http://quazip.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
sys-libs/zlib
|
||||
x11-libs/qt-core:4"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}"/${P}
|
||||
|
||||
DOCS="NEWS README.txt"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-zlib.patch )
|
||||
@ -0,0 +1,76 @@
|
||||
Apply upstream changesets:
|
||||
https://bitbucket.org/agr/rope/changeset/1c100ebabc16
|
||||
https://bitbucket.org/agr/rope/changeset/f5eb880e0be2
|
||||
|
||||
to fix issues with python 2.7
|
||||
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=326401
|
||||
https://bitbucket.org/agr/rope/issue/8/
|
||||
|
||||
--- a/rope/base/ast.py
|
||||
+++ b/rope/base/ast.py
|
||||
@@ -27,6 +27,10 @@
|
||||
method_name = '_' + node.__class__.__name__
|
||||
method = getattr(walker, method_name, None)
|
||||
if method is not None:
|
||||
+ if isinstance(node, _ast.ImportFrom) and node.module is None:
|
||||
+ # In python < 2.7 ``node.module == ''`` for relative imports
|
||||
+ # but for python 2.7 it is None. Generalizing it to ''.
|
||||
+ node.module = ''
|
||||
return method(node)
|
||||
for child in get_child_nodes(node):
|
||||
walk(child, walker)
|
||||
--- a/rope/base/oi/runmod.py
|
||||
+++ b/rope/base/oi/runmod.py
|
||||
@@ -187,6 +187,7 @@
|
||||
|
||||
def close(self):
|
||||
self.sender.close()
|
||||
+ sys.settrace(None)
|
||||
|
||||
def _realpath(path):
|
||||
return os.path.realpath(os.path.abspath(os.path.expanduser(path)))
|
||||
--- a/rope/refactor/importutils/module_imports.py
|
||||
+++ b/rope/refactor/importutils/module_imports.py
|
||||
@@ -428,7 +428,8 @@
|
||||
if node.level:
|
||||
level = node.level
|
||||
import_info = importinfo.FromImport(
|
||||
- node.module, level, self._get_names(node.names))
|
||||
+ node.module or '', # see comment at rope.base.ast.walk
|
||||
+ level, self._get_names(node.names))
|
||||
start_line = node.lineno
|
||||
self.imports.append(importinfo.ImportStatement(
|
||||
import_info, node.lineno, end_line,
|
||||
--- a/rope/refactor/patchedast.py
|
||||
+++ b/rope/refactor/patchedast.py
|
||||
@@ -350,7 +350,8 @@
|
||||
children = ['from']
|
||||
if node.level:
|
||||
children.append('.' * node.level)
|
||||
- children.extend([node.module, 'import'])
|
||||
+ children.extend([node.module or '', # see comment at rope.base.ast.walk
|
||||
+ 'import'])
|
||||
children.extend(self._child_nodes(node.names, ','))
|
||||
self._handle(node, children)
|
||||
|
||||
--- a/ropetest/refactor/patchedasttest.py
|
||||
+++ b/ropetest/refactor/patchedasttest.py
|
||||
@@ -441,6 +441,17 @@
|
||||
'import', ' ', 'alias'])
|
||||
checker.check_children('alias', ['y', ' ', 'as', ' ', 'z'])
|
||||
|
||||
+ @testutils.run_only_for_25
|
||||
+ def test_from_node_relative_import(self):
|
||||
+ source = 'from . import y as z\n'
|
||||
+ ast = patchedast.get_patched_ast(source, True)
|
||||
+ checker = _ResultChecker(self, ast)
|
||||
+ checker.check_region('ImportFrom', 0, len(source) - 1)
|
||||
+ checker.check_children(
|
||||
+ 'ImportFrom', ['from', ' ', '.', '', '', ' ',
|
||||
+ 'import', ' ', 'alias'])
|
||||
+ checker.check_children('alias', ['y', ' ', 'as', ' ', 'z'])
|
||||
+
|
||||
def test_simple_gen_expr_node(self):
|
||||
source = 'zip(i for i in x)\n'
|
||||
ast = patchedast.get_patched_ast(source, True)
|
||||
@ -1,2 +1,3 @@
|
||||
DIST aisleriot-3.2.1.tar.xz 4319892 RMD160 35c52eb49e36cbd819080860d533e3dce62efe7e SHA1 aad4146b605fbc05122d221a5ebb69c06dd60ec3 SHA256 86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529
|
||||
DIST aisleriot-3.2.2.tar.xz 4324292 RMD160 49a0a23ababa4fe5efbc0d4fa87f736a58238c81 SHA1 cd99a7aebd917046a54f297883f93c4ae2a2f72f SHA256 818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca
|
||||
DIST aisleriot-3.2.3.1.tar.xz 4201044 RMD160 b422399fe25f93b4d6ce9edd504f67b3fa50b03b SHA1 70d2c3d092c11bc8b4a6ce602d247cdf7431b06e SHA256 75f6bb96bef4ef7c85577a792f0c086054252caafd994685d5ee2c947dbb9721
|
||||
|
||||
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/aisleriot-3.2.3.1.ebuild,v 1.1 2012/04/12 21:52:48 eva Exp $
|
||||
|
||||
EAPI="3"
|
||||
GNOME_TARBALL_SUFFIX="xz"
|
||||
GCONF_DEBUG="yes"
|
||||
|
||||
# make sure games is inherited first so that the gnome2
|
||||
# functions will be called if they are not overridden
|
||||
inherit eutils games gnome2
|
||||
|
||||
DESCRIPTION="A collection of solitaire card games for GNOME"
|
||||
HOMEPAGE="http://live.gnome.org/Aisleriot"
|
||||
|
||||
LICENSE="GPL-3 LGPL-3 FDL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="gnome"
|
||||
|
||||
# FIXME: quartz support?
|
||||
COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
|
||||
>=dev-scheme/guile-1.8.0:12[deprecated,regex]
|
||||
>=gnome-base/librsvg-2.32.0
|
||||
>=x11-libs/cairo-1.10.0
|
||||
x11-libs/gdk-pixbuf:2
|
||||
>=x11-libs/gtk+-3.0.0:3
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
>=media-libs/libcanberra-0.26[gtk3]
|
||||
gnome? ( >=gnome-base/gconf-2.0:2 )"
|
||||
# aisleriot was split off from gnome-games
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<gnome-extra/gnome-games-3.1.1[aisleriot]
|
||||
!<gnome-extra/gnome-games-3"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-util/intltool-0.40.4
|
||||
>=dev-util/pkgconfig-0.15
|
||||
sys-apps/lsb-release
|
||||
>=sys-devel/gettext-0.12
|
||||
gnome? (
|
||||
app-text/docbook-xml-dtd:4.3
|
||||
>=app-text/yelp-tools-3.1.1 )"
|
||||
|
||||
pkg_setup() {
|
||||
DOCS="AUTHORS ChangeLog TODO"
|
||||
|
||||
if use gnome; then
|
||||
G2CONF="${G2CONF} --with-platform=gnome --with-help-method=ghelp"
|
||||
else
|
||||
G2CONF="${G2CONF} --with-platform=gtk-only --with-help-method=library
|
||||
ITSTOOL=$(type -P true) XMLLINT=$(type -P true)"
|
||||
fi
|
||||
|
||||
G2CONF="${G2CONF}
|
||||
--with-gtk=3.0
|
||||
--with-smclient
|
||||
--with-guile=1.8
|
||||
--enable-sound
|
||||
--disable-schemas-compile
|
||||
--with-card-theme-formats=all
|
||||
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
|
||||
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_pkg_postinst
|
||||
|
||||
elog "Aisleriot can use additional card themes from games-board/pysolfc"
|
||||
elog "and kde-base/libkdegames."
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST qtads-2.1.1.tar.bz2 1260039 RMD160 9f6543616e9c8e8939289edeb70c833688cdb200 SHA1 20d2e52d204e619b800596393ef51c01621071c1 SHA256 d11b9525ace199506c862b5e00c69aaeb2da5fb0aa1e7df9572dd2b39ccdb0da
|
||||
DIST qtads-2.1.2.tar.bz2 1847714 RMD160 c2844f33403403f4d6f33ece40774ddb908a4a81 SHA1 fd2a92a42e37fe0c09f6deda5cd85cd18c2ac1d7 SHA256 6f21de499562eac4c36a5c3297fb56574deae334e62a1b1ee85dd8442fd3db97
|
||||
DIST qtads-2.1.3.tar.bz2 1848787 RMD160 855f53414f9b1d4502e8d82da8aff8d38ccdcab0 SHA1 d5678f227b44025569ae7d599fe7a4503646e488 SHA256 6f7a9fafd7d6cb91ea276a7929f3a2def78f04092dd89d5cde8b8d4b1765856f
|
||||
|
||||
@ -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/qtads/qtads-2.1.2.ebuild,v 1.1 2012/02/02 17:17:54 mr_bones_ Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-engines/qtads/qtads-2.1.3.ebuild,v 1.1 2012/04/12 17:53:10 mr_bones_ Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit eutils qt4-r2 games
|
||||
@ -1 +1 @@
|
||||
DIST gfifteen-1.0.tar.gz 524994 RMD160 10b3214eeb9a1576955385da1196b8396a86fbae SHA1 ddae3d0bbd91d93fcbde2a7f153e83f0f0b09ea2 SHA256 acbf0d4f4414e76d3113b000f9347362bd1a8a85a16c8e9e16a7bfe2beb50138
|
||||
DIST gfifteen-1.0.1.tar.gz 525127 RMD160 f54c375f0f0e84afef31c2c3693322153cca1587 SHA1 d62683fab72007efd4e2c3dd29715f45fff29287 SHA256 8ab80a5cc2f8a3c396f0c182eac892e64eb850e11119724b394990615472d870
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST GConf-2.32.3.tar.bz2 1558681 RMD160 d491165a58dd658987730aeebfdbf70f8b7c93d6 SHA1 efc7d451c5988207f708b75c01d1d228ba3deed6 SHA256 63e249d16b1b50820e9c32f1d85ff2c94498afdd45544fa5f37b8e1d084c5bae
|
||||
DIST GConf-2.32.4.tar.xz 1326600 RMD160 d17c34f41179e8273ad05a5af3eb8207684f1fc6 SHA1 ff48bf293c59140f6bc585f2b036033c668fc38b SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025
|
||||
DIST GConf-3.2.3.tar.xz 1535476 RMD160 93b381dcf7879efd8bac52c6edb76e20ec15c13f SHA1 dfa87a2df31f87ce9370bd38a1790827892a77be SHA256 9eb55dd1d009b6eba9c32e3fae87d3aa45a33629a5e2031ed9f5acb05efaa149
|
||||
DIST GConf-3.2.5.tar.xz 1525188 RMD160 8486d5c38548f581dddfcf575a7a32145795da9c SHA1 340b3cb634ef64f0c31af9d971d4f3da95d1787c SHA256 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6
|
||||
|
||||
@ -0,0 +1 @@
|
||||
DIST gnome-disk-utility-3.0.2.tar.xz 2002052 RMD160 7355f13be7c67f10f3fb337cccfe8bea7ec2e36d SHA1 61718232756657542c89a0b3355a4fdee78b7ffd SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5
|
||||
@ -0,0 +1,263 @@
|
||||
From b18ee6b0ee74e10056460b7107e7dd8f2d39dd8e Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Thu, 12 Apr 2012 02:56:40 -0400
|
||||
Subject: [PATCH] Split palimpsest and nautilus plugin out
|
||||
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
configure.ac | 53 +---------------------------------------
|
||||
data/Makefile.am | 6 ----
|
||||
data/icons/16x16/Makefile.am | 1 -
|
||||
data/icons/22x22/Makefile.am | 1 -
|
||||
data/icons/24x24/Makefile.am | 1 -
|
||||
data/icons/256x256/Makefile.am | 1 -
|
||||
data/icons/32x32/Makefile.am | 1 -
|
||||
data/icons/48x48/Makefile.am | 1 -
|
||||
src/Makefile.am | 6 +----
|
||||
10 files changed, 3 insertions(+), 70 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 4fd5718..7b5b3ae 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
-SUBDIRS = src data doc help po
|
||||
+SUBDIRS = src data doc po
|
||||
|
||||
EXTRA_DIST = \
|
||||
autogen.sh \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 77a16ab..c785122 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -129,7 +129,6 @@ GIO2_REQUIRED=2.22
|
||||
DBUS_GLIB_REQUIRED=0.74
|
||||
GNOME_KEYRING_REQUIRED=2.22
|
||||
GTK3_REQUIRED=2.90.7
|
||||
-UNIQUE_REQUIRED=2.90.1
|
||||
LIBNOTIFY_REQUIRED=0.6.1
|
||||
NAUTILUS_REQUIRED=2.91.0
|
||||
AVAHI_UI_REQUIRED=0.6.25
|
||||
@@ -147,25 +146,12 @@ PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED])
|
||||
PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED])
|
||||
PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
|
||||
PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
|
||||
-PKG_CHECK_MODULES(UNIQUE, [unique-3.0 >= $UNIQUE_REQUIRED])
|
||||
PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
|
||||
PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
|
||||
-PKG_CHECK_MODULES(X11, [x11])
|
||||
PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
|
||||
PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED])
|
||||
|
||||
# *************
|
||||
-# Remote Access
|
||||
-# *************
|
||||
-have_remote_access=no
|
||||
-AC_ARG_ENABLE(remote_access, AS_HELP_STRING([--disable-remote-access], [disable access to remote udisks daemons]))
|
||||
-if test "x$enable_remote_access" != "xno"; then
|
||||
- AC_DEFINE(HAVE_REMOTE_ACCESS, 1, [Defined if remote access is enabled])
|
||||
- have_remote_access=yes
|
||||
-fi
|
||||
-AM_CONDITIONAL(HAVE_REMOTE_ACCESS, [test "$have_remote_access" = "yes"])
|
||||
-
|
||||
-# *************
|
||||
# GNOME Keyring
|
||||
# *************
|
||||
|
||||
@@ -185,48 +171,17 @@ AC_SUBST(GNOME_KEYRING_LIBS)
|
||||
AC_SUBST(GNOME_KEYRING_CFLAGS)
|
||||
AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"])
|
||||
|
||||
-# *************
|
||||
-# Documentation
|
||||
-# *************
|
||||
-
|
||||
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
|
||||
-if test x$SCROLLKEEPER_CONFIG = xno; then
|
||||
- AC_MSG_ERROR(Could not find scrollkeeper-config, please install the scrollkeeper package)
|
||||
-fi
|
||||
-
|
||||
# ********************
|
||||
# Internationalization
|
||||
# ********************
|
||||
|
||||
IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED])
|
||||
|
||||
-GETTEXT_PACKAGE=gnome-disk-utility
|
||||
+GETTEXT_PACKAGE=libgdu
|
||||
AC_SUBST([GETTEXT_PACKAGE])
|
||||
AM_GLIB_GNU_GETTEXT
|
||||
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
|
||||
|
||||
-# ******************
|
||||
-# Nautilus extension
|
||||
-# ******************
|
||||
-
|
||||
-have_nautilus=no
|
||||
-AC_ARG_ENABLE(nautilus, AS_HELP_STRING([--disable-nautilus], [disable nautilus extension]))
|
||||
-
|
||||
-if test "x$enable_nautilus" != "xno"; then
|
||||
- PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED,
|
||||
- [AC_DEFINE(HAVE_NAUTILUS, 1, [Define if nautilus is available])
|
||||
- have_nautilus=yes], have_nautilus=no)
|
||||
- if test "x$have_nautilus" = xno -a "x$enable_nautilus" = xyes; then
|
||||
- AC_MSG_ERROR([nautilus support requested but libraries not found])
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-AC_SUBST(NAUTILUS_LIBS)
|
||||
-AC_SUBST(NAUTILUS_CFLAGS)
|
||||
-AC_SUBST(NAUTILUS_EXTENSION_DIR)
|
||||
-
|
||||
-AM_CONDITIONAL(ENABLE_NAUTILUS, [test "$have_nautilus" = "yes"])
|
||||
-
|
||||
# *************************************
|
||||
# *************************************
|
||||
|
||||
@@ -242,10 +197,7 @@ src/gdu/Makefile
|
||||
src/gdu/gdu.pc
|
||||
src/gdu-gtk/Makefile
|
||||
src/gdu-gtk/gdu-gtk.pc
|
||||
-src/palimpsest/Makefile
|
||||
src/notification/Makefile
|
||||
-src/format-tool/Makefile
|
||||
-src/nautilus-extension/Makefile
|
||||
po/Makefile.in
|
||||
data/Makefile
|
||||
data/gdu-notification-daemon.desktop.in.in
|
||||
@@ -257,7 +209,6 @@ data/icons/32x32/Makefile
|
||||
data/icons/48x48/Makefile
|
||||
data/icons/256x256/Makefile
|
||||
data/icons/scalable/Makefile
|
||||
-help/Makefile
|
||||
doc/Makefile
|
||||
doc/version.xml
|
||||
])
|
||||
@@ -283,8 +234,6 @@ echo "
|
||||
|
||||
Maintainer mode: ${USE_MAINTAINER_MODE}
|
||||
Building api docs: ${enable_gtk_doc}
|
||||
- Nautilus extension: ${have_nautilus}
|
||||
|
||||
GNOME Keyring support: ${have_gnome_keyring}
|
||||
- Remote Access: ${have_remote_access}
|
||||
"
|
||||
diff --git a/data/Makefile.am b/data/Makefile.am
|
||||
index 785368d..631be17 100644
|
||||
--- a/data/Makefile.am
|
||||
+++ b/data/Makefile.am
|
||||
@@ -2,10 +2,6 @@ NULL =
|
||||
|
||||
SUBDIRS = icons
|
||||
|
||||
-desktopdir = $(datadir)/applications
|
||||
-desktop_in_files = palimpsest.desktop.in
|
||||
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
||||
-
|
||||
autostartdir = $(sysconfdir)/xdg/autostart
|
||||
autostart_in_files = gdu-notification-daemon.desktop.in
|
||||
autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
|
||||
@@ -18,12 +14,10 @@ gdu-notification-daemon.desktop.in: gdu-notification-daemon.desktop.in.in
|
||||
distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
|
||||
|
||||
EXTRA_DIST = \
|
||||
- $(desktop_in_files) \
|
||||
$(autostart_in_files) \
|
||||
$(NULL)
|
||||
|
||||
CLEANFILES = \
|
||||
- $(desktop_DATA) \
|
||||
$(autostart_DATA) \
|
||||
gdu-notification-daemon.desktop.in \
|
||||
gdu-notification-daemon.desktop.in.in \
|
||||
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
|
||||
index f62ef2d..324b5be 100644
|
||||
--- a/data/icons/16x16/Makefile.am
|
||||
+++ b/data/icons/16x16/Makefile.am
|
||||
@@ -2,7 +2,6 @@ NULL =
|
||||
|
||||
icondir = $(datadir)/icons/hicolor/16x16/apps
|
||||
icon_DATA = \
|
||||
- palimpsest.png \
|
||||
gdu-eject.png \
|
||||
gdu-detach.png \
|
||||
gdu-mount.png \
|
||||
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
|
||||
index c0b4c4d..b56491d 100644
|
||||
--- a/data/icons/22x22/Makefile.am
|
||||
+++ b/data/icons/22x22/Makefile.am
|
||||
@@ -2,7 +2,6 @@ NULL =
|
||||
|
||||
icondir = $(datadir)/icons/hicolor/22x22/apps
|
||||
icon_DATA = \
|
||||
- palimpsest.png \
|
||||
gdu-eject.png \
|
||||
gdu-detach.png \
|
||||
gdu-mount.png \
|
||||
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
|
||||
index 4dc6898..d465ffe 100644
|
||||
--- a/data/icons/24x24/Makefile.am
|
||||
+++ b/data/icons/24x24/Makefile.am
|
||||
@@ -5,7 +5,6 @@ NULL =
|
||||
|
||||
icondir = $(datadir)/icons/hicolor/24x24/apps
|
||||
icon_DATA = \
|
||||
- palimpsest.png \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST = \
|
||||
diff --git a/data/icons/256x256/Makefile.am b/data/icons/256x256/Makefile.am
|
||||
index dc7e73a..14c8dea 100644
|
||||
--- a/data/icons/256x256/Makefile.am
|
||||
+++ b/data/icons/256x256/Makefile.am
|
||||
@@ -2,7 +2,6 @@ NULL =
|
||||
|
||||
icondir = $(datadir)/icons/hicolor/256x256/apps
|
||||
icon_DATA = \
|
||||
- palimpsest.png \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST = \
|
||||
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
|
||||
index 9a2bc76..ad18728 100644
|
||||
--- a/data/icons/32x32/Makefile.am
|
||||
+++ b/data/icons/32x32/Makefile.am
|
||||
@@ -2,7 +2,6 @@ NULL =
|
||||
|
||||
icondir = $(datadir)/icons/hicolor/32x32/apps
|
||||
icon_DATA = \
|
||||
- palimpsest.png \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST = \
|
||||
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
|
||||
index 349b8ce..c3164be 100644
|
||||
--- a/data/icons/48x48/Makefile.am
|
||||
+++ b/data/icons/48x48/Makefile.am
|
||||
@@ -2,7 +2,6 @@ NULL =
|
||||
|
||||
icondir = $(datadir)/icons/hicolor/48x48/apps
|
||||
icon_DATA = \
|
||||
- palimpsest.png \
|
||||
gdu-eject.png \
|
||||
gdu-detach.png \
|
||||
gdu-mount.png \
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index bab902f..19667a8 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -1,8 +1,4 @@
|
||||
-SUBDIRS = gdu gdu-gtk palimpsest notification format-tool
|
||||
-
|
||||
-if ENABLE_NAUTILUS
|
||||
-SUBDIRS += nautilus-extension
|
||||
-endif
|
||||
+SUBDIRS = gdu gdu-gtk notification
|
||||
|
||||
clean-local :
|
||||
rm -f *~
|
||||
--
|
||||
1.7.8.5
|
||||
|
||||
@ -0,0 +1,92 @@
|
||||
From 518716ca99ce82bcf6732e1a69c9d19b878f48ea Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Thu, 12 Apr 2012 03:13:25 -0400
|
||||
Subject: [PATCH] Make avahi support optional
|
||||
|
||||
---
|
||||
configure.ac | 21 ++++++++++++++++++++-
|
||||
src/gdu-gtk/gdu-connect-to-server-dialog.c | 7 +++++++
|
||||
2 files changed, 27 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7dc3630..aa487fc 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -149,7 +149,26 @@ PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
|
||||
PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
|
||||
PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
|
||||
PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
|
||||
-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED])
|
||||
+
|
||||
+# *************
|
||||
+# Avahi
|
||||
+# *************
|
||||
+
|
||||
+have_avahi_ui=no
|
||||
+AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi-ui], [disable use of Avahi for server searching]))
|
||||
+
|
||||
+if test "x$enable_avahi_ui" != "xno"; then
|
||||
+ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED,
|
||||
+ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui-gtk3 is available])
|
||||
+ have_avahi_ui=yes], have_avahi_ui=no)
|
||||
+ if test "x$have_avahi_ui" = xno -a "x$enable_avahi_ui" = xyes; then
|
||||
+ AC_MSG_ERROR([avahi-ui-gtk3 support requested but libraries not found])
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
+AC_SUBST(AVAHI_UI_LIBS)
|
||||
+AC_SUBST(AVAHI_UI_CFLAGS)
|
||||
+AM_CONDITIONAL(ENABLE_AVAHI_UI, [test "$have_avahi_ui" = "yes"])
|
||||
|
||||
# *************
|
||||
# GNOME Keyring
|
||||
diff --git a/src/gdu-gtk/gdu-connect-to-server-dialog.c b/src/gdu-gtk/gdu-connect-to-server-dialog.c
|
||||
index e4c1a83..a715bb7 100644
|
||||
--- a/src/gdu-gtk/gdu-connect-to-server-dialog.c
|
||||
+++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c
|
||||
@@ -24,7 +24,10 @@
|
||||
|
||||
#include "config.h"
|
||||
#include <glib/gi18n-lib.h>
|
||||
+
|
||||
+#ifdef HAVE_AVAHI_UI
|
||||
#include <avahi-ui/avahi-ui.h>
|
||||
+#endif
|
||||
|
||||
#include "gdu-connect-to-server-dialog.h"
|
||||
|
||||
@@ -143,6 +146,7 @@ gdu_connect_to_server_dialog_get_address (GduConnectToServerDialog *dialog)
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------------- */
|
||||
|
||||
+#ifdef HAVE_AVAHI_UI
|
||||
static void
|
||||
on_dns_sd_clicked (GtkButton *button,
|
||||
gpointer user_data)
|
||||
@@ -171,6 +175,7 @@ on_dns_sd_clicked (GtkButton *button,
|
||||
|
||||
gtk_widget_destroy (service_dialog);
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------------- */
|
||||
|
||||
@@ -217,6 +222,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
|
||||
GTK_STOCK_CONNECT,
|
||||
GTK_RESPONSE_OK);
|
||||
|
||||
+#ifdef HAVE_AVAHI_UI
|
||||
button = gtk_button_new_with_mnemonic (_("_Browse..."));
|
||||
image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON);
|
||||
gtk_button_set_image (GTK_BUTTON (button), image);
|
||||
@@ -234,6 +240,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
|
||||
"clicked",
|
||||
G_CALLBACK (on_dns_sd_clicked),
|
||||
dialog);
|
||||
+#endif
|
||||
|
||||
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
|
||||
|
||||
--
|
||||
1.7.8.5
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgdu/libgdu-3.0.2.ebuild,v 1.1 2012/04/12 09:24:02 tetromino Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
GNOME_ORG_MODULE="gnome-disk-utility"
|
||||
|
||||
inherit autotools eutils gnome2
|
||||
|
||||
DESCRIPTION="GNOME Disk Utility libraries"
|
||||
HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="avahi doc gnome-keyring"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
|
||||
CDEPEND="
|
||||
>=dev-libs/glib-2.22:2
|
||||
>=dev-libs/dbus-glib-0.74
|
||||
>=x11-libs/gtk+-2.90.7:3
|
||||
=sys-fs/udisks-1.0*:0
|
||||
>=dev-libs/libatasmart-0.14
|
||||
>=x11-libs/libnotify-0.6.1
|
||||
|
||||
avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
|
||||
gnome-keyring? ( gnome-base/libgnome-keyring )
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
!<=sys-apps/gnome-disk-utility-3.0.2-r200
|
||||
!=sys-apps/gnome-disk-utility-3.0.2-r300"
|
||||
# libgdu was part of gnome-disk-utility until 3.0.2-r{200,300}
|
||||
DEPEND="${CDEPEND}
|
||||
sys-devel/gettext
|
||||
gnome-base/gnome-common
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/gnome-doc-utils
|
||||
|
||||
>=dev-util/pkgconfig-0.9
|
||||
>=dev-util/intltool-0.35
|
||||
>=dev-util/gtk-doc-am-1.13
|
||||
|
||||
doc? ( >=dev-util/gtk-doc-1.3 )"
|
||||
|
||||
pkg_setup() {
|
||||
G2CONF="${G2CONF}
|
||||
--disable-static
|
||||
$(use_enable avahi avahi-ui)
|
||||
$(use_enable gnome-keyring)"
|
||||
DOCS="AUTHORS NEWS README TODO"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local f=data/gdu-notification-daemon.desktop.in.in.in
|
||||
sed -i -e '/^OnlyShowIn/d' ${f} || die
|
||||
echo 'NotShowIn=KDE;' >> ${f}
|
||||
|
||||
# Palimpsest and Nautilus plugin are provided by sys-apps/gnome-disk-utility
|
||||
epatch "${FILESDIR}/${PN}-3.0.2-no-palimpsest-nautilus.patch"
|
||||
|
||||
# Keep avahi optional, upstream bug #631986
|
||||
epatch "${FILESDIR}/${PN}-3.0.2-optional-avahi.patch"
|
||||
intltoolize --force --copy --automake || die
|
||||
eautoreconf
|
||||
|
||||
gnome2_src_prepare
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>games</herd>
|
||||
<herd>gnome</herd>
|
||||
</pkgmetadata>
|
||||
@ -1,4 +1,3 @@
|
||||
DIST drwright-0.17.tar.bz2 261762 RMD160 e94d4ac0fdca80831766bc242502e9d693e2509f SHA1 dbf75a2adc97fe1ae615a2889420d20ffe4ec2ff SHA256 931529384d58a3493f172cae8416367e01a840cdd624b089901f7e7232582e58
|
||||
DIST drwright-3.2.2.tar.xz 1449476 RMD160 23255a876f05371145e08d8d6fdb953d99c83a69 SHA1 4a63549b5f10b8df2057f4f42fd13069ea6022a0 SHA256 a4869eb3d4798f1c23d4f93572c999f98d2e8a9edf55ffba17a378de216299a7
|
||||
DIST drwright-3.2.3.tar.xz 1450508 RMD160 099341923c5154ce0335b074df19736d58c2dc3b SHA1 6ca0f217263e1c2cb550315765f4b5dfb3e55c68 SHA256 a28887c3934085cd21e96d7ee346631b542eef3c7feb73ef73a8bc526b7d0065
|
||||
DIST drwright-3.2.4.tar.xz 1450664 RMD160 55703593f507b1fd677164eca65241180df9dde7 SHA1 db1bffed230dfe8ded7384116a64e158c4e4caf4 SHA256 afcdbb83b38ff8c973710274a8b262657a54c81745023a40b9cc3a0281d9d220
|
||||
DIST drwright-3.2.5.tar.xz 1451424 RMD160 eb122db5a3a24e06659542141f74709b5d5789a9 SHA1 1e1cffe3a46fe87b4f2e1a475bbdbf4bf4abb3d9 SHA256 fc0c8bfc87ee35eb9b5768dd32736747cf4a7aeda4ea86e813b46261a30616f8
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/drwright-3.2.2.ebuild,v 1.2 2012/02/13 23:11:15 tetromino Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
|
||||
inherit gnome2
|
||||
|
||||
DESCRIPTION="A GNOME 3 tool that forces you to take regular breaks to prevent RSI"
|
||||
HOMEPAGE="http://git.gnome.org/browse/drwright"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.26.0:2
|
||||
>=x11-libs/gtk+-3.0.0:3
|
||||
>=gnome-base/gnome-settings-daemon-2.91.8
|
||||
>=gnome-base/gnome-control-center-3.2
|
||||
>=x11-libs/libnotify-0.7
|
||||
media-libs/libcanberra[gtk3]
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXScrnSaver
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
x11-proto/scrnsaverproto
|
||||
sys-devel/gettext
|
||||
>=dev-util/intltool-0.35.0
|
||||
>=dev-util/pkgconfig-0.12.0
|
||||
|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
DOCS="AUTHORS ChangeLog NEWS"
|
||||
G2CONF="${G2CONF} --disable-static"
|
||||
}
|
||||
@ -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/gnome-extra/drwright/drwright-3.2.3.ebuild,v 1.2 2012/02/13 23:11:15 tetromino Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/drwright-3.2.5.ebuild,v 1.1 2012/04/12 20:18:40 eva Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
@ -1,2 +1,3 @@
|
||||
DIST nautilus-sendto-2.32.0.tar.bz2 446731 RMD160 3ef5fcaac94de0bf7411dc4b74722472e7c316a2 SHA1 d02d13896bbb6ea4ee358401359b1c51eaa5c898 SHA256 890090b24381d91f079610d5454cb786a3ecefc91fa06649b2222be9bb02269a
|
||||
DIST nautilus-sendto-3.0.1.tar.xz 376892 RMD160 d1fb9824e3682aa7dd3d85e3f55865ab114a04a4 SHA1 dfe6189ad7a02b88f50dd37cb5b2a4eba7d28c2e SHA256 34617084b731db8bf3ffb517497d5645283f4aa7a9ebfa2a05da8c12066a0f14
|
||||
DIST nautilus-sendto-3.0.2.tar.xz 377344 RMD160 82d0c67612094773915799065d6e419ec5e73b1c SHA1 f2227d34c140f47684ea6ba7c0e814984d6baf34 SHA256 03265d7063212717773bd6a1f85c25ec24066ca8424b658c5fa30ec0fb074b44
|
||||
|
||||
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild,v 1.1 2012/04/13 03:18:49 tetromino Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="yes"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
|
||||
inherit eutils gnome2 multilib
|
||||
|
||||
DESCRIPTION="A nautilus extension for sending files to locations"
|
||||
HOMEPAGE="http://www.gnome.org"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="cdr doc gajim +mail pidgin upnp"
|
||||
|
||||
COMMON_DEPEND=">=x11-libs/gtk+-2.90.3:3[X(+)]
|
||||
>=dev-libs/glib-2.25.9:2
|
||||
cdr? ( >=app-cdr/brasero-2.26.0[nautilus] )
|
||||
gajim? (
|
||||
net-im/gajim
|
||||
>=dev-libs/dbus-glib-0.60 )
|
||||
mail? ( >=gnome-extra/evolution-data-server-3 )
|
||||
pidgin? (
|
||||
>=net-im/pidgin-2.0.0
|
||||
>=dev-libs/dbus-glib-0.60 )
|
||||
upnp? ( >=net-libs/gupnp-0.13.0 )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=gnome-base/nautilus-2.91.1[sendto]"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=gnome-base/nautilus-2.91.1
|
||||
sys-devel/gettext
|
||||
>=dev-util/pkgconfig-0.19
|
||||
>=dev-util/intltool-0.35
|
||||
doc? ( >=dev-util/gtk-doc-1.9 )"
|
||||
# Needed for eautoreconf
|
||||
# >=gnome-base/gnome-common-0.12
|
||||
# dev-util/gtk-doc-am
|
||||
|
||||
_use_plugin() {
|
||||
if use ${1}; then
|
||||
G2CONF="${G2CONF}${2:-"${1}"},"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
DOCS="AUTHORS ChangeLog NEWS README"
|
||||
G2CONF="${G2CONF}
|
||||
--with-plugins=removable-devices,"
|
||||
_use_plugin cdr nautilus-burn
|
||||
_use_plugin mail evolution
|
||||
_use_plugin pidgin
|
||||
_use_plugin gajim
|
||||
_use_plugin upnp
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Regenerate marshaler code for <glib-2.31 compatibility
|
||||
rm -v src/plugins/evolution/econtactentry-marshal.{c,h} || die
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
|
||||
# Prevent file collision with nautilus-3 (which installs its own copy of
|
||||
# libnautilus-sendto.so)
|
||||
rm -r "${ED}/usr/$(get_libdir)/nautilus/extensions-"*
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
diff --git a/kdm/ConfigureChecks.cmake b/kdm/ConfigureChecks.cmake
|
||||
index 0f969f73780e0b45edcb894084e0a3aaa8f72d69..cc2e37a7e5f56ba06040f85e0ded4258b6feb958 100644
|
||||
--- a/kdm/ConfigureChecks.cmake
|
||||
+++ b/kdm/ConfigureChecks.cmake
|
||||
@@ -170,6 +170,11 @@ if (KDE4_KRB5AUTH)
|
||||
Due to a problem with X includes you probably have to run \"ln -s . krb5\"
|
||||
in the directory where the krb5.h include resides to make things actually work.")
|
||||
endif (KRB5_INCLUDE_DIR)
|
||||
+ find_library(COMERR_LIBRARY com_err)
|
||||
+ if (NOT COMERR_LIBRARY)
|
||||
+ message(FATAL_ERROR "Kerberos5 support is enabled, but required libcomerr
|
||||
+could not be found.")
|
||||
+ endif (NOT COMERR_LIBRARY)
|
||||
endif (KRB5_LIBRARIES)
|
||||
mark_as_advanced(KRB5_INCLUDE_DIR KRB5_LIBRARIES)
|
||||
macro_bool_to_01(KRB5AUTH_FOUND K5AUTH)
|
||||
diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt
|
||||
index e94a3b9c68b0da0b5f2ef794e2e67cc7f4c3db5f..25f383f3148a1369d63cf0150ae8c63bb95d7790 100644
|
||||
--- a/kdm/backend/CMakeLists.txt
|
||||
+++ b/kdm/backend/CMakeLists.txt
|
||||
@@ -56,6 +56,7 @@ target_link_libraries( kdm
|
||||
${S_LIBRARIES}
|
||||
${KRB4_LIBRARIES}
|
||||
${KRB5_LIBRARIES}
|
||||
+ ${COMERR_LIBRARY}
|
||||
${NSL_LIBRARIES}
|
||||
${RESOLV_LIBRARIES}
|
||||
${SOCKET_LIBRARIES}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST umeplus-fonts-20090604.tar.bz2 5249681 RMD160 4fb72b2d17c78dc4778cdf5a19fe30d70dd1cf0b SHA1 89882cfe16e49bb6d20f4eb03d874931106b847f SHA256 d3220dc7eb4e44f5cc06ef42b3fe807de957e2c6109be7c7ab374a26b12ab4a3
|
||||
DIST umeplus-fonts-20090918a.tar.bz2 4972172 RMD160 4f59045d0db3385a59e189451f6798a6fdbe92eb SHA1 f08145756e396d6ef4f6e2deabbd4b744265fded SHA256 f45c204815ce140e81e26936c0c613cc6ad396a16a7acc8a9c7b8e0443875748
|
||||
DIST umeplus-fonts-20100106.tar.bz2 4924525 RMD160 a94dba207d1fb9999582c121457a5e8e5c08ff6e SHA1 2167f5de7bd997de6e86732a595957c4dcf49039 SHA256 85a7a29548729c2596c84fea8c557a27aba5fdf58e1d3abbe74e97ee85ca87c9
|
||||
DIST umeplus-fonts-20120403.tar.lzma 2048487 RMD160 7d505b0be9dea5ff9f8049bc07bc4fb4cb2094da SHA1 16f209f00d4cbb53aeb639975c32b174b2f10023 SHA256 0415137b5c10cfe76953ddc880367fe4801abe94a1193872107441a9efc084bc
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20120403.ebuild,v 1.1 2012/04/12 12:03:54 naota Exp $
|
||||
|
||||
inherit font
|
||||
|
||||
DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
|
||||
HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
|
||||
SRC_URI="mirror://sourceforge/mdk-ut/${P}.tar.lzma"
|
||||
|
||||
LICENSE="as-is mplus-fonts"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
# Only installs fonts
|
||||
RESTRICT="strip binchecks"
|
||||
|
||||
FONT_S="${S}"
|
||||
|
||||
FONT_SUFFIX="ttf"
|
||||
DOCS="ChangeLog README"
|
||||
@ -0,0 +1,54 @@
|
||||
http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2012-March/001672.html
|
||||
|
||||
use pkg-config for libdvdread by default rather than the ugly xxx-config scripts
|
||||
|
||||
https://bugs.gentoo.org/410189
|
||||
|
||||
hassle vapier@gentoo.org if this causes issues
|
||||
|
||||
--- configure.ac (revision 1243)
|
||||
+++ configure.ac (working copy)
|
||||
@@ -89,6 +89,7 @@ AC_PROG_CC
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
+PKG_PROG_PKG_CONFIG
|
||||
|
||||
dnl --------------------------------------------------------------
|
||||
dnl Libtool
|
||||
@@ -185,15 +186,26 @@ AC_ARG_WITH([dvdread-config],
|
||||
[AS_HELP_STRING([--with-dvdread-config=PROG],
|
||||
[dvdread-config program to use @<:@default=from PATH@:>@])],
|
||||
[DVDREAD_CONFIG="$withval"],
|
||||
- [dnl User didn't specify program, search PATH
|
||||
- AC_PATH_PROG([DVDREAD_CONFIG], [dvdread-config], [no])
|
||||
- test "x$DVDREAD_CONFIG" = xno && \
|
||||
- AC_MSG_ERROR([dvdread-config required to link with libdvdread])
|
||||
- ])
|
||||
-DVDREAD_CFLAGS=`$DVDREAD_CONFIG --cflags` || \
|
||||
- AC_MSG_ERROR([Could not get libdvdread CFLAGS from $DVDREAD_CONFIG])
|
||||
-DVDREAD_LIBS=`$DVDREAD_CONFIG --libs` || \
|
||||
- AC_MSG_ERROR([Could not get libdvdread LIBS from $DVDREAD_CONFIG])
|
||||
+ [DVDREAD_CONFIG=""])
|
||||
+
|
||||
+dnl by default, search pkg-config, and then fall back to dvdread-config
|
||||
+DVDREAD_PKG_CONFIG="no"
|
||||
+if test "x$DVDREAD_CONFIG" = "x"; then
|
||||
+ PKG_CHECK_MODULES([DVDREAD], [dvdread],
|
||||
+ [DVDREAD_PKG_CONFIG="yes"],
|
||||
+ [dnl User didn't specify program, search PATH
|
||||
+ AC_PATH_PROG([DVDREAD_CONFIG], [dvdread-config], [no])
|
||||
+ test "x$DVDREAD_CONFIG" = xno && \
|
||||
+ AC_MSG_ERROR([dvdread-config required to link with libdvdread])
|
||||
+ ])
|
||||
+fi
|
||||
+if test "x$DVDREAD_PKG_CONFIG" != "xyes"; then
|
||||
+ DVDREAD_CFLAGS=`$DVDREAD_CONFIG --cflags` || \
|
||||
+ AC_MSG_ERROR([Could not get libdvdread CFLAGS from $DVDREAD_CONFIG])
|
||||
+ DVDREAD_LIBS=`$DVDREAD_CONFIG --libs` || \
|
||||
+ AC_MSG_ERROR([Could not get libdvdread LIBS from $DVDREAD_CONFIG])
|
||||
+fi
|
||||
+
|
||||
AC_SUBST([DVDREAD_CFLAGS])
|
||||
AC_SUBST([DVDREAD_LIBS])
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue