parent
96edcce9cc
commit
c0782cccf5
@ -1 +1,2 @@
|
||||
DIST eselect-gnome-shell-extensions-20111211.tar.xz 2784 SHA256 020eee06656becc0b03b1f9b13cc653e64db344383e69c8502cd6e9803ddd30a SHA512 048f43f509351c58c60858f4169f4075e8033cedcfdf3be0a020c0b09cce83b1379e7a451e76be234cd7c6d767be22f73d8ee0580fd21f9264f4d37e8f8cb0d0 WHIRLPOOL a55f51d9f62706b319bf62feb9ea90a52005a0f4a13d244101f842bb7d3805c9c8efab73f754311ffd9c04550b0c50df6555f0962205957abde86d2050db0553
|
||||
DIST eselect-gnome-shell-extensions-20120911.tar.xz 2792 SHA256 1f763aab3a80f85805ad5ed30010cf0c26afb7ad3b81c4f698662ad3e33bf91c SHA512 da54e2a0b74f3e8f8eaa26b1858d26c56fbaa398ec54b079f504377a4079df19ff52485991a9ea153f92c93a9fe871d70c3c2b841bad4b8dba402ad83c9297e2 WHIRLPOOL abdfea55dd0c2429900e17919bab21ed5893e44a41dba152ae3c093e14bdc2d2695551a193d77c86753c623466b6bd46beb51323900ebdb3351b7b756a31b9fe
|
||||
|
@ -0,0 +1,50 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20120911.ebuild,v 1.1 2012/09/11 18:39:47 tetromino Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
DESCRIPTION="Manages system defaults for GNOME Shell extensions"
|
||||
HOMEPAGE="http://www.gentoo.org"
|
||||
SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
# gnome-shell schemas are used in pkg_postinst
|
||||
COMMON_DEPEND="app-admin/eselect
|
||||
>=dev-libs/glib-2.26:2
|
||||
gnome-base/gsettings-desktop-schemas
|
||||
gnome-base/gnome-shell"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
dev-lang/perl
|
||||
dev-perl/JSON"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils"
|
||||
|
||||
src_install() {
|
||||
insinto "/usr/share/eselect/modules"
|
||||
doins gnome-shell-extensions.eselect
|
||||
keepdir "/etc/eselect/gnome-shell-extensions"
|
||||
# The actual gschema override file will be greated in pkg_postinst.
|
||||
dosym "/etc/eselect/gnome-shell-extensions/${PN}.gschema.override" \
|
||||
"/usr/share/glib-2.0/schemas/${PN}.gschema.override"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Updating list of installed extensions"
|
||||
eselect gnome-shell-extensions update || die
|
||||
local keyname="disabled-extensions"
|
||||
has_version ">=gnome-base/gnome-shell-3.1.90" &&
|
||||
keyname="enabled-extensions"
|
||||
elog
|
||||
elog "eselect gnome-shell-extensions manages the system default value of"
|
||||
elog "the org.gnome.shell ${keyname} key. To override the default"
|
||||
elog "for an individual user, use the gsettings command, e.g."
|
||||
elog "\$ gsettings set org.gnome.shell ${keyname} \"['foo', 'bar']\""
|
||||
elog "To undo per-user changes and use the system default, do"
|
||||
elog "\$ gsettings reset org.gnome.shell ${keyname}"
|
||||
elog
|
||||
}
|
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.7.ebuild,v 1.1 2012/09/11 08:37:42 slyfox Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
CABAL_FEATURES="bin nocabaldep"
|
||||
inherit eutils haskell-cabal
|
||||
|
||||
DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
|
||||
HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
|
||||
SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=dev-lang/ghc-6.12.1"
|
||||
|
||||
# Need a lower version for portage to get --keep-going
|
||||
RDEPEND="|| ( >=sys-apps/portage-2.1.6
|
||||
sys-apps/pkgcore
|
||||
sys-apps/paludis )"
|
||||
|
||||
src_prepare() {
|
||||
if use prefix; then
|
||||
sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
|
||||
"${S}/Distribution/Gentoo/Packages.hs" || die
|
||||
|
||||
sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
|
||||
"${S}/Distribution/Gentoo/GHC.hs" || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
cabal_src_configure \
|
||||
--bindir="${EPREFIX}/usr/sbin" \
|
||||
--constraint="Cabal == $(cabal-version)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cabal_src_install
|
||||
|
||||
dodoc TODO
|
||||
}
|
@ -1 +1,2 @@
|
||||
DIST KeePass-2.19-Source.zip 3338045 SHA256 772a223ca9a799176fb6e473527bfc756663a57c322241002e6b81638e5e7bef SHA512 27c22552ccf6ec55d430bd90d8f79ac70ff11cf674240cb16575ba8342eee44a0079ee8ab8800b773985fb41b79875b7d88a54267989e3b7b2112732169093e0 WHIRLPOOL a9b5cb2adf48f90f1a922f9ed165cc3e3e95f21e5ed76a1ea6a40c8f1bea1d34ddf0417b7d372adcc557152ee762bfd0a80c8ac7f94da50cafe03fc4a35c22bc
|
||||
DIST KeePass-2.20-Source.zip 3417074 SHA256 84917e57e69ae598cd55cc7eeed26f2b1732614e84890cd641a6e64c35509bd4 SHA512 5e4d388d68b23d77d3c519e975a53f85113f6ed7cad7414e14cfc6a8f8ffe3499da594cd571076e1977625c2ebbae8a1add33f1efd34739b0692718b7535a58c WHIRLPOOL 171071195a296e52f44a5c028b1c48665b3e2259d030d6d545370491ef86c4db52f44132cde44a4d871adc0c86890ac879568f341da00b4bbbc65a02c890a3bf
|
||||
|
@ -0,0 +1,45 @@
|
||||
KeePass looks for some resources (XSL files) in the executable directory,
|
||||
however under UNIX system this not a good idea, so we look into the
|
||||
CommonApplicationData SpecialFolder, which usually maps to "/usr/share/".
|
||||
So the final search path should be "/usr/share/KeePass/XSL/".
|
||||
|
||||
diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
|
||||
index 8a04c87..6083c00 100644
|
||||
--- a/KeePass/Forms/AboutForm.cs
|
||||
+++ b/KeePass/Forms/AboutForm.cs
|
||||
@@ -31,9 +31,11 @@ using KeePass.UI;
|
||||
using KeePass.Resources;
|
||||
using KeePass.Util;
|
||||
using KeePass.DataExchange;
|
||||
+using KeePass.Native;
|
||||
|
||||
using KeePassLib;
|
||||
using KeePassLib.Utility;
|
||||
+using KeePassLib.Native;
|
||||
|
||||
namespace KeePass.Forms
|
||||
{
|
||||
@@ -92,8 +94,21 @@ namespace KeePass.Forms
|
||||
m_lvComponents.Items.Add(lvi);
|
||||
|
||||
lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
|
||||
- string strPath = WinUtil.GetExecutable();
|
||||
- strPath = UrlUtil.GetFileDirectory(strPath, true, false);
|
||||
+
|
||||
+ string strPath;
|
||||
+ if (NativeLib.IsUnix())
|
||||
+ {
|
||||
+ strPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
|
||||
+ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
|
||||
+ strPath += PwDefs.ShortProductName.ToLower();
|
||||
+ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ strPath = WinUtil.GetExecutable();
|
||||
+ strPath = UrlUtil.GetFileDirectory(strPath, true, false);
|
||||
+ }
|
||||
+
|
||||
strPath += AppDefs.XslFilesDir;
|
||||
strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
|
||||
bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
|
@ -0,0 +1,99 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.20.ebuild,v 1.1 2012/09/11 12:55:30 kensington Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils fdo-mime gnome2-utils mono multilib
|
||||
|
||||
MY_PN="KeePass"
|
||||
DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
|
||||
HOMEPAGE="http://keepass.info/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="aot"
|
||||
|
||||
COMMON_DEPEND=">=dev-lang/mono-2.10.5"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
dev-dotnet/libgdiplus[cairo]"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
src_prepare() {
|
||||
# Remove Windows-specific things
|
||||
pushd Build || die
|
||||
. PrepMonoDev.sh || die
|
||||
popd || die
|
||||
|
||||
# KeePass looks for some XSL files in the same folder as the executable,
|
||||
# we prefer to have it in /usr/share/KeePass
|
||||
epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Build with Release target
|
||||
xbuild /target:KeePass /property:Configuration=Release || die
|
||||
|
||||
# Run Ahead Of Time compiler on the binary
|
||||
if use aot; then
|
||||
mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Wrapper script to launch mono
|
||||
make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
|
||||
|
||||
# Some XSL files
|
||||
insinto /usr/share/${PN}/XSL
|
||||
doins Ext/XSL/*
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/
|
||||
exeinto /usr/$(get_libdir)/${PN}/
|
||||
doins Ext/KeePass.exe.config
|
||||
# Default configuration, simply says to use user-specific configuration
|
||||
doins Ext/KeePass.config.xml
|
||||
|
||||
# The actual executable
|
||||
doexe Build/KeePass/Release/KeePass.exe
|
||||
|
||||
# Copy the AOT compilation result
|
||||
if use aot; then
|
||||
doexe Build/KeePass/Release/KeePass.exe.so
|
||||
fi
|
||||
|
||||
# Prepare the icons
|
||||
newicon -s 256 Ext/Icons/Finals/plockb.png "${PN}.png"
|
||||
newicon -s 256 -t gnome -c mimetypes Ext/Icons/Finals/plockb.png "application-x-${PN}2.png"
|
||||
|
||||
# Create a desktop entry and associate it with the KeePass mime type
|
||||
make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
|
||||
|
||||
# MIME descriptor for .kdbx files
|
||||
insinto /usr/share/mime/packages/
|
||||
doins "${FILESDIR}/${PN}.xml"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_mime_database_update
|
||||
fdo-mime_desktop_database_update
|
||||
|
||||
elog "Optional dependencies:"
|
||||
elog " x11-misc/xdotool (enables autotype)"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_mime_database_update
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
DIST bacula-5.0.3.tar.gz 3800556 SHA256 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4 SHA512 feb4a7333b4c898aec175c6e8b45ce5d4eb6e15100a9f27c6010e1a17b44133b7d181d25419e923321d8bd7147d85342bf1e0dca8387d6e9cd269a0e2fec4626 WHIRLPOOL 65a900cc740a300b509a02d953ec5265e3cfbd2ce85d8e40b47e1f1fdd6d77885ec48e68471cc559accd6707fdd9f1cbb34fba22371e806d404abed052a168fb
|
||||
DIST bacula-5.2.10.tar.gz 4110586 SHA256 51f311e6c51d6c9575ca458cd63198c6984eeaaff4ce6f334ff82bc999b8b360 SHA512 908da1308c43d245fe1e481e042b87d8f08f20d653d94448f73cfdb516817bb0d23e763a7fd1a394e80251b6eec7a945f0e19bdad018f7da8827bab0f8b3632d WHIRLPOOL 33b47ced534003981231fe04e8ae897cb42d857f6f784e59b2059b7367181771eac6772d3451c6190adfa68aba36a2e2a6325510067ea9b69f516787fa47b998
|
||||
DIST bacula-5.2.11.tar.gz 4147470 SHA256 1493554ef3d6460e75797d23f8294e96a92bf90ea34c135cbf2ab85b0b8b2001 SHA512 18448abd07050edd25fa3bb26fb9aa4d9f5c21ab0d9bd955f32d8fcbdd8ba508c022407254e522901169eb75c1b6c159d96739d55bbc1221339dcad13f94bc38 WHIRLPOOL 44b41d77f7d432d60eef9f93bbf99436a4bd972c83815fd02490fbafb216743bbafef26b7acded211baabef825b9853a5d06e8be64276093818110c8c1f8020c
|
||||
DIST bacula-5.2.5.tar.gz 4030327 SHA256 d731884b882178c597d8b7ef3f50c5622c87b1760d87133c24524faf43937f6d SHA512 da5e020a5eeefbaef63c5d6e54527b80e8be3c9497a7666709de6a5bc2a05294dbbc2ee5fd0feaf65f710a0d16f172ba487313918fc4503d858b3faf3938cf99 WHIRLPOOL d5e839a31ca0eb3d8bc60f1afdd721e328f5b6a3c2c06980915225ff3d1d0721457e2f31f5e4aeb2b18c943aed46e2e10780650d06ad147ec3d0e3a0633a313c
|
||||
DIST bacula-5.2.9.tar.gz 4104956 SHA256 f6421fa49007882f79963ed2544920d8aa4488ce28ca3ccd36d130adbf249e27 SHA512 fd2bb6190692cb9fba476e1bd21087a10dcef2906008cd707334fedba2ec09462e1d0c0992027f5eb6fc1518b119e7ccc1ae79216124209c5f54233699c0a169 WHIRLPOOL e412126b44d60b0a68531dbe8aac7cf2f27a64f23cd7c0e4c3146821ad2a6d3b5d715e842a2813a69a66d90363ec5df817a7249b40a2e0280a9cb6717200e66c
|
||||
|
@ -0,0 +1,364 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.11.ebuild,v 1.1 2012/09/12 06:47:40 tomjbe Exp $
|
||||
|
||||
EAPI="4"
|
||||
PYTHON_DEPEND="python? 2"
|
||||
PYTHON_USE_WITH="threads"
|
||||
PYTHON_USE_WITH_OPT="python"
|
||||
|
||||
inherit eutils multilib python qt4-r2 user
|
||||
|
||||
MY_PV=${PV/_beta/-b}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Featureful client/server network backup suite"
|
||||
HOMEPAGE="http://www.bacula.org/"
|
||||
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
|
||||
IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
|
||||
|
||||
DEPEND="
|
||||
>=sys-libs/zlib-1.1.4
|
||||
dev-libs/gmp
|
||||
!bacula-clientonly? (
|
||||
postgres? ( dev-db/postgresql-base[threads] )
|
||||
mysql? ( virtual/mysql )
|
||||
sqlite3? ( dev-db/sqlite:3 )
|
||||
!bacula-nodir? ( virtual/mta )
|
||||
)
|
||||
qt4? (
|
||||
x11-libs/qt-svg:4
|
||||
x11-libs/qwt:5
|
||||
)
|
||||
ssl? ( dev-libs/openssl )
|
||||
logwatch? ( sys-apps/logwatch )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
readline? ( >=sys-libs/readline-4.1 )
|
||||
dev-libs/lzo
|
||||
sys-libs/ncurses"
|
||||
RDEPEND="${DEPEND}
|
||||
!bacula-clientonly? (
|
||||
!bacula-nosd? (
|
||||
sys-block/mtx
|
||||
app-arch/mt-st
|
||||
)
|
||||
)
|
||||
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
|
||||
|
||||
REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
# create the daemon group and user
|
||||
if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
|
||||
enewgroup bacula
|
||||
einfo
|
||||
einfo "The group 'bacula' has been created. Any users you add to this"
|
||||
einfo "group have access to files created by the daemons."
|
||||
einfo
|
||||
fi
|
||||
|
||||
if use bacula-clientonly && use static && use qt4; then
|
||||
ewarn
|
||||
ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly; then
|
||||
# USE=static only supported for bacula-clientonly
|
||||
if use static; then
|
||||
ewarn
|
||||
ewarn "USE=static only supported together with USE=bacula-clientonly."
|
||||
ewarn "Ignoring 'static' useflag."
|
||||
ewarn
|
||||
fi
|
||||
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
|
||||
enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
|
||||
einfo
|
||||
einfo "The user 'bacula' has been created. Please see the bacula manual"
|
||||
einfo "for information about running bacula as a non-root user."
|
||||
einfo
|
||||
fi
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# adjusts default configuration files for several binaries
|
||||
# to /etc/bacula/<config> instead of ./<config>
|
||||
pushd src >&/dev/null || die
|
||||
for f in console/console.c dird/dird.c filed/filed.c \
|
||||
stored/bcopy.c stored/bextract.c stored/bls.c \
|
||||
stored/bscan.c stored/btape.c stored/stored.c \
|
||||
qt-console/main.cpp; do
|
||||
sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
|
||||
|| die "sed on ${f} failed"
|
||||
done
|
||||
popd >&/dev/null || die
|
||||
|
||||
# drop automatic install of unneeded documentation (for bug 356499)
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
|
||||
|
||||
# bug #310087
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
|
||||
|
||||
# bug #311161
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
|
||||
|
||||
# stop build for errors in subdirs
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
|
||||
|
||||
# bat needs to respect LDFLAGS
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
|
||||
|
||||
# bug #328701
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
|
||||
|
||||
epatch "${FILESDIR}"/5.2.10/${PN}-5.2.10-fix-static.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=''
|
||||
|
||||
if use bacula-clientonly; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable bacula-clientonly client-only) \
|
||||
$(use_enable !static libtool) \
|
||||
$(use_enable static static-cons) \
|
||||
$(use_enable static static-fd)"
|
||||
else
|
||||
myconf="${myconf} \
|
||||
$(use_enable !bacula-nodir build-dird) \
|
||||
$(use_enable !bacula-nosd build-stored)"
|
||||
# bug #311099
|
||||
# database support needed by dir-only *and* sd-only
|
||||
# build as well (for building bscan, btape, etc.)
|
||||
myconf="${myconf} \
|
||||
$(use_with mysql) \
|
||||
$(use_with sqlite3) \
|
||||
$(use_with postgres postgresql) \
|
||||
--enable-batch-insert"
|
||||
fi
|
||||
|
||||
# do not build bat if 'static' clientonly
|
||||
if ! use bacula-clientonly || ! use static; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable qt4 bat)"
|
||||
fi
|
||||
|
||||
myconf="${myconf} \
|
||||
--disable-tray-monitor \
|
||||
$(use_with X x) \
|
||||
$(use_with python) \
|
||||
$(use_enable !readline conio) \
|
||||
$(use_enable readline) \
|
||||
$(use_with readline readline /usr) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_with tcpd tcp-wrappers)"
|
||||
|
||||
econf \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--htmldir=/usr/share/doc/${PF}/html \
|
||||
--with-pid-dir=/var/run \
|
||||
--sysconfdir=/etc/bacula \
|
||||
--with-subsys-dir=/var/lock/subsys \
|
||||
--with-working-dir=/var/lib/bacula \
|
||||
--with-scriptdir=/usr/libexec/bacula \
|
||||
--with-dir-user=bacula \
|
||||
--with-dir-group=bacula \
|
||||
--with-sd-user=root \
|
||||
--with-sd-group=bacula \
|
||||
--with-fd-user=root \
|
||||
--with-fd-group=bacula \
|
||||
--enable-smartalloc \
|
||||
--disable-afs \
|
||||
--host=${CHOST} \
|
||||
${myconf}
|
||||
# correct configuration for QT based bat
|
||||
if use qt4 ; then
|
||||
pushd src/qt-console
|
||||
eqmake4
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
doicon scripts/bacula.png
|
||||
|
||||
# install bat icon and desktop file when enabled
|
||||
# (for some reason ./configure doesn't pick this up)
|
||||
if use qt4 && ! use static ; then
|
||||
doicon src/qt-console/images/bat_icon.png
|
||||
domenu scripts/bat.desktop
|
||||
fi
|
||||
|
||||
# remove some scripts we don't need at all
|
||||
rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
|
||||
|
||||
# rename statically linked apps
|
||||
if use bacula-clientonly && use static ; then
|
||||
pushd "${D}"/usr/sbin || die
|
||||
mv static-bacula-fd bacula-fd || die
|
||||
mv static-bconsole bconsole || die
|
||||
popd || die
|
||||
fi
|
||||
|
||||
# extra files which 'make install' doesn't cover
|
||||
if ! use bacula-clientonly; then
|
||||
# the database update scripts
|
||||
diropts -m0750
|
||||
insinto /usr/libexec/bacula/updatedb
|
||||
insopts -m0754
|
||||
doins "${S}"/updatedb/*
|
||||
fperms 0640 /usr/libexec/bacula/updatedb/README
|
||||
|
||||
# the logrotate configuration
|
||||
# (now unconditional wrt bug #258187)
|
||||
diropts -m0755
|
||||
insinto /etc/logrotate.d
|
||||
insopts -m0644
|
||||
newins "${S}"/scripts/logrotate bacula
|
||||
|
||||
# the logwatch scripts
|
||||
if use logwatch; then
|
||||
diropts -m0750
|
||||
dodir /etc/log.d/scripts/services
|
||||
dodir /etc/log.d/scripts/shared
|
||||
dodir /etc/log.d/conf/logfiles
|
||||
dodir /etc/log.d/conf/services
|
||||
pushd "${S}"/scripts/logwatch >&/dev/null || die
|
||||
emake DESTDIR="${D}" install
|
||||
popd >&/dev/null || die
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
|
||||
if ! use qt4; then
|
||||
rm -vf "${D}"/usr/share/man/man1/bat.1*
|
||||
fi
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
|
||||
if use bacula-clientonly || use bacula-nodir; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
|
||||
rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
|
||||
rm -vf "${D}"/usr/libexec/bacula/create_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/make_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/update_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
|
||||
rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
|
||||
fi
|
||||
if use bacula-clientonly || use bacula-nosd; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bcopy.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bextract.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bls.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bscan.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/btape.8*
|
||||
rm -vf "${D}"/usr/libexec/bacula/disk-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/mtx-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/dvd-handler
|
||||
fi
|
||||
|
||||
# documentation
|
||||
dodoc ChangeLog ReleaseNotes SUPPORT technotes
|
||||
|
||||
# vim-files
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins scripts/bacula.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
newins scripts/filetype.vim bacula_ft.vim
|
||||
fi
|
||||
|
||||
# set the value of $mydbtype depending on which database we
|
||||
# specified in the use flags.
|
||||
if use sqlite3; then
|
||||
mydbtype="sqlite3"
|
||||
fi
|
||||
if use postgres; then
|
||||
mydbtype="postgresql"
|
||||
fi
|
||||
if use mysql; then
|
||||
mydbtype="mysql"
|
||||
fi
|
||||
# setup init scripts
|
||||
myscripts="bacula-fd"
|
||||
if ! use bacula-clientonly; then
|
||||
if ! use bacula-nodir; then
|
||||
myscripts="${myscripts} bacula-dir"
|
||||
fi
|
||||
if ! use bacula-nosd; then
|
||||
myscripts="${myscripts} bacula-sd"
|
||||
fi
|
||||
fi
|
||||
for script in ${myscripts}; do
|
||||
# copy over init script and config to a temporary location
|
||||
# so we can modify them as needed
|
||||
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
|
||||
cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
|
||||
|
||||
# now set the database dependancy for the director init script
|
||||
case "${script}" in
|
||||
bacula-dir)
|
||||
case "${mydbtype}" in
|
||||
sqlite3)
|
||||
# sqlite3 databases don't have a daemon
|
||||
sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
|
||||
;;
|
||||
*)
|
||||
# all other databases have daemons
|
||||
sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
# install init script and config
|
||||
newinitd "${T}/${script}".initd "${script}"
|
||||
newconfd "${T}/${script}".confd "${script}"
|
||||
done
|
||||
|
||||
# make sure the working directory exists
|
||||
diropts -m0750
|
||||
keepdir /var/lib/bacula
|
||||
|
||||
# make sure bacula group can execute bacula libexec scripts
|
||||
fowners -R root:bacula /usr/libexec/bacula
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use bacula-clientonly; then
|
||||
fowners root:bacula /var/lib/bacula
|
||||
else
|
||||
fowners bacula:bacula /var/lib/bacula
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly && ! use bacula-nodir; then
|
||||
einfo
|
||||
einfo "If this is a new install, you must create the ${mydbtype} databases with:"
|
||||
einfo " /usr/libexec/bacula/create_${mydbtype}_database"
|
||||
einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
|
||||
einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
|
||||
einfo
|
||||
fi
|
||||
|
||||
einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
|
||||
einfo "you have to enable 'USE=qt4'."
|
||||
einfo
|
||||
}
|
@ -1 +1,2 @@
|
||||
DIST i7z-0.27.1.tar.gz 197875 SHA256 862d281fdd5924709056b6c71110f89c7ea1696b6f786bb55a04df8a83cf7758 SHA512 515c239a875ad282563b0b2d735243daaa39c9ef9f2d8c8663a2616ad28c56f0d71a4e1d99bdf88e9250b8090f0f4726ff272b0c6e1265991c86e100d26eb362 WHIRLPOOL 32ff5457a66f11a201da8c652eb5ff8365543511e1a94b349737c5f67cda3c0fa6045f45b7cbf6588657dc9ace05b099c8f40fe6cd5f6c873799ca4443234c5c
|
||||
DIST i7z-0.27.2.tar.gz 51226 SHA256 a7f72d65732c17eef0df4f284927fe744fc650075f2364c51c9497534d8f47f1 SHA512 d693fda4d12bf7b0d8e694d9f97876fcd2cad4556c950b4eab09ae21d121e63e221e1e1b27bcf23a241fd868b09165639ecfafeaa126144ad809199fcaca1cbb WHIRLPOOL aaea6bc544a554703cd85f7e2e075588114a6c807e1311421300464f1468560423e987f1582b5e58a2fd48eb1753559958ea39ed9ab97e621718e7f46e8c476e
|
||||
|
@ -1,19 +0,0 @@
|
||||
--- /tmp/GUI_i7z-50.cpp
|
||||
+++ i7z/GUI/GUI_i7z.cpp
|
||||
@@ -48,10 +48,14 @@
|
||||
void Construct_Socket_Information_in_GUI(unsigned int *numCPUs) {
|
||||
socket_0.max_cpu=0;
|
||||
socket_0.socket_num=0;
|
||||
- socket_0.processor_num={-1,-1,-1,-1,-1,-1,-1,-1};
|
||||
+ int i;
|
||||
+ for(i=0;i < 8; i++)
|
||||
+ socket_0.processor_num[i]=-1;
|
||||
socket_1.max_cpu=0;
|
||||
socket_1.socket_num=1;
|
||||
- socket_1.processor_num={-1,-1,-1,-1,-1,-1,-1,-1};
|
||||
+
|
||||
+ for(i=0;i < 8; i++)
|
||||
+ socket_1.processor_num[i]=-1;
|
||||
|
||||
construct_CPU_Heirarchy_info(&chi);
|
||||
construct_sibling_list(&chi);
|
@ -1,56 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index fc4d262..e2347bf 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -17,18 +17,18 @@
|
||||
|
||||
#makefile updated from patch by anestling
|
||||
|
||||
-CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
|
||||
+CFLAGS += -O0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
|
||||
|
||||
LBITS := $(shell getconf LONG_BIT)
|
||||
ifeq ($(LBITS),64)
|
||||
- CFLAGS = $(CFLAGSANY) -Dx64_BIT
|
||||
+ CFLAGS += -Dx64_BIT
|
||||
else
|
||||
- CFLAGS = $(CFLAGSANY) -Dx86
|
||||
+ CFLAGS += -Dx86
|
||||
endif
|
||||
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
-LDFLAGS = -lncurses -lpthread
|
||||
+LIBS = -lncurses -lpthread
|
||||
INCLUDEFLAGS =
|
||||
|
||||
OBJS = helper_functions
|
||||
@@ -36,15 +36,15 @@ OBJS = helper_functions
|
||||
BIN = i7z
|
||||
SRC = i7z.c helper_functions.c i7z_Single_Socket.c i7z_Dual_Socket.c
|
||||
|
||||
-sbindir = /usr/sbin
|
||||
+sbindir = $(DESTDIR)/usr/sbin
|
||||
|
||||
-all: clean message bin
|
||||
+all: clean bin
|
||||
|
||||
message:
|
||||
@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
|
||||
|
||||
bin:
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(BIN)
|
||||
@@ -52,6 +52,6 @@ clean:
|
||||
distclean: clean
|
||||
rm -f *~ \#*
|
||||
|
||||
-install: all
|
||||
- install -m 755 $(BIN) $(sbindir)
|
||||
+install:
|
||||
+ install -D -m 755 $(BIN) $(sbindir)/$(BIN)
|
||||
|
@ -1,56 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index fc4d262..e2347bf 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -17,18 +17,18 @@
|
||||
|
||||
#makefile updated from patch by anestling
|
||||
|
||||
-CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
|
||||
+CFLAGS += -O0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
|
||||
|
||||
LBITS := $(shell getconf LONG_BIT)
|
||||
ifeq ($(LBITS),64)
|
||||
- CFLAGS = $(CFLAGSANY) -Dx64_BIT
|
||||
+ CFLAGS += -Dx64_BIT
|
||||
else
|
||||
- CFLAGS = $(CFLAGSANY) -Dx86
|
||||
+ CFLAGS += -Dx86
|
||||
endif
|
||||
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
-LDFLAGS = -lncurses -lpthread -lrt
|
||||
+LIBS = -lncurses -lpthread -lrt
|
||||
INCLUDEFLAGS =
|
||||
|
||||
OBJS = helper_functions
|
||||
@@ -36,15 +36,15 @@ OBJS = helper_functions
|
||||
BIN = i7z
|
||||
SRC = i7z.c helper_functions.c i7z_Single_Socket.c i7z_Dual_Socket.c
|
||||
|
||||
-sbindir = /usr/sbin
|
||||
+sbindir = $(DESTDIR)/usr/sbin
|
||||
|
||||
-all: clean message bin
|
||||
+all: clean bin
|
||||
|
||||
message:
|
||||
@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
|
||||
|
||||
bin:
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(BIN)
|
||||
@@ -52,6 +52,6 @@ clean:
|
||||
distclean: clean
|
||||
rm -f *~ \#*
|
||||
|
||||
-install: all
|
||||
- install -m 755 $(BIN) $(sbindir)
|
||||
+install:
|
||||
+ install -D -m 755 $(BIN) $(sbindir)/$(BIN)
|
||||
|
@ -1,127 +0,0 @@
|
||||
http://code.google.com/p/i7z/issues/detail?id=31
|
||||
|
||||
this makes cpuid work on 32bit and 64bit systems, both PIC and non-PIC
|
||||
|
||||
the things it fixes:
|
||||
- no more silent clobbering of ebx/ecx/edx
|
||||
- works under 32bit pic builds (gcc doesnt like to clobber ebx)
|
||||
- ebx gets saved/restored via edi register
|
||||
- get_vendor incorrectly used ebx,ecx,edx when it should be ebx,edx,ecx
|
||||
- unify all the cpuid implementations to make usage much simpler
|
||||
|
||||
I WROTE THIS
|
||||
|
||||
--- a/helper_functions.c
|
||||
+++ b/helper_functions.c
|
||||
@@ -87,41 +87,40 @@ print_family_info (struct family_info *proc_info)
|
||||
// printf(" Extended Family %d\n", proc_info->extended_family);
|
||||
}
|
||||
|
||||
+static inline void cpuid (unsigned int info, unsigned int *eax, unsigned int *ebx,
|
||||
+ unsigned int *ecx, unsigned int *edx)
|
||||
+{
|
||||
+ unsigned int _eax = info, _ebx, _ecx, _edx;
|
||||
+ asm volatile ("mov %%ebx, %%edi;" // save ebx (for PIC)
|
||||
+ "cpuid;"
|
||||
+ "mov %%ebx, %%esi;" // pass to caller
|
||||
+ "mov %%edi, %%ebx;" // restore ebx
|
||||
+ :"+a" (_eax), "=S" (_ebx), "=c" (_ecx), "=d" (_edx)
|
||||
+ : /* inputs: eax is handled above */
|
||||
+ :"edi" /* clobbers: we hit edi directly */);
|
||||
+ if (eax) *eax = _eax;
|
||||
+ if (ebx) *ebx = _ebx;
|
||||
+ if (ecx) *ecx = _ecx;
|
||||
+ if (edx) *edx = _edx;
|
||||
+}
|
||||
|
||||
-#ifdef x64_BIT
|
||||
void get_vendor (char *vendor_string)
|
||||
{
|
||||
//get vendor name
|
||||
- unsigned int b, c, d, e;
|
||||
- // int i;
|
||||
- asm volatile ("mov %4, %%eax; " // 0 into eax
|
||||
- "cpuid;" "mov %%eax, %0;" // eeax into b
|
||||
- "mov %%ebx, %1;" // eebx into c
|
||||
- "mov %%edx, %2;" // eeax into d
|
||||
- "mov %%ecx, %3;" // eeax into e
|
||||
- :"=r" (b), "=r" (c), "=r" (d), "=r" (e) /* output */
|
||||
- :"r" (0) /* input */
|
||||
- :"%eax", "%ebx", "%ecx", "%edx" /* clobbered register, will be modifying inside the asm routine so dont use them */
|
||||
- );
|
||||
- memcpy (vendor_string, &c, 4);
|
||||
+ unsigned int a, b, c, d;
|
||||
+ cpuid (0, &a, &b, &c, &d);
|
||||
+ memcpy (vendor_string, &b, 4);
|
||||
memcpy (vendor_string + 4, &d, 4);
|
||||
- memcpy (vendor_string + 8, &e, 4);
|
||||
+ memcpy (vendor_string + 8, &c, 4);
|
||||
vendor_string[12] = '\0';
|
||||
// printf("Vendor %s\n",vendor_string);
|
||||
}
|
||||
-#endif
|
||||
|
||||
int turbo_status ()
|
||||
{
|
||||
//turbo state flag
|
||||
unsigned int eax;
|
||||
- // int i;
|
||||
- asm volatile ("mov %1, %%eax; " // 0 into eax
|
||||
- "cpuid;" "mov %%eax, %0;" // eeax into b
|
||||
- :"=r" (eax) /* output */
|
||||
- :"r" (6) /* input */
|
||||
- :"%eax" /* clobbered register, will be modifying inside the asm routine so dont use them */
|
||||
- );
|
||||
+ cpuid (6, &eax, NULL, NULL, NULL);
|
||||
|
||||
//printf("eax %d\n",(eax&0x2)>>1);
|
||||
|
||||
@@ -132,12 +131,7 @@ void get_familyinformation (struct family_info *proc_info)
|
||||
{
|
||||
//get info about CPU
|
||||
unsigned int b;
|
||||
- asm volatile ("mov %1, %%eax; " // 0 into eax
|
||||
- "cpuid;" "mov %%eax, %0;" // eeax into b
|
||||
- :"=r" (b) /* output */
|
||||
- :"r" (1) /* input */
|
||||
- :"%eax" /* clobbered register, will be modifying inside the asm routine so dont use them */
|
||||
- );
|
||||
+ cpuid (1, &b, NULL, NULL, NULL);
|
||||
// printf ("eax %x\n", b);
|
||||
proc_info->stepping = b & 0x0000000F; //bits 3:0
|
||||
proc_info->model = (b & 0x000000F0) >> 4; //bits 7:4
|
||||
@@ -348,7 +342,6 @@ void Print_Information_Processor(bool* nehalem, bool* sandy_bridge)
|
||||
{
|
||||
struct family_info proc_info;
|
||||
|
||||
-#ifdef x64_BIT
|
||||
char vendor_string[13];
|
||||
get_vendor (vendor_string);
|
||||
if (strcmp (vendor_string, "GenuineIntel") == 0)
|
||||
@@ -359,14 +352,6 @@ void Print_Information_Processor(bool* nehalem, bool* sandy_bridge)
|
||||
("this was designed to be a intel proc utility. You can perhaps mod it for your machine?\n");
|
||||
exit (1);
|
||||
}
|
||||
-#endif
|
||||
-
|
||||
-#ifndef x64_BIT
|
||||
- //anecdotal evidence: get_vendor doesnt seem to work on 32-bit
|
||||
- printf
|
||||
- ("I dont know the CPUID code to check on 32-bit OS, so i will assume that you have an Intel processor\n");
|
||||
- printf ("Don't worry if i don't find a nehalem next, i'll quit anyways\n");
|
||||
-#endif
|
||||
|
||||
get_familyinformation (&proc_info);
|
||||
print_family_info (&proc_info);
|
||||
--- a/i7z.h
|
||||
+++ b/i7z.h
|
||||
@@ -106,9 +106,7 @@ __asm__ __volatile__ ("rdtsc":"=a" (lo), "=d" (hi));
|
||||
|
||||
void print_family_info (struct family_info *proc_info);
|
||||
|
||||
-#ifdef x64_BIT
|
||||
void get_vendor (char *vendor_string);
|
||||
-#endif
|
||||
|
||||
int turbo_status ();
|
||||
double cpufreq_info();
|
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.2.ebuild,v 1.1 2012/09/12 06:24:13 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils flag-o-matic qt4-r2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
|
||||
HOMEPAGE="http://code.google.com/p/i7z/"
|
||||
SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="X"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/ncurses
|
||||
X? ( x11-libs/qt-gui:4 )"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
tc-export CC
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
if use X; then
|
||||
cd GUI
|
||||
eqmake4 ${PN}_GUI.pro
|
||||
emake clean && emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" install
|
||||
if use X; then
|
||||
dosbin GUI/i7z_GUI
|
||||
fi
|
||||
dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr
|
||||
}
|
@ -1,9 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>dilfridge@gentoo.org</email>
|
||||
</maintainer>
|
||||
<herd>kde</herd>
|
||||
<herd>openoffice</herd>
|
||||
</pkgmetadata>
|
||||
|
@ -1,2 +1 @@
|
||||
DIST gnupod-0.98.3.tgz 157938 SHA256 8d779e7bfa685f1939c5b407c15d998796eca583bbbd81fb77b92f2309dafc85 SHA512 cc84d5b574abdacce14e62fcee28b246eb29cd5e7336bd21141f74cf049e1540ff4edd441e6e4e4a4cb83de5ba0e4600e005dc9428d5ac08c10fe1f0067b57f4 WHIRLPOOL 398b5abfe1b1db149624c9997b8cee90dda5827c9b020ed8c6e88eec0467125d7042cd829b2ec26a85288831b21e96c0643ddf7865899996850b796f77038e75
|
||||
DIST gnupod-0.99.8.tgz 207572 SHA256 bd566295a2e14352e6d05f5c816cab36b0e80d3ab36d29c4bbb45c581d3f3c31 SHA512 ac9ceadff371e052b6deb4067aa73e190ad109feb3337cc205d521fbab11b5bc1415e44907761711eeaaf7fcea6a1a841c08e2177fa912446cfe7495d2a5182b WHIRLPOOL 30a05398864c61f46621021cc1e6d5784651d690574ffef344c2df9cb4e4b6b74571a0b2b962502126170a42adea77a519351a615af0adccd4882e8d13834c93
|
||||
|
@ -1,44 +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/gnupod/gnupod-0.98.3.ebuild,v 1.4 2011/03/30 15:00:00 ssuominen Exp $
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A collection of Perl-scripts for iPod"
|
||||
HOMEPAGE="http://www.gnu.org/software/gnupod/"
|
||||
SRC_URI="http://blinkenlights.ch/gnupod-dist/stable/${P}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc ppc64 x86"
|
||||
IUSE=""
|
||||
|
||||
# perl-5.8.0 contains Getopt-Long and Digest-MD5.
|
||||
DEPEND="dev-lang/perl
|
||||
dev-perl/MP3-Info
|
||||
dev-perl/XML-Parser
|
||||
dev-perl/Unicode-String
|
||||
|| ( >=dev-lang/perl-5.8.0
|
||||
( virtual/perl-Getopt-Long
|
||||
virtual/perl-Digest-MD5
|
||||
)
|
||||
)"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_compile() {
|
||||
econf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
perlinfo
|
||||
sed -i -e "s:\$INC\[0\]/\$modi:${D}${VENDOR_ARCH}/\$modi:g" \
|
||||
tools/gnupod_install.pl || die
|
||||
|
||||
dodir /usr/bin
|
||||
dodir ${VENDOR_ARCH}/GNUpod
|
||||
dodir /usr/share/info
|
||||
einstall || die
|
||||
|
||||
dodoc AUTHORS BUGS CHANGES README* TODO doc/gnutunesdb.example
|
||||
dohtml doc/gnupod.html
|
||||
}
|
@ -1,31 +0,0 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -27,14 +27,14 @@
|
||||
|
||||
|
||||
# Note that if you change CC here you must also change it in ./lib/Makefile
|
||||
-CC=gcc
|
||||
+#CC=gcc
|
||||
|
||||
# if using a compiler which adheres strictly to ANSI C guidelines then
|
||||
# uncomment the next line.
|
||||
|
||||
#DEFS=-DFORCE_ANSI
|
||||
|
||||
-CFLAGS=-O2 -Wall
|
||||
+CFLAGS := $(CFLAGS) -Wall
|
||||
CINCLUDES=-I $(LIBDIR) $(DEFS)
|
||||
|
||||
# Nothing should need changing below here
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -22,7 +22,7 @@
|
||||
#Note may need to change this for your system, the only reason this Makefile
|
||||
#exists is because the non-gnu make on suns is brain dead.
|
||||
|
||||
-CC=gcc
|
||||
-CFLAGS=-O2
|
||||
+#CC=gcc
|
||||
+#CFLAGS=-O2
|
||||
all: getopt.o getopt1.o
|
||||
|
@ -0,0 +1,13 @@
|
||||
diff --git a/src/SConscript.client b/src/SConscript.client
|
||||
index 7a6bdc9..3fb55e5 100644
|
||||
--- a/src/SConscript.client
|
||||
+++ b/src/SConscript.client
|
||||
@@ -134,7 +134,7 @@ env.Install(
|
||||
# install
|
||||
prefix = GetOption("prefix")
|
||||
|
||||
-env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
|
||||
+env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
|
||||
|
||||
for x in clientHeaderDirectories:
|
||||
env.Install(prefix + "/include/mongo/" + x,
|
@ -0,0 +1 @@
|
||||
DIST gigi-0.8_pre20120910.tar.bz2 3483001 SHA256 a59423e554e56b8b59aa8c4231b9e572479895534f64c6e7f79ebaa264e42f26 SHA512 a92ceed601c46794d2b410f90ae22b10273d27a92cc56d28da77985d599bec4afcfbdfee71432398fe15283e11a92964b8a1428e1eeec4337687a555e34a18cf WHIRLPOOL 7f226d4e73886f54cd34e8fa45a331785fdc82fc9686146d6ca89df19238ade0daa053216852d32f075740d885f3764c4d956d6b3f7cebb0805cb1287e2ce9d3
|
@ -0,0 +1,18 @@
|
||||
From: hasufell <julian.ospald@googlemail.com>
|
||||
Date: Sun Apr 22 23:43:33 UTC 2012
|
||||
|
||||
fix devil library variables
|
||||
|
||||
!! applied on top of libtool.patch !!
|
||||
|
||||
--- src/CMakeLists.txt
|
||||
+++ src/CMakeLists.txt
|
||||
@@ -176,7 +176,7 @@
|
||||
|
||||
set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBTOOL_LIB})
|
||||
if (USE_DEVIL)
|
||||
- list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
|
||||
+ list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARIES} ${ILU_LIBRARIES} ${ILUT_LIBRARIES})
|
||||
else ()
|
||||
if (JPEG_FOUND)
|
||||
list(APPEND THIS_LIB_LINK_LIBS ${JPEG_LIBRARIES})
|
@ -0,0 +1,18 @@
|
||||
From: hasufell <julian.ospald@googlemail.com>
|
||||
Date: Thu Apr 19 19:26:44 UTC 2012
|
||||
|
||||
fixed hardcoded DOCDIR
|
||||
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -332,8 +332,8 @@
|
||||
endif ()
|
||||
if (BUILD_DOCUMENTATION AND NOT NO_DOCS_PACKAGE)
|
||||
install(
|
||||
- DIRECTORY ${CMAKE_BINARY_DIR}/doc/GG
|
||||
- DESTINATION doc
|
||||
+ DIRECTORY ${CMAKE_BINARY_DIR}/doc/GG/
|
||||
+ DESTINATION ${DOCDIR}
|
||||
)
|
||||
endif ()
|
||||
elseif (BUILD_DOCUMENTATION)
|
@ -0,0 +1,93 @@
|
||||
diff -U 3 -dHrN gigi-0.8_pre20120910.orig/CMakeLists.txt gigi-0.8_pre20120910/CMakeLists.txt
|
||||
--- gigi-0.8_pre20120910.orig/CMakeLists.txt 2012-09-10 18:48:32.272877323 -0700
|
||||
+++ gigi-0.8_pre20120910/CMakeLists.txt 2012-09-10 18:48:49.759553898 -0700
|
||||
@@ -228,36 +228,6 @@
|
||||
########################################
|
||||
# Header Generation #
|
||||
########################################
|
||||
-if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
|
||||
- if (UNIX)
|
||||
- message("-- Configuring libltdl using \"libltdl/configure\" ...")
|
||||
- execute_process(
|
||||
- COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
|
||||
- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
|
||||
- OUTPUT_QUIET
|
||||
- )
|
||||
- else ()
|
||||
- file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
|
||||
- "/* WARNING: Generated by GG's build system. All local changes will be lost! */
|
||||
-#define error_t int
|
||||
-#define HAVE_STDIO_H 1
|
||||
-#define HAVE_STDLIB_H 1
|
||||
-#define HAVE_STRING_H 1
|
||||
-#define HAVE_CTYPE_H 1
|
||||
-#define HAVE_MEMORY_H 1
|
||||
-#define HAVE_ERRNO_H 1
|
||||
-#define __WIN32__
|
||||
-#define HAVE_MEMCPY 1
|
||||
-#define HAVE_MEMMOVE 1
|
||||
-#define LTDL_OBJDIR \".libs\"
|
||||
-#define LTDL_DLOPEN_DEPLIBS 1
|
||||
-#define LTDL_SHLIBPATH_VAR \"PATH\"
|
||||
-#define LTDL_SHLIB_EXT \".dll\"
|
||||
-"
|
||||
- )
|
||||
- endif ()
|
||||
-endif ()
|
||||
-
|
||||
configure_file(
|
||||
${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
|
||||
${CMAKE_HOME_DIRECTORY}/GG/Config.h
|
||||
diff -U 3 -dHrN gigi-0.8_pre20120910.orig/GG/PluginInterface.h gigi-0.8_pre20120910/GG/PluginInterface.h
|
||||
--- gigi-0.8_pre20120910.orig/GG/PluginInterface.h 2012-09-10 18:48:32.301876786 -0700
|
||||
+++ gigi-0.8_pre20120910/GG/PluginInterface.h 2012-09-10 18:49:02.264322634 -0700
|
||||
@@ -35,7 +35,7 @@
|
||||
#if defined(__APPLE__) && defined(__MACH__)
|
||||
# include "../libltdl/ltdl.h"
|
||||
#else
|
||||
-# include <GG/ltdl.h>
|
||||
+# include <ltdl.h>
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
diff -U 3 -dHrN gigi-0.8_pre20120910.orig/src/CMakeLists.txt gigi-0.8_pre20120910/src/CMakeLists.txt
|
||||
--- gigi-0.8_pre20120910.orig/src/CMakeLists.txt 2012-09-10 18:48:32.327876305 -0700
|
||||
+++ gigi-0.8_pre20120910/src/CMakeLists.txt 2012-09-10 18:48:49.759553898 -0700
|
||||
@@ -50,8 +50,6 @@
|
||||
dialogs/FileDlg.cpp
|
||||
dialogs/ThreeButtonDlg.cpp
|
||||
|
||||
- ../libltdl/ltdl.c
|
||||
-
|
||||
adobe/adam.cpp
|
||||
adobe/adam_evaluate.cpp
|
||||
adobe/adam_parser.cpp
|
||||
@@ -162,14 +160,21 @@
|
||||
)
|
||||
endif ()
|
||||
|
||||
-set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1)
|
||||
-execute_process(
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h
|
||||
-)
|
||||
-set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true)
|
||||
+find_library(LIBTOOL_LIB ltdl)
|
||||
+if (LIBTOOL_LIB)
|
||||
+ MESSAGE(STATUS " libtool-libraries : ${LIBTOOL_LIB}")
|
||||
+else (LIBTOOL_LIB)
|
||||
+ MESSAGE(FATAL_ERROR "libtool library not found!")
|
||||
+endif (LIBTOOL_LIB)
|
||||
|
||||
-set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
|
||||
+find_file(LIBTOOL_HEADER ltdl.h PATHS ${CMAKE_INCLUDE_PATH})
|
||||
+if (LIBTOOL_HEADER)
|
||||
+ MESSAGE(STATUS " libtool-header : ${LIBTOOL_HEADER}")
|
||||
+else (LIBTOOL_HEADER)
|
||||
+ MESSAGE(FATAL_ERROR "libtool header not found!")
|
||||
+endif (LIBTOOL_HEADER)
|
||||
+
|
||||
+set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBTOOL_LIB})
|
||||
if (USE_DEVIL)
|
||||
list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
|
||||
else ()
|
@ -0,0 +1,78 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-games/gigi/gigi-0.8_pre20120910.ebuild,v 1.1 2012/09/11 15:57:21 tomka Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
inherit cmake-utils eutils python
|
||||
|
||||
DESCRIPTION="An OpenGL interface library"
|
||||
HOMEPAGE="http://gigi.sourceforge.net"
|
||||
SRC_URI="http://dev.gentoo.org/~tomka/files/${PF}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="devil doc eve ogre ois sdl static-libs threads"
|
||||
RESTRICT="test" # fails for unknown reasons
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/boost-1.47
|
||||
media-libs/freetype:2
|
||||
sys-devel/libtool
|
||||
sys-libs/zlib
|
||||
x11-libs/libX11
|
||||
virtual/opengl
|
||||
devil? ( >=media-libs/devil-1.6.1 )
|
||||
!devil? (
|
||||
media-libs/libpng:0
|
||||
media-libs/tiff:0
|
||||
virtual/jpeg
|
||||
)
|
||||
ogre? (
|
||||
>=dev-games/ogre-1.7.4[ois?]
|
||||
ois? ( dev-games/ois )
|
||||
)
|
||||
sdl? ( media-libs/libsdl )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )"
|
||||
REQUIRED_USE="ois? ( ogre )"
|
||||
|
||||
CMAKE_USE_DIR="${S}"
|
||||
|
||||
# For segfaults during compile see https://qa.mandriva.com/show_bug.cgi?id=62558"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-docdir.patch
|
||||
|
||||
# use systems ltdl
|
||||
rm -r "${CMAKE_USE_DIR}"/libltdl || die
|
||||
epatch "${FILESDIR}"/${P}-libtool.patch
|
||||
|
||||
# fix devil (apply after libtool.patch)
|
||||
epatch "${FILESDIR}"/${P}-devil.patch
|
||||
|
||||
python_convert_shebangs 2 GG/gen_signals.py
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# USE_DEVIL broken
|
||||
# BUILD_TUTORIALS incomplete
|
||||
local mycmakeargs=(
|
||||
-DDOCDIR=/usr/share/doc/${PF}/html
|
||||
-DRELEASE_COMPILE_FLAGS=""
|
||||
$(cmake-utils_use_use devil DEVIL)
|
||||
$(cmake-utils_use_build eve EXPERIMENTAL_EVE_SUPPORT)
|
||||
$(cmake-utils_use_build ogre OGRE_DRIVER)
|
||||
$(cmake-utils_use_build ois OGRE_OIS_PLUGIN)
|
||||
$(cmake-utils_use_build sdl SDL_DRIVER)
|
||||
$(cmake-utils_use_build doc DOCUMENTATION)
|
||||
$(cmake-utils_use_build static-libs STATIC)
|
||||
$(cmake-utils_use_build threads MULTI_THREADED)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>tomka@gentoo.org</email>
|
||||
<name>Thomas Kahle</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="devil">Use DevIL instead of libpng/libjpeg/libtiff</flag>
|
||||
<flag name="eve">Add experimental eve support</flag>
|
||||
<flag name="ogre">Add support for <pkg>dev-games/ogre</pkg></flag>
|
||||
<flag name="ois">Add support for <pkg>dev-games/ois</pkg></flag>
|
||||
</use>
|
||||
<longdescription lang="en">
|
||||
GiGi (aka GG) is a GUI library for OpenGL. It is platform-independent
|
||||
(it runs at least on Linux and Windows, and probably more),
|
||||
compiler-independent (it compiles under at GCC 3.4 or higher and
|
||||
MSVC++ 8.0 SP1 or higher, and probably more), and
|
||||
driver-independent. Reference drivers for SDL and Ogre are provided,
|
||||
and it is straightforward to write one for yourself should you decide
|
||||
to do so.
|
||||
|
||||
The Gentoo version is slightly patched by the makers of
|
||||
games-strategy/freeorion.
|
||||
</longdescription>
|
||||
|
||||
</pkgmetadata>
|
@ -0,0 +1,173 @@
|
||||
port ucl to the x32 ABI
|
||||
|
||||
https://bugs.gentoo.org/426334
|
||||
|
||||
--- a/acc/acc_arch.h
|
||||
+++ b/acc/acc_arch.h
|
||||
@@ -19,6 +19,7 @@
|
||||
* ACC_ARCH_UNKNOWN [default]
|
||||
* ACC_ARCH_ALPHA
|
||||
* ACC_ARCH_AMD64 aka x86-64 or ia32e
|
||||
+ * ACC_ARCH_X32 aka x86-32
|
||||
* ACC_ARCH_C166
|
||||
* ACC_ARCH_IA16 Intel Architecture (8088, 8086, 80186, 80286)
|
||||
* ACC_ARCH_IA32 Intel Architecture (80386+)
|
||||
@@ -42,8 +43,13 @@
|
||||
# define ACC_ARCH_IA16 1
|
||||
# define ACC_INFO_ARCH "ia16"
|
||||
#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
|
||||
+# ifdef __ILP32__
|
||||
+# define ACC_ARCH_X32 1
|
||||
+# define ACC_INFO_ARCH "x32"
|
||||
+# else
|
||||
# define ACC_ARCH_AMD64 1
|
||||
# define ACC_INFO_ARCH "amd64"
|
||||
+# endif
|
||||
#elif (UINT_MAX <= ACC_0xffffL) && defined(__AVR__)
|
||||
# define ACC_ARCH_AVR 1
|
||||
# define ACC_INFO_ARCH "avr"
|
||||
@@ -92,7 +98,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA16 || ACC_ARCH_IA32)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA16 || ACC_ARCH_IA32 || ACC_ARCH_X32)
|
||||
# define ACC_ENDIAN_LITTLE_ENDIAN 1
|
||||
# define ACC_INFO_ENDIAN "little-endian"
|
||||
#elif (ACC_ARCH_M68K)
|
||||
--- a/acc/acc_chk.ch
|
||||
+++ b/acc/acc_chk.ch
|
||||
@@ -407,7 +407,7 @@
|
||||
#if (ACC_ARCH_IA16)
|
||||
ACCCHK_ASSERT(sizeof(size_t) == 2)
|
||||
ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
|
||||
-#elif (ACC_ARCH_IA32 || ACC_ARCH_M68K)
|
||||
+#elif (ACC_ARCH_IA32 || ACC_ARCH_M68K || ACC_ARCH_X32)
|
||||
ACCCHK_ASSERT(sizeof(size_t) == 4)
|
||||
ACCCHK_ASSERT(sizeof(ptrdiff_t) == 4)
|
||||
ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
|
||||
--- a/acc/acc_lib.h
|
||||
+++ b/acc/acc_lib.h
|
||||
@@ -423,13 +423,13 @@ ACCLIB_EXTERN(void, acc_set_le64) (acc_hvoid_p, acc_uint64l_t);
|
||||
#endif
|
||||
|
||||
/* inline versions */
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
|
||||
# define ACC_GET_LE16(p) (* (const unsigned short *) (p))
|
||||
# define ACC_GET_LE32(p) (* (const acc_uint32e_t *) (p))
|
||||
# define ACC_SET_LE16(p,v) (* (unsigned short *) (p) = (unsigned short) (v))
|
||||
# define ACC_SET_LE32(p,v) (* (acc_uint32e_t *) (p) = (acc_uint32e_t) (v))
|
||||
#endif
|
||||
-#if (ACC_ARCH_AMD64)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_X32)
|
||||
# define ACC_GET_LE64(p) (* (const acc_uint64l_t *) (p))
|
||||
# define ACC_SET_LE64(p,v) (* (acc_uint64l_t *) (p) = (acc_uint64l_t) (v))
|
||||
#endif
|
||||
--- a/acc/acclib/bele.ch
|
||||
+++ b/acc/acclib/bele.ch
|
||||
@@ -71,7 +71,7 @@ ACCLIB_PUBLIC(void, acc_set_be32) (acc_hvoid_p p, acc_uint32l_t v)
|
||||
|
||||
ACCLIB_PUBLIC(unsigned, acc_get_le16) (const acc_hvoid_p p)
|
||||
{
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
|
||||
return (* (const unsigned short *) (p));
|
||||
#else
|
||||
const acc_hbyte_p b = (const acc_hbyte_p) p;
|
||||
@@ -87,7 +87,7 @@ ACCLIB_PUBLIC(acc_uint32l_t, acc_get_le24) (const acc_hvoid_p p)
|
||||
|
||||
ACCLIB_PUBLIC(acc_uint32l_t, acc_get_le32) (const acc_hvoid_p p)
|
||||
{
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
|
||||
return (* (const acc_uint32e_t *) (p));
|
||||
#else
|
||||
const acc_hbyte_p b = (const acc_hbyte_p) p;
|
||||
@@ -102,7 +102,7 @@ ACCLIB_PUBLIC(acc_uint32l_t, acc_get_le32) (const acc_hvoid_p p)
|
||||
|
||||
ACCLIB_PUBLIC(void, acc_set_le16) (acc_hvoid_p p, unsigned v)
|
||||
{
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
|
||||
(* (unsigned short *) (p) = (unsigned short) (v));
|
||||
#else
|
||||
acc_hbyte_p b = (acc_hbyte_p) p;
|
||||
@@ -121,7 +121,7 @@ ACCLIB_PUBLIC(void, acc_set_le24) (acc_hvoid_p p, acc_uint32l_t v)
|
||||
|
||||
ACCLIB_PUBLIC(void, acc_set_le32) (acc_hvoid_p p, acc_uint32l_t v)
|
||||
{
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
|
||||
(* (acc_uint32e_t *) (p) = (acc_uint32e_t) (v));
|
||||
#else
|
||||
acc_hbyte_p b = (acc_hbyte_p) p;
|
||||
@@ -191,7 +191,7 @@ ACCLIB_PUBLIC(void, acc_set_be64) (acc_hvoid_p p, acc_uint64l_t v)
|
||||
|
||||
ACCLIB_PUBLIC(acc_uint64l_t, acc_get_le64) (const acc_hvoid_p p)
|
||||
{
|
||||
-#if (ACC_ARCH_AMD64)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_X32)
|
||||
return (* (const acc_uint64l_t *) (p));
|
||||
#elif (ACC_ARCH_IA32)
|
||||
const acc_uint32e_t* b = (const acc_uint32e_t*) p;
|
||||
@@ -211,7 +211,7 @@ ACCLIB_PUBLIC(acc_uint64l_t, acc_get_le64) (const acc_hvoid_p p)
|
||||
|
||||
ACCLIB_PUBLIC(void, acc_set_le64) (acc_hvoid_p p, acc_uint64l_t v)
|
||||
{
|
||||
-#if (ACC_ARCH_AMD64)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_X32)
|
||||
(* (acc_uint64l_t *) (p)) = v;
|
||||
#elif (ACC_ARCH_IA32)
|
||||
(((acc_uint32e_t *)(p))[0] = (acc_uint32e_t) (v >> 0));
|
||||
--- a/acc/acclib/perfctr.ch
|
||||
+++ b/acc/acclib/perfctr.ch
|
||||
@@ -63,7 +63,7 @@ ACCLIB_PUBLIC(int, acc_perfctr_open) (acc_perfctr_handle_p h)
|
||||
break; /* no working TSC available */
|
||||
case PERFCTR_X86_AMD_K7:
|
||||
#endif
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
|
||||
case PERFCTR_X86_AMD_K8:
|
||||
case PERFCTR_X86_AMD_K8C:
|
||||
cc->tsc_on = 1; cc->nractrs = 2;
|
||||
--- a/acc/acclib/rdtsc.ch
|
||||
+++ b/acc/acclib/rdtsc.ch
|
||||
@@ -21,7 +21,7 @@
|
||||
#if defined(acc_int32e_t)
|
||||
|
||||
|
||||
-#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32) && ACC_CC_GNUC)
|
||||
+#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && ACC_CC_GNUC)
|
||||
# if (ACC_CC_GNUC >= 0x020000ul)
|
||||
# define __ACCLIB_RDTSC_REGS : : "r" (t) : "cc", "memory", "eax", "edx"
|
||||
# else
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t)
|
||||
{
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && defined(__ACCLIB_RDTSC_REGS)
|
||||
__asm__ __volatile__(
|
||||
"clc \n" ".byte 0x0f, 0x31\n"
|
||||
"movl %%eax,(%0)\n" "movl %%edx,4(%0)\n"
|
||||
@@ -73,7 +73,7 @@ ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t)
|
||||
|
||||
ACCLIB_PUBLIC(int, acc_tsc_read_add) (acc_uint32e_t* t)
|
||||
{
|
||||
-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS)
|
||||
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && defined(__ACCLIB_RDTSC_REGS)
|
||||
__asm__ __volatile__(
|
||||
"clc \n" ".byte 0x0f, 0x31\n"
|
||||
"addl %%eax,(%0)\n" "adcl $0,%%edx\n" "addl %%edx,4(%0)\n"
|
||||
--- a/src/ucl_conf.h
|
||||
+++ b/src/ucl_conf.h
|
||||
@@ -172,7 +172,7 @@
|
||||
#undef UA_SET2
|
||||
#undef UA_GET4
|
||||
#undef UA_SET4
|
||||
-#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
|
||||
+#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
|
||||
# define UA_GET2(p) (* (const ucl_ushortp) (p))
|
||||
# define UA_SET2(p) (* (ucl_ushortp) (p))
|
||||
# define UA_GET4(p) (* (const acc_uint32e_t *) (p))
|
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20120719.1.0.ebuild,v 1.1 2012/09/11 16:32:13 tove Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MODULE_AUTHOR=BDFOY
|
||||
MODULE_VERSION=20120719.001
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Data pack for Business::ISBN"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="
|
||||
test? (
|
||||
>=virtual/perl-Test-Simple-0.950.0
|
||||
dev-perl/Test-Pod
|
||||
dev-perl/Test-Pod-Coverage
|
||||
)
|
||||
"
|
||||
|
||||
SRC_TEST=do
|
@ -0,0 +1 @@
|
||||
DIST Business-ISBN-Data-20120719.001.tar.gz 14745 SHA256 745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3 SHA512 b688694bf99c65e072cbf5575de477dff607d1f66376f20b147f49896f4a2dd82a9a4b8dc1843c9d363ca93840df6683d989f794dcc7625e4f9b2c78ede2ded0 WHIRLPOOL e57618e9454b6e9ec212bc724961a945e73b7436b5f8758e73ddafcf494db01ae21e612aae2bc9654beec9fa2fb810052732e277b8b369a636581ea3387a92e1
|
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>perl</herd>
|
||||
<upstream>
|
||||
<remote-id type="cpan">Business-ISBN-Data</remote-id>
|
||||
<remote-id type="cpan-module">Business::ISBN</remote-id>
|
||||
<remote-id type="cpan-module">Business::ISBN::Data</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Business-ISBN/Business-ISBN-2.50.0.ebuild,v 1.1 2012/09/11 16:36:35 tove Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MODULE_AUTHOR=BDFOY
|
||||
MODULE_VERSION=2.05
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Work with ISBN as objects"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-perl/Business-ISBN-Data-20081208.0.0
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
dev-perl/Test-Pod
|
||||
dev-perl/Test-Pod-Coverage
|
||||
)
|
||||
"
|
||||
|
||||
SRC_TEST=do
|
||||
|
||||
src_prepare() {
|
||||
perl-module_src_prepare
|
||||
sed -i '/URI/d' Makefile.PL || die # unused dependency
|
||||
}
|
||||
|
||||
src_test() {
|
||||
mv t/xisbn10.t{,.disable} || die # online test
|
||||
sed -i 's,9997022576,9999922579,' t/isbn1{0,3}.t || die # non-existing block
|
||||
perl-module_src_test
|
||||
}
|
@ -0,0 +1 @@
|
||||
DIST Business-ISBN-2.05.tar.gz 355413 SHA256 d9816bfb7aa6d87843f8484c9aac23e4c5ec1173ebfec458843e89ea5cf375ee SHA512 b5179f891a401f11f1355137e90e14a9f3602c14b181b30da3237bd4ba49b40df41c9c1396242084211a09dfcde8927d1dfe0965602982cb0d50a3b0bbfad694 WHIRLPOOL 7b5b073010e739891b357fb568300452f49e87a3b33ebacdb0205d62ab079117252c6ed112bc3a4a8c1eabc531a9a50125deddd8732a2ce740304f7d576e1568
|
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>perl</herd>
|
||||
<upstream>
|
||||
<remote-id type="cpan">Business-ISBN</remote-id>
|
||||
<remote-id type="cpan-module">Business::ISBN</remote-id>
|
||||
<remote-id type="cpan-module">Business::ISBN10</remote-id>
|
||||
<remote-id type="cpan-module">Business::ISBN13</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue