root
11 years ago
parent
3efd46db0d
commit
db23ea5c51
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
|
||||
<herd>ruby</herd>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
|
||||
DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
|
||||
DIST system-config-printer-1.4.1.tar.xz 885832 SHA256 4e22413f3581fc1cf38af648573fa90bb7783a2c3b8be3aadf47beda101e04f8 SHA512 ae9c64eb5af34c54a38999eeac2bc5dc9972b6b78a28bc397aae5159893b956417e71b547648b22d4d225e84b1a450854e88819e803d56ad482316fe3b288159 WHIRLPOOL f0db2e55b2ff10659ef65509d6deb8f3df5192c92642568ca454511ed9d8c0bf4c6766581f83c311a951e1e959c443648172e2597734ef32ba4b05f8ea0ee798
|
||||
|
||||
@ -0,0 +1,180 @@
|
||||
--- a/Makefile.am 2013-08-11 23:10:53.838280533 +0200
|
||||
+++ b/Makefile.am 2013-08-11 23:31:55.429404471 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
-CFLAGS=-g -O2 -Wall
|
||||
+AM_CFLAGS=-Wall
|
||||
|
||||
SUBDIRS=po
|
||||
|
||||
EXPORT_MODULES= \
|
||||
@@ -84,87 +82,21 @@
|
||||
rm -f .stamp-distutils-in-builddir
|
||||
|
||||
nobase_pkgdata_SCRIPTS= \
|
||||
- check-device-ids.py \
|
||||
- pysmb.py \
|
||||
- scp-dbus-service.py \
|
||||
- system-config-printer.py \
|
||||
- install-printerdriver.py \
|
||||
- troubleshoot/__init__.py \
|
||||
- applet.py
|
||||
+ check-device-ids.py
|
||||
|
||||
nobase_pkgdata_DATA= \
|
||||
- asyncconn.py \
|
||||
- asyncipp.py \
|
||||
- asyncpk1.py \
|
||||
- authconn.py \
|
||||
config.py \
|
||||
- cupspk.py \
|
||||
debug.py \
|
||||
dnssdresolve.py \
|
||||
- errordialogs.py \
|
||||
- HIG.py \
|
||||
firewallsettings.py \
|
||||
- gui.py \
|
||||
- gtkinklevel.py \
|
||||
installpackage.py \
|
||||
- jobviewer.py \
|
||||
monitor.py \
|
||||
- newprinter.py \
|
||||
- options.py \
|
||||
- optionwidgets.py \
|
||||
PhysicalDevice.py \
|
||||
- ppdcache.py \
|
||||
ppdippstr.py \
|
||||
- ppdsloader.py \
|
||||
- printerproperties.py \
|
||||
probe_printer.py \
|
||||
SearchCriterion.py \
|
||||
- serversettings.py \
|
||||
smburi.py \
|
||||
statereason.py \
|
||||
- timedops.py \
|
||||
- ToolbarSearchEntry.py \
|
||||
- userdefault.py \
|
||||
- ui/AboutDialog.ui \
|
||||
- ui/ConnectDialog.ui \
|
||||
- ui/ConnectingDialog.ui \
|
||||
- ui/InstallDialog.ui \
|
||||
- ui/JobsWindow.ui \
|
||||
- ui/NewPrinterName.ui \
|
||||
- ui/NewPrinterWindow.ui \
|
||||
- ui/PrinterPropertiesDialog.ui \
|
||||
- ui/PrintersWindow.ui \
|
||||
- ui/ServerSettingsDialog.ui \
|
||||
- ui/SMBBrowseDialog.ui \
|
||||
- ui/statusicon_popupmenu.ui \
|
||||
- ui/WaitWindow.ui \
|
||||
- icons/i-network-printer.png \
|
||||
- troubleshoot/base.py \
|
||||
- troubleshoot/CheckLocalServerPublishing.py \
|
||||
- troubleshoot/CheckNetworkServerSanity.py \
|
||||
- troubleshoot/CheckPPDSanity.py \
|
||||
- troubleshoot/CheckPrinterSanity.py \
|
||||
- troubleshoot/CheckSELinux.py \
|
||||
- troubleshoot/CheckUSBPermissions.py \
|
||||
- troubleshoot/ChooseNetworkPrinter.py \
|
||||
- troubleshoot/ChoosePrinter.py \
|
||||
- troubleshoot/DeviceListed.py \
|
||||
- troubleshoot/ErrorLogCheckpoint.py \
|
||||
- troubleshoot/ErrorLogFetch.py \
|
||||
- troubleshoot/ErrorLogParse.py \
|
||||
- troubleshoot/Locale.py \
|
||||
- troubleshoot/LocalOrRemote.py \
|
||||
- troubleshoot/NetworkCUPSPrinterShared.py \
|
||||
- troubleshoot/PrinterStateReasons.py \
|
||||
- troubleshoot/PrintTestPage.py \
|
||||
- troubleshoot/QueueNotEnabled.py \
|
||||
- troubleshoot/QueueRejectingJobs.py \
|
||||
- troubleshoot/RemoteAddress.py \
|
||||
- troubleshoot/SchedulerNotRunning.py \
|
||||
- troubleshoot/ServerFirewalled.py \
|
||||
- troubleshoot/Shrug.py \
|
||||
- troubleshoot/VerifyPackages.py \
|
||||
- troubleshoot/Welcome.py \
|
||||
xml/preferreddrivers.rng \
|
||||
xml/validate.py
|
||||
|
||||
@@ -172,20 +104,14 @@
|
||||
cupshelpers_DATA=\
|
||||
xml/preferreddrivers.xml
|
||||
|
||||
-bin_SCRIPTS= \
|
||||
- system-config-printer \
|
||||
- install-printerdriver \
|
||||
- system-config-printer-applet \
|
||||
- dbus/scp-dbus-service
|
||||
-
|
||||
if UDEV_RULES
|
||||
-udevrulesdir=$(sysconfdir)/udev/rules.d
|
||||
+udevrulesdir=$(shell pkg-config --variable=udevdir udev)/rules.d
|
||||
udevrules_DATA=udev/70-printers.rules
|
||||
udev_udev_configure_printer_SOURCES=\
|
||||
udev/udev-configure-printer.c
|
||||
-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS)
|
||||
-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
|
||||
-udevhelperdir=$(sysconfdir)/udev
|
||||
+udev_udev_configure_printer_LDADD= -lcups $(libudev_LIBS) $(libusb_LIBS) $(GLIB_LIBS)
|
||||
+udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libudev_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
|
||||
+udevhelperdir=$(shell pkg-config --variable=udevdir udev)
|
||||
udevhelper_PROGRAMS=\
|
||||
udev/udev-configure-printer
|
||||
udevhelper_SCRIPTS=\
|
||||
@@ -202,56 +128,17 @@
|
||||
|
||||
endif
|
||||
|
||||
-man_MANS= \
|
||||
- man/system-config-printer.1 \
|
||||
- man/system-config-printer-applet.1
|
||||
-
|
||||
dbus_DATA = \
|
||||
dbus/com.redhat.NewPrinterNotification.conf \
|
||||
dbus/com.redhat.PrinterDriversInstaller.conf
|
||||
dbusdir = $(sysconfdir)/dbus-1/system.d/
|
||||
|
||||
-dbusinterfaces_DATA = \
|
||||
- dbus/org.fedoraproject.Config.Printing.xml
|
||||
-dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
|
||||
-
|
||||
-dbusservices_DATA = \
|
||||
- dbus/org.fedoraproject.Config.Printing.service
|
||||
-dbusservicesdir = $(datadir)/dbus-1/services/
|
||||
-
|
||||
-desktop_DATA =\
|
||||
- system-config-printer.desktop \
|
||||
- print-applet.desktop
|
||||
desktopdir = $(datadir)/applications/
|
||||
autostartdir = $(sysconfdir)/xdg/autostart/
|
||||
|
||||
DESKTOP_VENDOR=@DESKTOPVENDOR@
|
||||
DESKTOP_PREFIX=@DESKTOPPREFIX@
|
||||
|
||||
-install-desktopDATA: $(desktop_DATA)
|
||||
- mkdir -p $(DESTDIR)$(desktopdir)
|
||||
- mkdir -p $(DESTDIR)$(desktopdir)
|
||||
- desktop-file-install $(DESKTOP_VENDOR) \
|
||||
- --dir $(DESTDIR)$(desktopdir) \
|
||||
- --add-category System \
|
||||
- --add-category Settings \
|
||||
- --add-category HardwareSettings \
|
||||
- --add-category Printing \
|
||||
- --add-category GTK \
|
||||
- system-config-printer.desktop
|
||||
- desktop-file-install $(DESKTOP_VENDOR) \
|
||||
- --dir $(DESTDIR)$(autostartdir) \
|
||||
- --add-category System \
|
||||
- --add-category Monitor \
|
||||
- --add-category GTK \
|
||||
- print-applet.desktop
|
||||
-
|
||||
-uninstall-desktopDATA:
|
||||
- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
|
||||
- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
|
||||
-
|
||||
-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
|
||||
-
|
||||
EXTRA_DIST=\
|
||||
$(nobase_pkgdata_SCRIPTS) \
|
||||
$(nobase_pkgdata_DATA) \
|
||||
@ -0,0 +1,83 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.4.1.ebuild,v 1.1 2013/08/11 20:02:07 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_COMPAT=( python2_{6,7} )
|
||||
PYTHON_REQ_USE="xml"
|
||||
|
||||
inherit autotools eutils python-single-r1 systemd
|
||||
|
||||
MY_P=${PN%-common}-${PV}
|
||||
|
||||
DESCRIPTION="Common modules of Red Hat's printer administration tool"
|
||||
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
|
||||
SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
SLOT="0"
|
||||
IUSE="doc policykit"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
# Needs cups running, bug 284005
|
||||
RESTRICT="test"
|
||||
|
||||
# system-config-printer split since 1.1.3
|
||||
#
|
||||
# Additional unhandled dependencies:
|
||||
# net-firewall/firewalld[${PYTHON_USEDEP}]
|
||||
# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
|
||||
COMMON_DEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=dev-libs/glib-2
|
||||
dev-libs/libxml2[python,${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
|
||||
dev-python/pycurl[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
net-print/cups[dbus]
|
||||
virtual/libusb:1
|
||||
>=virtual/udev-172
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-util/intltool
|
||||
virtual/pkgconfig
|
||||
doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<app-admin/system-config-printer-gnome-${PV}
|
||||
policykit? ( >=sys-auth/polkit-0.104-r1 )
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.4.1-split.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-nls \
|
||||
--with-udev-rules \
|
||||
$(systemd_with_unitdir)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
use doc && emake html
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
dodoc AUTHORS ChangeLog README
|
||||
use doc && dohtml -r html/
|
||||
|
||||
python_fix_shebang "${ED}"
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
|
||||
DIST system-config-printer-1.4.1.tar.xz 885832 SHA256 4e22413f3581fc1cf38af648573fa90bb7783a2c3b8be3aadf47beda101e04f8 SHA512 ae9c64eb5af34c54a38999eeac2bc5dc9972b6b78a28bc397aae5159893b956417e71b547648b22d4d225e84b1a450854e88819e803d56ad482316fe3b288159 WHIRLPOOL f0db2e55b2ff10659ef65509d6deb8f3df5192c92642568ca454511ed9d8c0bf4c6766581f83c311a951e1e959c443648172e2597734ef32ba4b05f8ea0ee798
|
||||
|
||||
@ -0,0 +1,177 @@
|
||||
--- a/Makefile.am 2013-08-11 23:49:07.085505820 +0200
|
||||
+++ b/Makefile.am 2013-08-11 23:51:57.027522515 +0200
|
||||
@@ -1,90 +1,8 @@
|
||||
-CFLAGS=-g -O2 -Wall
|
||||
+AM_CFLAGS=-Wall
|
||||
|
||||
SUBDIRS=po
|
||||
|
||||
-EXPORT_MODULES= \
|
||||
- cupshelpers/__init__.py \
|
||||
- cupshelpers/cupshelpers.py \
|
||||
- cupshelpers/installdriver.py \
|
||||
- cupshelpers/ppds.py \
|
||||
- cupshelpers/openprinting.py \
|
||||
- cupshelpers/xmldriverprefs.py
|
||||
-
|
||||
-EXPORT_MODULES_GEN= \
|
||||
- cupshelpers/config.py
|
||||
-
|
||||
-### Automake hooks for Distutils.
|
||||
-# The distutils module doesn't understand srcdir != builddir,
|
||||
-# so we copy in, along with the cupshelpers modules, into
|
||||
-# the builddir for 'all', 'install-exec', and 'clean' hooks.
|
||||
-.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES)
|
||||
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \
|
||||
- cp $(top_srcdir)/setup.py .; \
|
||||
- $(mkdir_p) cupshelpers; \
|
||||
- for file in $(EXPORT_MODULES); do \
|
||||
- cp $(top_srcdir)/$$file $$file; \
|
||||
- done; \
|
||||
- fi
|
||||
- touch .stamp-distutils-in-builddir
|
||||
-
|
||||
-dist-hook: mk-ChangeLog
|
||||
-.PHONE: mk-ChangeLog
|
||||
-mk-ChangeLog:
|
||||
- if test -d .git; then \
|
||||
- $(top_srcdir)/gitlog-to-changelog \
|
||||
- --since=2009-05-01 -- --no-merges \
|
||||
- > $(distdir)/cl ; \
|
||||
- mv -f $(distdir)/cl $(distdir)/ChangeLog ; \
|
||||
- fi
|
||||
-
|
||||
-config.py: config.py.in Makefile
|
||||
- sed \
|
||||
- -e "s|\@prefix\@|$(prefix)|" \
|
||||
- -e "s|\@datadir\@|$(datadir)|" \
|
||||
- -e "s|\@localedir\@|$(localedir)|" \
|
||||
- -e "s|\@VERSION\@|$(VERSION)|" \
|
||||
- -e "s|\@PACKAGE\@|$(PACKAGE)|" \
|
||||
- $< > $@
|
||||
-
|
||||
-cupshelpers/config.py: cupshelpers/config.py.in Makefile
|
||||
- $(mkdir_p) cupshelpers
|
||||
- sed \
|
||||
- -e "s|\@prefix\@|$(prefix)|" \
|
||||
- -e "s|\@sysconfdir\@|$(sysconfdir)|" \
|
||||
- -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \
|
||||
- $< > $@
|
||||
-
|
||||
-# Use distutils to build the module.
|
||||
-all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py
|
||||
- $(PYTHON) setup.py build
|
||||
-
|
||||
-# Use distutils to install the module.
|
||||
-install-exec-local: .stamp-distutils-in-builddir
|
||||
- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
|
||||
-
|
||||
-# Uninstall the module, crossing our fingers that we know enough
|
||||
-# about how distutils works to do this. Unfortunately, distutils
|
||||
-# doesn't provide a way to do this itself.
|
||||
-uninstall-local:
|
||||
- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info
|
||||
- for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \
|
||||
- rm -f $(DESTDIR)/$(pythondir)/$$file*; \
|
||||
- done
|
||||
-
|
||||
-# Tell distutils to clean up.
|
||||
-clean-local:
|
||||
- -$(PYTHON) setup.py clean --all
|
||||
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \
|
||||
- rm -f setup.py; \
|
||||
- for file in $(EXPORT_MODULES) \
|
||||
- $(EXPORT_MODULES_GEN); do \
|
||||
- rm -f $$file*; \
|
||||
- done; \
|
||||
- fi
|
||||
- rm -f .stamp-distutils-in-builddir
|
||||
-
|
||||
nobase_pkgdata_SCRIPTS= \
|
||||
- check-device-ids.py \
|
||||
pysmb.py \
|
||||
scp-dbus-service.py \
|
||||
system-config-printer.py \
|
||||
@@ -97,31 +15,19 @@
|
||||
asyncipp.py \
|
||||
asyncpk1.py \
|
||||
authconn.py \
|
||||
- config.py \
|
||||
cupspk.py \
|
||||
- debug.py \
|
||||
- dnssdresolve.py \
|
||||
errordialogs.py \
|
||||
HIG.py \
|
||||
- firewallsettings.py \
|
||||
gui.py \
|
||||
gtkinklevel.py \
|
||||
- installpackage.py \
|
||||
jobviewer.py \
|
||||
- monitor.py \
|
||||
newprinter.py \
|
||||
options.py \
|
||||
optionwidgets.py \
|
||||
- PhysicalDevice.py \
|
||||
ppdcache.py \
|
||||
- ppdippstr.py \
|
||||
ppdsloader.py \
|
||||
printerproperties.py \
|
||||
- probe_printer.py \
|
||||
- SearchCriterion.py \
|
||||
serversettings.py \
|
||||
- smburi.py \
|
||||
- statereason.py \
|
||||
timedops.py \
|
||||
ToolbarSearchEntry.py \
|
||||
userdefault.py \
|
||||
@@ -164,9 +70,7 @@
|
||||
troubleshoot/ServerFirewalled.py \
|
||||
troubleshoot/Shrug.py \
|
||||
troubleshoot/VerifyPackages.py \
|
||||
- troubleshoot/Welcome.py \
|
||||
- xml/preferreddrivers.rng \
|
||||
- xml/validate.py
|
||||
+ troubleshoot/Welcome.py
|
||||
|
||||
cupshelpersdir=$(sysconfdir)/cupshelpers
|
||||
cupshelpers_DATA=\
|
||||
@@ -178,39 +82,10 @@
|
||||
system-config-printer-applet \
|
||||
dbus/scp-dbus-service
|
||||
|
||||
-if UDEV_RULES
|
||||
-udevrulesdir=$(sysconfdir)/udev/rules.d
|
||||
-udevrules_DATA=udev/70-printers.rules
|
||||
-udev_udev_configure_printer_SOURCES=\
|
||||
- udev/udev-configure-printer.c
|
||||
-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS)
|
||||
-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
|
||||
-udevhelperdir=$(sysconfdir)/udev
|
||||
-udevhelper_PROGRAMS=\
|
||||
- udev/udev-configure-printer
|
||||
-udevhelper_SCRIPTS=\
|
||||
- udev/udev-add-printer
|
||||
-
|
||||
-if HAVE_SYSTEMD
|
||||
-%.service: %.service.in
|
||||
- $(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@
|
||||
-systemdsystemunit_DATA = \
|
||||
- udev/configure-printer@.service
|
||||
-CLEANFILES = \
|
||||
- $(systemdsystemunit_DATA)
|
||||
-endif
|
||||
-
|
||||
-endif
|
||||
-
|
||||
man_MANS= \
|
||||
man/system-config-printer.1 \
|
||||
man/system-config-printer-applet.1
|
||||
|
||||
-dbus_DATA = \
|
||||
- dbus/com.redhat.NewPrinterNotification.conf \
|
||||
- dbus/com.redhat.PrinterDriversInstaller.conf
|
||||
-dbusdir = $(sysconfdir)/dbus-1/system.d/
|
||||
-
|
||||
dbusinterfaces_DATA = \
|
||||
dbus/org.fedoraproject.Config.Printing.xml
|
||||
dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
|
||||
@ -0,0 +1,102 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.1.ebuild,v 1.1 2013/08/11 20:05:15 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_COMPAT=( python2_{6,7} )
|
||||
PYTHON_REQ_USE="xml"
|
||||
|
||||
inherit autotools eutils fdo-mime python-single-r1 versionator
|
||||
|
||||
MY_P="${PN%-gnome}-${PV}"
|
||||
MY_V="$(get_version_component_range 1-2)"
|
||||
|
||||
DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
|
||||
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
|
||||
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/${MY_V}/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
SLOT="0"
|
||||
IUSE="gnome-keyring"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
# Needs cups running, bug 284005
|
||||
RESTRICT="test"
|
||||
|
||||
# Additional unhandled dependencies
|
||||
# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
|
||||
# python samba client: smbc
|
||||
# selinux: needed for troubleshooting
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
~app-admin/system-config-printer-common-${PV}
|
||||
dev-python/pycairo[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
x11-libs/gtk+:3[introspection]
|
||||
x11-libs/libnotify[introspection]
|
||||
x11-libs/pango[introspection]
|
||||
gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
>=app-text/xmlto-0.0.22
|
||||
dev-util/desktop-file-utils
|
||||
dev-util/intltool
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu
|
||||
he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl
|
||||
pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
|
||||
for X in ${APP_LINGUAS}; do
|
||||
IUSE="${IUSE} linguas_${X}"
|
||||
done
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
# Bug 471472
|
||||
MAKEOPTS+=" -j1"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.4.1-split.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# Disable installation of translations when LINGUAS not chosen
|
||||
if [[ -z "${LINGUAS}" ]]; then
|
||||
myconf="${myconf} --disable-nls"
|
||||
else
|
||||
myconf="${myconf} --enable-nls"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--with-desktop-vendor=Gentoo \
|
||||
--without-udev-rules \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc AUTHORS ChangeLog README || die "dodoc failed"
|
||||
|
||||
emake DESTDIR="${ED}" install || die "emake install failed"
|
||||
|
||||
python_fix_shebang "${ED}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
--- a/src/whowatch.c
|
||||
+++ b/src/whowatch.c
|
||||
@@ -436,12 +436,12 @@
|
||||
gettimeofday(&after, 0);
|
||||
tv.tv_sec -= (after.tv_sec - before.tv_sec);
|
||||
if(retval > 0) {
|
||||
- int key = read_key();
|
||||
+ int key = getkey();
|
||||
key_action(key);
|
||||
}
|
||||
if(tv.tv_sec <= 0) {
|
||||
ticks++;
|
||||
- periodic();
|
||||
+ main_periodic();
|
||||
tv.tv_sec = TIMEOUT;
|
||||
}
|
||||
#endif
|
||||
@ -1,5 +1,4 @@
|
||||
DIST dpkg_1.16.10.tar.xz 3703340 SHA256 aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2 SHA512 cd7b1159c2071f48f2e369e03b8a3d1f00366bcdabab2ef4c33700e8f3230db5c9991e5937331f7f66f616d2bb798efec12e572af5724e1c9809beb9d5ae627e WHIRLPOOL 5d54eedf2b90f35ea9ee7b5c1bdc6ddc2a3054c893cddb048598d85a6f6a5ea846879d5c1181432bffc0268b404408a6d2d40bce0cfd49784e5b6bca703bae44
|
||||
DIST dpkg_1.16.8.tar.xz 3601652 SHA256 4a1f4611390d93f1f198d910d3a4e4913b3cf81702b31f585a1872ca98df0eaa SHA512 d16b8bffbadc483353522f5dad9481aa8b10418c461bb808873845b629c092c52b130f977a6bc37661564b2651ba4006865868aa4b5051917f75c36fd1ae7b24 WHIRLPOOL 255e5f27a20f111902a76d51a7f4ac21eaad8a49c0000d548cb823b976b8f3858ba1ae961a6da85bd7eca08fa8db52376cdbcdef0a86f0779e6d8dd187b830c3
|
||||
DIST dpkg_1.16.9.tar.xz 3697752 SHA256 73cd7fba4e54acddd645346b4bc517030b9c35938e82215d3eeb8b4e7af26b7a SHA512 33bee7fc069361f81523e95fff4a90a173cd58872dd79c879d612975a8e3b979b94bad3b7d0cd8cca53885c97577ffc020462c488178718991d4993410a881b6 WHIRLPOOL 1d7b558dce1a005b833d73ff9eb84b2e6cd02ea5ddbfc40405b7121c8dfbdb8d284e4bd960fdd572c4f625ae3ef857c615b6db905ebc20267e30454a62dd29cc
|
||||
DIST dpkg_1.17.0.tar.xz 3783600 SHA256 a424cae7e94c98c3f700dc40eea6bc66ab7a14183c7d6efd2992de8261701352 SHA512 74ac89df6577503b39c83c899514b4a4755b2c158bcf567b3b0632b627927bc3fb07d0a1d946600640e9c2b64a7010c6da84318dc16d7a43abd46e36743ecfb8 WHIRLPOOL fab86c3b18404c569c1fe877d439f03213ae44abc273c5a5c8c0167482a1a1a98e5c0a1aa385728b642778d1b16319b9616d63d48d4d294df4a16d54e2c005c4
|
||||
DIST dpkg_1.17.1.tar.xz 3785620 SHA256 8912ea77bc9c14297c0a340f5f461fbd212582ce814e1805d1d0436ca885e3a1 SHA512 e5710f21c4118e43d0240587be13f4a6c5e17b442c332c4b79ae032841e7db1ae043b5eec15e8bd3653dd93632e9ba1753f5bb53d26e2a6ded99a0d56d0cfeeb WHIRLPOOL ef6724328f4cb5c4b29514f165895fb25a089cf42f02a441e012e7e2e202bf6342fde502e52365af6186b805857b2129a0b7e430e7d0fd55ff1f05e3130148bb
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.0.ebuild,v 1.1 2013/07/27 13:21:53 jer Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils multilib autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Package maintenance system for Debian"
|
||||
HOMEPAGE="http://packages.qa.debian.org/dpkg"
|
||||
SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE="+bzip2 dselect +lzma nls test unicode +update-alternatives +zlib"
|
||||
REQUIRED_USE="dselect? ( nls )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-lang/perl-5.6.0
|
||||
dev-perl/TimeDate
|
||||
>=sys-libs/ncurses-5.2-r7
|
||||
lzma? ( app-arch/xz-utils )
|
||||
zlib? ( >=sys-libs/zlib-1.1.4 )
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
app-arch/xz-utils
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
nls? (
|
||||
app-text/po4a
|
||||
sys-devel/gettext
|
||||
)
|
||||
test? (
|
||||
dev-perl/DateTime-Format-DateParse
|
||||
dev-perl/IO-String
|
||||
dev-perl/Test-Pod
|
||||
)
|
||||
"
|
||||
|
||||
DOCS=( ChangeLog THANKS TODO )
|
||||
|
||||
src_prepare() {
|
||||
# do not expect Debian's gzip --rsyncable extension
|
||||
epatch "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
|
||||
|
||||
# Force the use of the running bash for get-version (this file is never
|
||||
# installed, so no need to worry about hardcoding a temporary bash)
|
||||
sed -i -e '1c\#!'"${BASH}" get-version || die
|
||||
|
||||
# this test depends on a Debian only gzip extension that adds --rsyncable
|
||||
# which will therefore always fail on Gentoo. (bug #310847).
|
||||
sed -i scripts/Makefile.am \
|
||||
-e '/850_Dpkg_Compression.t/d' \
|
||||
|| die "sed failed"
|
||||
|
||||
# test fails (bug #414095)
|
||||
sed -i utils/Makefile.am \
|
||||
-e '/^test_cases/d;/100_update_alternatives/d' || die
|
||||
|
||||
use nls && strip-linguas -i po
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
econf \
|
||||
$(use_enable dselect) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable unicode) \
|
||||
$(use_enable update-alternatives) \
|
||||
$(use_with bzip2 bz2) \
|
||||
$(use_with zlib) \
|
||||
$(use_with lzma liblzma) \
|
||||
--disable-compiler-optimisations \
|
||||
--disable-compiler-warnings \
|
||||
--disable-linker-optimisations \
|
||||
--disable-silent-rules \
|
||||
--disable-start-stop-daemon \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--without-selinux
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake AR=$(tc-getAR)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
|
||||
keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST p7zip_9.13_src_all.tar.bz2 3753579 SHA256 fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923 SHA512 84b6687fc33af55c7f282fc6c988789cbdd0b3d2df0adb1c14b6ad12ebc2ed4600ddf6b043d2d8f2baa717ee8afc3601f7e9e37c5d44d6357727bf3a36686e11 WHIRLPOOL 886ba23a09e8aab3b92cd870dda5aa876638c3b7149155b3c8eb1031b94e262f2254ebd575ca42c42e57789ccfff6ab4289937c952373947bd61ec8f92e7370a
|
||||
DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
|
||||
|
||||
@ -1,152 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r3.ebuild,v 1.4 2012/06/07 16:29:50 hasufell Exp $
|
||||
|
||||
EAPI="2"
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils toolchain-funcs multilib wxwidgets
|
||||
|
||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="doc kde rar +pch static wxwidgets"
|
||||
|
||||
RDEPEND="
|
||||
kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
|
||||
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}/${PN}_${PV}
|
||||
|
||||
pkg_setup() {
|
||||
use wxwidgets && wxwidgets_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-QA.patch
|
||||
|
||||
if ! use pch; then
|
||||
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
|
||||
fi
|
||||
|
||||
# Being able to use native multilib
|
||||
sed \
|
||||
-e 's:-m32 ::g' \
|
||||
-e 's:-m64 ::g' \
|
||||
-i makefile* || die
|
||||
|
||||
sed \
|
||||
-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \
|
||||
-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \
|
||||
-i makefile* || die
|
||||
if use kde && ! use wxwidgets ; then
|
||||
einfo "USE-flag kde needs wxwidgets flag"
|
||||
einfo "silently enabling wxwidgets flag"
|
||||
fi
|
||||
|
||||
# remove non-free RAR codec
|
||||
if use rar; then
|
||||
ewarn "Enabling nonfree RAR decompressor"
|
||||
else
|
||||
sed -e '/Rar/d' -i makefile*
|
||||
rm -rf CPP/7zip/Compress/Rar
|
||||
epatch "${FILESDIR}"/9.04-makefile.patch
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e "/^CXX=/s:g++:$(tc-getCXX):" \
|
||||
-e "/^CC=/s:gcc:$(tc-getCC):" \
|
||||
-e '/ALLFLAGS/s:-s ::' \
|
||||
makefile* || die "changing makefiles"
|
||||
|
||||
if use amd64; then
|
||||
cp -f makefile.linux_amd64 makefile.machine
|
||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# Mac OS X needs this special makefile, because it has a non-GNU linker
|
||||
[[ ${CHOST} == *64-* ]] \
|
||||
&& cp -f makefile.macosx_64bits makefile.machine \
|
||||
|| cp -f makefile.macosx_32bits makefile.machine
|
||||
# bundles have extension .bundle but don't die because USE=-rar
|
||||
# removes the Rar directory
|
||||
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
|
||||
CPP/Windows/DLL.cpp || die
|
||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
||||
CPP/7zip/Bundles/Format7zFree/makefile \
|
||||
$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
|
||||
elif use x86-fbsd; then
|
||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
||||
fi
|
||||
use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine
|
||||
|
||||
# We can be more parallel
|
||||
cp -f makefile.parallel_jobs makefile
|
||||
|
||||
epatch "${FILESDIR}"/9.04-kde4.patch
|
||||
|
||||
if use kde || use wxwidgets; then
|
||||
einfo "Preparing dependency list"
|
||||
emake depend || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake all3 || die "compilation error"
|
||||
if use kde || use wxwidgets; then
|
||||
emake 7zG || die "error building GUI"
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake test_7z test_7zr || die "test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
||||
|
||||
if use kde || use wxwidgets; then
|
||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
||||
|
||||
dobin GUI/p7zipForFilemanager
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
doexe bin/7zG
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}
|
||||
doins -r GUI/{Lang,help}
|
||||
|
||||
if use kde; then
|
||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
||||
newins GUI/p7zip_16_ok.png p7zip.png
|
||||
|
||||
insinto /usr/share/kde4/services/ServiceMenus
|
||||
doins GUI/kde/*.desktop
|
||||
fi
|
||||
fi
|
||||
|
||||
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip || die
|
||||
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 || die
|
||||
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
|
||||
doexe bin/*$(get_modname) || die "doexe *$(get_modname) files"
|
||||
if use rar; then
|
||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
||||
doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) files"
|
||||
fi
|
||||
|
||||
doman man1/7z.1 man1/7za.1 man1/7zr.1 || die
|
||||
dodoc ChangeLog README TODO || die
|
||||
|
||||
if use doc; then
|
||||
dodoc DOCS/*.txt
|
||||
dohtml -r DOCS/MANUAL/*
|
||||
fi
|
||||
}
|
||||
@ -1,140 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13.ebuild,v 1.11 2012/06/07 16:29:50 hasufell Exp $
|
||||
|
||||
EAPI="2"
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils flag-o-matic toolchain-funcs multilib wxwidgets
|
||||
|
||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="doc kde rar static wxwidgets"
|
||||
|
||||
RDEPEND="
|
||||
kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
|
||||
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}/${PN}_${PV}
|
||||
|
||||
pkg_setup() {
|
||||
use wxwidgets && wxwidgets_pkg_setup
|
||||
append-flags -fno-strict-aliasing
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-QA.patch
|
||||
|
||||
if use kde && ! use wxwidgets ; then
|
||||
einfo "USE-flag kde needs wxwidgets flag"
|
||||
einfo "silently enabling wxwidgets flag"
|
||||
fi
|
||||
|
||||
# remove non-free RAR codec
|
||||
if use rar; then
|
||||
ewarn "Enabling nonfree RAR decompressor"
|
||||
else
|
||||
sed -e '/Rar/d' -i makefile*
|
||||
rm -rf CPP/7zip/Compress/Rar
|
||||
epatch "${FILESDIR}"/9.04-makefile.patch
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e "/^CXX=/s:g++:$(tc-getCXX):" \
|
||||
-e "/^CC=/s:gcc:$(tc-getCC):" \
|
||||
-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
|
||||
-e '/ALLFLAGS/s:-s ::' \
|
||||
makefile* || die "changing makefiles"
|
||||
|
||||
if use amd64; then
|
||||
cp -f makefile.linux_amd64 makefile.machine
|
||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# Mac OS X needs this special makefile, because it has a non-GNU linker
|
||||
[[ ${CHOST} == *64-* ]] \
|
||||
&& cp -f makefile.macosx_64bits makefile.machine \
|
||||
|| cp -f makefile.macosx_32bits makefile.machine
|
||||
# bundles have extension .bundle but don't die because USE=-rar
|
||||
# removes the Rar directory
|
||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
||||
CPP/7zip/Bundles/Format7zFree/makefile \
|
||||
CPP/7zip/Compress/Rar/makefile
|
||||
elif use x86-fbsd; then
|
||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
||||
fi
|
||||
use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine
|
||||
|
||||
# We can be more parallel
|
||||
cp -f makefile.parallel_jobs makefile
|
||||
|
||||
epatch "${FILESDIR}"/9.04-kde4.patch
|
||||
|
||||
if use kde || use wxwidgets; then
|
||||
einfo "Preparing dependency list"
|
||||
emake depend || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake all3 || die "compilation error"
|
||||
if use kde || use wxwidgets; then
|
||||
emake 7zG || die "error building GUI"
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake test_7z test_7zr || die "test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
||||
|
||||
if use kde || use wxwidgets; then
|
||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
||||
|
||||
dobin GUI/p7zipForFilemanager
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
doexe bin/7zG
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}
|
||||
doins -r GUI/{Lang,help}
|
||||
|
||||
if use kde; then
|
||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
||||
newins GUI/p7zip_16_ok.png p7zip.png
|
||||
|
||||
insinto /usr/share/kde4/services/ServiceMenus
|
||||
doins GUI/kde/*.desktop
|
||||
fi
|
||||
fi
|
||||
|
||||
dobin "${FILESDIR}/p7zip" || die
|
||||
|
||||
# gzip introduced in 4.42, so beware :)
|
||||
newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die
|
||||
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
|
||||
doexe bin/*$(get_modname) || die "doexe *$(get_modname) files"
|
||||
if use rar; then
|
||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
||||
doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) files"
|
||||
fi
|
||||
|
||||
doman man1/7z.1 man1/7za.1 man1/7zr.1
|
||||
dodoc ChangeLog README TODO
|
||||
|
||||
if use doc; then
|
||||
dodoc DOCS/*.txt
|
||||
dohtml -r DOCS/MANUAL/*
|
||||
fi
|
||||
}
|
||||
@ -1,4 +1,2 @@
|
||||
DIST qemu-1.2.0.tar.bz2 9865186 SHA256 c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 SHA512 b590ea4ff484abc1abf2d3ec3fb294d4ece24d2dfa0a179d9c5f60baca0ea474d47a560f5d95b010a53a5563793414f3257240c5e9917a8d0f556a2066ccd60e WHIRLPOOL 5e5a5f09b828b0aff6139d7efad4dd0d1ed8d86badc2657f7ea53352aa1dbb6e6e227501f7ab63f7e95ee248007942ae94431b7f99092a4ed7005c345b10ca4e
|
||||
DIST qemu-1.4.2.tar.bz2 10416877 SHA256 acae6c92b740ff89c0e31eca23338d4abd733432e51b081017757579b30ecf90 SHA512 aa296b3d06321c81b32fdd2fdcdf07f3c377123f18eadca977335592b64a4f2417eea421fe417b57e468741f707bda31ba907364d762983393272997fdef8999 WHIRLPOOL 782f3c6d8776210450a0c0ac24942d8e1c41995aeb8e910add704f8f6d95ae3392ee942c6b661d4674367d0e443453c7f29356b2b4c71be4ffed54436f90de8a
|
||||
DIST qemu-1.5.2-e26b4ba6.tar.xz 21348 SHA256 877cc321b3bd5e30aaa7a481b359e16845ad731927a49df1fb2d5b0cfbfd0ad6 SHA512 1f015c5d9ca37475bddf9d474255b10ae3f03d01280270211deb1195a2ef288e6a1bbff9490cb4173a7af4b02787469278816fd5dee69d8e11d601b5a46b0e53 WHIRLPOOL 86a249c1339bb241a1534e5047bab696b8c26ad491eda073ee57ce1f9104df54ab7e251cd5ad9568a1381307b118029b7619bf689dec36f454d3f77f2f2f402a
|
||||
DIST qemu-1.5.2.tar.bz2 11932902 SHA256 f661147d190ab8432045058a660d810f13dc528fe7017ce578e9f2da2997a250 SHA512 cae47d34b99d3d3ded688b5a434ba69a377a838dddd367d10e4a71cd697305870c9671e4291490c0028b8143870b0998469e508cd28922fbebd8ea5f86f591b9 WHIRLPOOL bd5e8063c40e3e2fc43934e3649562f594f249002209bf09e05fda06155d423587d714862c8b55f9b2621f3ce20154f4e81b5c73df65ef2513ae824ae5bbcee9
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild,v 1.3 2013/02/10 21:47:50 cardoe Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit systemd udev python
|
||||
|
||||
MY_PN="qemu"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
|
||||
HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
|
||||
|
||||
LICENSE="GPL-2 BSD-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=dev-libs/glib-2.22"
|
||||
RDEPEND="${DEPEND}
|
||||
!<app-emulation/qemu-1.1.1-r1"
|
||||
PYTHON_DEPEND="2:2.4"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./configure --python=python2
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake qemu-ga
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin qemu-ga
|
||||
|
||||
# Normal init stuff
|
||||
newinitd "${FILESDIR}/qemu-ga.init" qemu-guest-agent
|
||||
newconfd "${FILESDIR}/qemu-ga.conf" qemu-guest-agent
|
||||
|
||||
insinto /etc/logrotate.d/
|
||||
newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
|
||||
|
||||
# systemd stuff
|
||||
udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
|
||||
|
||||
systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
|
||||
qemu-guest-agent.service
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "You should add 'qemu-guest-agent' to the default runlevel."
|
||||
elog "e.g. rc-update add qemu-guest-agent default"
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.4.2.ebuild,v 1.1 2013/06/03 02:16:12 cardoe Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
|
||||
|
||||
inherit systemd udev python-r1
|
||||
|
||||
MY_PN="qemu"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
|
||||
HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
|
||||
|
||||
LICENSE="GPL-2 BSD-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.22
|
||||
!<app-emulation/qemu-1.1.1-r1"
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
python_export_best
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./configure --python=${PYTHON}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake qemu-ga
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin qemu-ga
|
||||
|
||||
# Normal init stuff
|
||||
newinitd "${FILESDIR}/qemu-ga.init" qemu-guest-agent
|
||||
newconfd "${FILESDIR}/qemu-ga.conf" qemu-guest-agent
|
||||
|
||||
insinto /etc/logrotate.d/
|
||||
newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
|
||||
|
||||
# systemd stuff
|
||||
udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
|
||||
|
||||
systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
|
||||
qemu-guest-agent.service
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "You should add 'qemu-guest-agent' to the default runlevel."
|
||||
elog "e.g. rc-update add qemu-guest-agent default"
|
||||
|
||||
if has_version '<sys-apps/sysvinit-2.88-r5'; then
|
||||
ewarn "The guest shutdown command will not work with <=sysvinit-2.88-r4"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,828 @@
|
||||
diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
|
||||
index 2dd83fe..d945749 100644
|
||||
--- a/vmblock-only/linux/control.c
|
||||
+++ b/vmblock-only/linux/control.c
|
||||
@@ -208,9 +208,10 @@ SetupProcDevice(void)
|
||||
VMBlockSetProcEntryOwner(controlProcMountpoint);
|
||||
|
||||
/* Create /proc/fs/vmblock/dev */
|
||||
- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
|
||||
- VMBLOCK_CONTROL_MODE,
|
||||
- controlProcDirEntry);
|
||||
+ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
|
||||
+ VMBLOCK_CONTROL_MODE,
|
||||
+ controlProcDirEntry,
|
||||
+ &ControlFileOps);
|
||||
if (!controlProcEntry) {
|
||||
Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
|
||||
remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
|
||||
@@ -218,7 +219,6 @@ SetupProcDevice(void)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- controlProcEntry->proc_fops = &ControlFileOps;
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/vmnet-only/bridge.c b/vmnet-only/bridge.c
|
||||
index 10eaa41..6fdc19e 100644
|
||||
--- a/vmnet-only/bridge.c
|
||||
+++ b/vmnet-only/bridge.c
|
||||
@@ -105,8 +105,6 @@ static Bool VNetBridgeCycleDetect(VNetJack *this, int generation);
|
||||
static Bool VNetBridgeIsDeviceWireless(struct net_device *dev);
|
||||
static void VNetBridgePortsChanged(VNetJack *this);
|
||||
static int VNetBridgeIsBridged(VNetJack *this);
|
||||
-static int VNetBridgeProcRead(char *page, char **start, off_t off,
|
||||
- int count, int *eof, void *data);
|
||||
static void VNetBridgeComputeHeaderPosIPv6(struct sk_buff *skb);
|
||||
static PacketStatus VNetCallSMACFunc(struct SMACState *state,
|
||||
struct sk_buff **skb, void *startOfData,
|
||||
@@ -225,6 +223,53 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
+ * VNetBridgeProcShow --
|
||||
+ *
|
||||
+ * Callback for read operation on this bridge entry in vnets proc fs.
|
||||
+ *
|
||||
+ * Results:
|
||||
+ * Length of read operation.
|
||||
+ *
|
||||
+ * Side effects:
|
||||
+ * None.
|
||||
+ *
|
||||
+ *----------------------------------------------------------------------
|
||||
+ */
|
||||
+
|
||||
+int
|
||||
+VNetBridgeProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
|
||||
+ void *data) // IN: client data - pointer to bridge
|
||||
+{
|
||||
+ VNetBridge *bridge = (VNetBridge*)data;
|
||||
+
|
||||
+ if (!bridge) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ VNetPrintPort(&bridge->port, seqf);
|
||||
+
|
||||
+ seq_printf(seqf, "dev %s ", bridge->name);
|
||||
+
|
||||
+ seq_printf(seqf, "\n");
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int proc_bridge_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return single_open(file, VNetBridgeProcShow, PDE_DATA(inode));
|
||||
+}
|
||||
+
|
||||
+static const struct file_operations proc_bridge_fops = {
|
||||
+ .open = proc_bridge_open,
|
||||
+ .read = seq_read,
|
||||
+ .llseek = seq_lseek,
|
||||
+ .release = seq_release,
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ *----------------------------------------------------------------------
|
||||
+ *
|
||||
* VNetBridge_Create --
|
||||
*
|
||||
* Creates a bridge. Allocates struct, allocates internal device,
|
||||
@@ -319,17 +364,14 @@ VNetBridge_Create(const char *devName, // IN: name of device (e.g., "eth0")
|
||||
* Make proc entry for this jack.
|
||||
*/
|
||||
|
||||
- retval = VNetProc_MakeEntry(bridge->port.jack.name, S_IFREG,
|
||||
- &bridge->port.jack.procEntry);
|
||||
+ retval = VNetProc_MakeEntryOps(bridge->port.jack.name, S_IFREG,
|
||||
+ &bridge->port.jack.procEntry, &proc_bridge_fops, bridge);
|
||||
if (retval) {
|
||||
if (retval == -ENXIO) {
|
||||
bridge->port.jack.procEntry = NULL;
|
||||
} else {
|
||||
goto out;
|
||||
}
|
||||
- } else {
|
||||
- bridge->port.jack.procEntry->read_proc = VNetBridgeProcRead;
|
||||
- bridge->port.jack.procEntry->data = bridge;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1719,45 +1761,3 @@ VNetBridgeReceiveFromDev(struct sk_buff *skb, // IN: packet to receive
|
||||
return 0;
|
||||
}
|
||||
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetBridgeProcRead --
|
||||
- *
|
||||
- * Callback for read operation on this bridge entry in vnets proc fs.
|
||||
- *
|
||||
- * Results:
|
||||
- * Length of read operation.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetBridgeProcRead(char *page, // IN/OUT: buffer to write into
|
||||
- char **start, // OUT: 0 if file < 4k, else offset into page
|
||||
- off_t off, // IN: (unused) offset of read into the file
|
||||
- int count, // IN: (unused) maximum number of bytes to read
|
||||
- int *eof, // OUT: TRUE if there is nothing more to read
|
||||
- void *data) // IN: client data - pointer to bridge
|
||||
-{
|
||||
- VNetBridge *bridge = (VNetBridge*)data;
|
||||
- int len = 0;
|
||||
-
|
||||
- if (!bridge) {
|
||||
- return len;
|
||||
- }
|
||||
-
|
||||
- len += VNetPrintPort(&bridge->port, page+len);
|
||||
-
|
||||
- len += sprintf(page+len, "dev %s ", bridge->name);
|
||||
-
|
||||
- len += sprintf(page+len, "\n");
|
||||
-
|
||||
- *start = 0;
|
||||
- *eof = 1;
|
||||
- return len;
|
||||
-}
|
||||
diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
|
||||
index b12b982..395f5ce 100644
|
||||
--- a/vmnet-only/driver.c
|
||||
+++ b/vmnet-only/driver.c
|
||||
@@ -1775,21 +1775,17 @@ VNetSetMACUnique(VNetPort *port, // IN:
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-int
|
||||
+void
|
||||
VNetPrintJack(const VNetJack *jack, // IN: jack
|
||||
- char *buf) // OUT: info about jack
|
||||
+ struct seq_file *seqf) // OUT: info about jack
|
||||
{
|
||||
- int len = 0;
|
||||
-
|
||||
read_lock(&vnetPeerLock);
|
||||
if (!jack->peer) {
|
||||
- len += sprintf(buf+len, "connected not ");
|
||||
+ seq_printf(seqf, "connected not ");
|
||||
} else {
|
||||
- len += sprintf(buf+len, "connected %s ", jack->peer->name);
|
||||
+ seq_printf(seqf, "connected %s ", jack->peer->name);
|
||||
}
|
||||
read_unlock(&vnetPeerLock);
|
||||
-
|
||||
- return len;
|
||||
}
|
||||
|
||||
|
||||
@@ -1809,52 +1805,48 @@ VNetPrintJack(const VNetJack *jack, // IN: jack
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-int
|
||||
+void
|
||||
VNetPrintPort(const VNetPort *port, // IN: port
|
||||
- char *buf) // OUT: info about port
|
||||
+ struct seq_file *seqf) // OUT: info about port
|
||||
{
|
||||
- int len = 0;
|
||||
+ VNetPrintJack(&port->jack, seqf);
|
||||
|
||||
- len += VNetPrintJack(&port->jack, buf+len);
|
||||
-
|
||||
- len += sprintf(buf+len, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
|
||||
+ seq_printf(seqf, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
|
||||
port->paddr[0], port->paddr[1], port->paddr[2],
|
||||
port->paddr[3], port->paddr[4], port->paddr[5]);
|
||||
|
||||
- len += sprintf(buf+len, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
|
||||
+ seq_printf(seqf, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
|
||||
port->ladrf[0], port->ladrf[1], port->ladrf[2],
|
||||
port->ladrf[3], port->ladrf[4], port->ladrf[5],
|
||||
port->ladrf[6], port->ladrf[7]);
|
||||
|
||||
- len += sprintf(buf+len, "flags IFF_RUNNING");
|
||||
+ seq_printf(seqf, "flags IFF_RUNNING");
|
||||
|
||||
if (port->flags & IFF_UP) {
|
||||
- len += sprintf(buf+len, ",IFF_UP");
|
||||
+ seq_printf(seqf, ",IFF_UP");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_BROADCAST) {
|
||||
- len += sprintf(buf+len, ",IFF_BROADCAST");
|
||||
+ seq_printf(seqf, ",IFF_BROADCAST");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_DEBUG) {
|
||||
- len += sprintf(buf+len, ",IFF_DEBUG");
|
||||
+ seq_printf(seqf, ",IFF_DEBUG");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_PROMISC) {
|
||||
- len += sprintf(buf+len, ",IFF_PROMISC");
|
||||
+ seq_printf(seqf, ",IFF_PROMISC");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_MULTICAST) {
|
||||
- len += sprintf(buf+len, ",IFF_MULTICAST");
|
||||
+ seq_printf(seqf, ",IFF_MULTICAST");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_ALLMULTI) {
|
||||
- len += sprintf(buf+len, ",IFF_ALLMULTI");
|
||||
+ seq_printf(seqf, ",IFF_ALLMULTI");
|
||||
}
|
||||
|
||||
- len += sprintf(buf+len, " ");
|
||||
-
|
||||
- return len;
|
||||
+ seq_printf(seqf, " ");
|
||||
}
|
||||
|
||||
|
||||
diff --git a/vmnet-only/hub.c b/vmnet-only/hub.c
|
||||
index 47f04ac..8aafb95 100644
|
||||
--- a/vmnet-only/hub.c
|
||||
+++ b/vmnet-only/hub.c
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <linux/sched.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/poll.h>
|
||||
+#include <linux/seq_file.h>
|
||||
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/etherdevice.h>
|
||||
@@ -71,8 +72,6 @@ static void VNetHubReceive(VNetJack *this, struct sk_buff *skb);
|
||||
static Bool VNetHubCycleDetect(VNetJack *this, int generation);
|
||||
static void VNetHubPortsChanged(VNetJack *this);
|
||||
static int VNetHubIsBridged(VNetJack *this);
|
||||
-static int VNetHubProcRead(char *page, char **start, off_t off,
|
||||
- int count, int *eof, void *data);
|
||||
|
||||
static VNetHub *vnetHub;
|
||||
static DEFINE_SPINLOCK(vnetHubLock);
|
||||
@@ -241,6 +240,53 @@ VNetHub_AllocPvn(uint8 id[]) // IN: the PVN ID to alloc on
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
+ * VNetHubProcShow --
|
||||
+ *
|
||||
+ * Callback for read operation on hub entry in vnets proc fs.
|
||||
+ *
|
||||
+ * Results:
|
||||
+ * Length of read operation.
|
||||
+ *
|
||||
+ * Side effects:
|
||||
+ * None.
|
||||
+ *
|
||||
+ *----------------------------------------------------------------------
|
||||
+ */
|
||||
+
|
||||
+int
|
||||
+VNetHubProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
|
||||
+ void *data) // IN: client data - not used
|
||||
+{
|
||||
+ VNetJack *jack = (VNetJack*)data;
|
||||
+ VNetHub *hub;
|
||||
+
|
||||
+ if (!jack || !jack->private) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ hub = (VNetHub*)jack->private;
|
||||
+
|
||||
+ VNetPrintJack(jack, seqf);
|
||||
+
|
||||
+ seq_printf(seqf, "tx %u ", hub->stats[jack->index].tx);
|
||||
+ seq_printf(seqf, "\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int proc_hub_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return single_open(file, VNetHubProcShow, PDE_DATA(inode));
|
||||
+}
|
||||
+
|
||||
+static const struct file_operations proc_hub_fops = {
|
||||
+ .open = proc_hub_open,
|
||||
+ .read = seq_read,
|
||||
+ .llseek = seq_lseek,
|
||||
+ .release = seq_release,
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ *----------------------------------------------------------------------
|
||||
+ *
|
||||
* VNetHubAlloc --
|
||||
*
|
||||
* Allocate a jack on this hub.
|
||||
@@ -354,7 +400,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
|
||||
* Make proc entry for this jack.
|
||||
*/
|
||||
|
||||
- retval = VNetProc_MakeEntry(jack->name, S_IFREG, &jack->procEntry);
|
||||
+ retval = VNetProc_MakeEntryOps(jack->name, S_IFREG, &jack->procEntry, &proc_hub_fops, jack);
|
||||
if (retval) {
|
||||
if (retval == -ENXIO) {
|
||||
jack->procEntry = NULL;
|
||||
@@ -362,9 +408,6 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
|
||||
hub->used[i] = FALSE;
|
||||
return NULL;
|
||||
}
|
||||
- } else {
|
||||
- jack->procEntry->read_proc = VNetHubProcRead;
|
||||
- jack->procEntry->data = jack;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -686,46 +729,3 @@ VNetHubIsBridged(VNetJack *this)
|
||||
}
|
||||
|
||||
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetHubProcRead --
|
||||
- *
|
||||
- * Callback for read operation on hub entry in vnets proc fs.
|
||||
- *
|
||||
- * Results:
|
||||
- * Length of read operation.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetHubProcRead(char *page, // IN/OUT: buffer to write into
|
||||
- char **start, // OUT: 0 if file < 4k, else offset into page
|
||||
- off_t off, // IN: offset of read into the file
|
||||
- int count, // IN: maximum number of bytes to read
|
||||
- int *eof, // OUT: TRUE if there is nothing more to read
|
||||
- void *data) // IN: client data - not used
|
||||
-{
|
||||
- VNetJack *jack = (VNetJack*)data;
|
||||
- VNetHub *hub;
|
||||
- int len = 0;
|
||||
-
|
||||
- if (!jack || !jack->private) {
|
||||
- return len;
|
||||
- }
|
||||
- hub = (VNetHub*)jack->private;
|
||||
-
|
||||
- len += VNetPrintJack(jack, page+len);
|
||||
-
|
||||
- len += sprintf(page+len, "tx %u ", hub->stats[jack->index].tx);
|
||||
-
|
||||
- len += sprintf(page+len, "\n");
|
||||
-
|
||||
- *start = 0;
|
||||
- *eof = 1;
|
||||
- return len;
|
||||
-}
|
||||
diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
|
||||
index 65f3cb9..b20f56a 100644
|
||||
--- a/vmnet-only/netif.c
|
||||
+++ b/vmnet-only/netif.c
|
||||
@@ -63,8 +63,6 @@ static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
|
||||
static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
|
||||
static int VNetNetifSetMAC(struct net_device *dev, void *addr);
|
||||
static void VNetNetifSetMulticast(struct net_device *dev);
|
||||
-static int VNetNetIfProcRead(char *page, char **start, off_t off,
|
||||
- int count, int *eof, void *data);
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
@@ -117,6 +115,53 @@ VNetNetIfSetup(struct net_device *dev) // IN:
|
||||
|
||||
}
|
||||
|
||||
+/*
|
||||
+ *----------------------------------------------------------------------
|
||||
+ *
|
||||
+ * VNetNetIfProcShow --
|
||||
+ *
|
||||
+ * Callback for read operation on this netif entry in vnets proc fs.
|
||||
+ *
|
||||
+ * Results:
|
||||
+ * Length of read operation.
|
||||
+ *
|
||||
+ * Side effects:
|
||||
+ * None.
|
||||
+ *
|
||||
+ *----------------------------------------------------------------------
|
||||
+ */
|
||||
+
|
||||
+int
|
||||
+VNetNetIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
|
||||
+ void *data) // IN: client data
|
||||
+{
|
||||
+ VNetNetIF *netIf = data;
|
||||
+
|
||||
+ if (!netIf) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ VNetPrintPort(&netIf->port, seqf);
|
||||
+
|
||||
+ seq_printf(seqf, "dev %s ", netIf->dev->name);
|
||||
+
|
||||
+ seq_printf(seqf, "\n");
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int proc_netif_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return single_open(file, VNetNetIfProcShow, PDE_DATA(inode));
|
||||
+}
|
||||
+
|
||||
+static const struct file_operations proc_netif_fops = {
|
||||
+ .open = proc_netif_open,
|
||||
+ .read = seq_read,
|
||||
+ .llseek = seq_lseek,
|
||||
+ .release = seq_release,
|
||||
+};
|
||||
+
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
@@ -201,9 +246,9 @@ VNetNetIf_Create(char *devName, // IN:
|
||||
/*
|
||||
* Make proc entry for this jack.
|
||||
*/
|
||||
-
|
||||
- retval = VNetProc_MakeEntry(netIf->port.jack.name, S_IFREG,
|
||||
- &netIf->port.jack.procEntry);
|
||||
+
|
||||
+ retval = VNetProc_MakeEntryOps(netIf->port.jack.name, S_IFREG,
|
||||
+ &netIf->port.jack.procEntry, &proc_netif_fops, netIf);
|
||||
if (retval) {
|
||||
if (retval == -ENXIO) {
|
||||
netIf->port.jack.procEntry = NULL;
|
||||
@@ -211,9 +256,6 @@ VNetNetIf_Create(char *devName, // IN:
|
||||
netIf->port.jack.procEntry = NULL;
|
||||
goto out;
|
||||
}
|
||||
- } else {
|
||||
- netIf->port.jack.procEntry->read_proc = VNetNetIfProcRead;
|
||||
- netIf->port.jack.procEntry->data = netIf;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -591,45 +633,3 @@ VNetNetifGetStats(struct net_device *dev) // IN:
|
||||
return &netIf->stats;
|
||||
}
|
||||
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetNetIfProcRead --
|
||||
- *
|
||||
- * Callback for read operation on this netif entry in vnets proc fs.
|
||||
- *
|
||||
- * Results:
|
||||
- * Length of read operation.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetNetIfProcRead(char *page, // IN/OUT: buffer to write into
|
||||
- char **start, // OUT: 0 if file < 4k, else offset into page
|
||||
- off_t off, // IN: (unused) offset of read into the file
|
||||
- int count, // IN: (unused) maximum number of bytes to read
|
||||
- int *eof, // OUT: TRUE if there is nothing more to read
|
||||
- void *data) // IN: client data
|
||||
-{
|
||||
- VNetNetIF *netIf = (VNetNetIF*)data;
|
||||
- int len = 0;
|
||||
-
|
||||
- if (!netIf) {
|
||||
- return len;
|
||||
- }
|
||||
-
|
||||
- len += VNetPrintPort(&netIf->port, page+len);
|
||||
-
|
||||
- len += sprintf(page+len, "dev %s ", netIf->devName);
|
||||
-
|
||||
- len += sprintf(page+len, "\n");
|
||||
-
|
||||
- *start = 0;
|
||||
- *eof = 1;
|
||||
- return len;
|
||||
-}
|
||||
diff --git a/vmnet-only/procfs.c b/vmnet-only/procfs.c
|
||||
index ca42ee2..fd7921e 100644
|
||||
--- a/vmnet-only/procfs.c
|
||||
+++ b/vmnet-only/procfs.c
|
||||
@@ -45,10 +45,6 @@
|
||||
|
||||
#if defined(CONFIG_PROC_FS)
|
||||
|
||||
-static int VNetProcMakeEntryInt(VNetProcEntry *parent, char *name, int mode,
|
||||
- VNetProcEntry **ret);
|
||||
-static void VNetProcRemoveEntryInt(VNetProcEntry *node, VNetProcEntry *parent);
|
||||
-
|
||||
static VNetProcEntry *base = NULL;
|
||||
|
||||
|
||||
@@ -71,7 +67,12 @@ static VNetProcEntry *base = NULL;
|
||||
int
|
||||
VNetProc_Init(void)
|
||||
{
|
||||
- return VNetProcMakeEntryInt(NULL, "vmnet", S_IFDIR, &base);
|
||||
+ base = proc_mkdir("vmnet", NULL);
|
||||
+ if(IS_ERR(base)) {
|
||||
+ base = NULL;
|
||||
+ return PTR_ERR(base);
|
||||
+ }
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -94,14 +95,14 @@ VNetProc_Init(void)
|
||||
void
|
||||
VNetProc_Cleanup(void)
|
||||
{
|
||||
- VNetProcRemoveEntryInt(base, NULL);
|
||||
+ proc_remove(base);
|
||||
base = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
- * VNetProcMakeEntryInt --
|
||||
+ * VNetProc_MakeEntryOps --
|
||||
*
|
||||
* Make an entry in the vnets proc file system.
|
||||
*
|
||||
@@ -116,72 +117,21 @@ VNetProc_Cleanup(void)
|
||||
*/
|
||||
|
||||
int
|
||||
-VNetProcMakeEntryInt(VNetProcEntry *parent, // IN:
|
||||
- char *name, // IN:
|
||||
+VNetProc_MakeEntryOps(char *name, // IN:
|
||||
int mode, // IN:
|
||||
- VNetProcEntry **ret) // OUT:
|
||||
+ VNetProcEntry **ret,
|
||||
+ const struct file_operations *fops,
|
||||
+ void *data
|
||||
+ ) // OUT:
|
||||
{
|
||||
VNetProcEntry *ent;
|
||||
- ent = create_proc_entry(name, mode, parent);
|
||||
+ ent = proc_create_data(name, mode, base, fops, data);
|
||||
*ret = ent;
|
||||
if (!ent)
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
}
|
||||
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetProcRemoveEntryInt --
|
||||
- *
|
||||
- * Remove a previously installed proc entry.
|
||||
- *
|
||||
- * Results:
|
||||
- * None.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-void
|
||||
-VNetProcRemoveEntryInt(VNetProcEntry *node,
|
||||
- VNetProcEntry *parent)
|
||||
-{
|
||||
- if (node) {
|
||||
- remove_proc_entry(node->name, parent);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetProc_MakeEntry --
|
||||
- *
|
||||
- * Make an entry in the vnets proc file system.
|
||||
- *
|
||||
- * Results:
|
||||
- * errno. If errno is 0 and ret is non NULL then ret is filled
|
||||
- * in with the resulting proc entry.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetProc_MakeEntry(char *name, // IN:
|
||||
- int mode, // IN:
|
||||
- VNetProcEntry **ret) // OUT:
|
||||
-{
|
||||
- return VNetProcMakeEntryInt(base, name, mode, ret);
|
||||
-}
|
||||
-
|
||||
-
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
@@ -201,7 +151,8 @@ VNetProc_MakeEntry(char *name, // IN:
|
||||
void
|
||||
VNetProc_RemoveEntry(VNetProcEntry *node)
|
||||
{
|
||||
- VNetProcRemoveEntryInt(node, base);
|
||||
+ if(node)
|
||||
+ proc_remove(node);
|
||||
}
|
||||
|
||||
|
||||
@@ -253,31 +204,6 @@ VNetProc_Cleanup(void)
|
||||
}
|
||||
|
||||
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetProc_MakeEntry --
|
||||
- *
|
||||
- * Make an entry in the vnets proc file system.
|
||||
- *
|
||||
- * Results:
|
||||
- * errno. If errno is 0 and ret is non NULL then ret is filled
|
||||
- * in with the resulting proc entry.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetProc_MakeEntry(char *name,
|
||||
- int mode,
|
||||
- VNetProcEntry **ret)
|
||||
-{
|
||||
- return -ENXIO;
|
||||
-}
|
||||
-
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
|
||||
index 17b49e0..b01004a 100644
|
||||
--- a/vmnet-only/userif.c
|
||||
+++ b/vmnet-only/userif.c
|
||||
@@ -387,7 +387,7 @@ VNetUserIfReceive(VNetJack *this, // IN
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
- * VNetUserIfProcRead --
|
||||
+ * VNetUserIfProcShow --
|
||||
*
|
||||
* Callback for read operation on this userif entry in vnets proc fs.
|
||||
*
|
||||
@@ -401,30 +401,23 @@ VNetUserIfReceive(VNetJack *this, // IN
|
||||
*/
|
||||
|
||||
static int
|
||||
-VNetUserIfProcRead(char *page, // IN/OUT: buffer to write into
|
||||
- char **start, // OUT: 0 if file < 4k, else offset into
|
||||
- // page
|
||||
- off_t off, // IN: offset of read into the file
|
||||
- int count, // IN: maximum number of bytes to read
|
||||
- int *eof, // OUT: TRUE if there is nothing more to
|
||||
- // read
|
||||
+VNetUserIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
|
||||
void *data) // IN: client data - not used
|
||||
{
|
||||
VNetUserIF *userIf = (VNetUserIF*)data;
|
||||
- int len = 0;
|
||||
|
||||
if (!userIf) {
|
||||
- return len;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
- len += VNetPrintPort(&userIf->port, page+len);
|
||||
+ VNetPrintPort(&userIf->port, seqf);
|
||||
|
||||
- len += sprintf(page+len, "read %u written %u queued %u ",
|
||||
+ seq_printf(seqf, "read %u written %u queued %u ",
|
||||
userIf->stats.read,
|
||||
userIf->stats.written,
|
||||
userIf->stats.queued);
|
||||
|
||||
- len += sprintf(page+len,
|
||||
+ seq_printf(seqf,
|
||||
"dropped.down %u dropped.mismatch %u "
|
||||
"dropped.overflow %u dropped.largePacket %u",
|
||||
userIf->stats.droppedDown,
|
||||
@@ -432,13 +425,23 @@ VNetUserIfProcRead(char *page, // IN/OUT: buffer to write into
|
||||
userIf->stats.droppedOverflow,
|
||||
userIf->stats.droppedLargePacket);
|
||||
|
||||
- len += sprintf(page+len, "\n");
|
||||
+ seq_printf(seqf, "\n");
|
||||
|
||||
- *start = 0;
|
||||
- *eof = 1;
|
||||
- return len;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int proc_userif_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return single_open(file, VNetUserIfProcShow, PDE_DATA(inode));
|
||||
}
|
||||
|
||||
+static const struct file_operations proc_userif_fops = {
|
||||
+ .open = proc_userif_open,
|
||||
+ .read = seq_read,
|
||||
+ .llseek = seq_lseek,
|
||||
+ .release = seq_release,
|
||||
+};
|
||||
+
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
@@ -1034,8 +1037,8 @@ VNetUserIf_Create(VNetPort **ret) // OUT
|
||||
* Make proc entry for this jack.
|
||||
*/
|
||||
|
||||
- retval = VNetProc_MakeEntry(userIf->port.jack.name, S_IFREG,
|
||||
- &userIf->port.jack.procEntry);
|
||||
+ retval = VNetProc_MakeEntryOps(userIf->port.jack.name, S_IFREG,
|
||||
+ &userIf->port.jack.procEntry, &proc_userif_fops, userIf);
|
||||
if (retval) {
|
||||
if (retval == -ENXIO) {
|
||||
userIf->port.jack.procEntry = NULL;
|
||||
@@ -1043,9 +1046,6 @@ VNetUserIf_Create(VNetPort **ret) // OUT
|
||||
kfree(userIf);
|
||||
return retval;
|
||||
}
|
||||
- } else {
|
||||
- userIf->port.jack.procEntry->read_proc = VNetUserIfProcRead;
|
||||
- userIf->port.jack.procEntry->data = userIf;
|
||||
}
|
||||
|
||||
/*
|
||||
diff --git a/vmnet-only/vnetInt.h b/vmnet-only/vnetInt.h
|
||||
index c615395..d90a1ef 100644
|
||||
--- a/vmnet-only/vnetInt.h
|
||||
+++ b/vmnet-only/vnetInt.h
|
||||
@@ -171,12 +171,14 @@ VNetJack *VNetDisconnect(VNetJack *jack);
|
||||
|
||||
void VNetSend(const VNetJack *jack, struct sk_buff *skb);
|
||||
|
||||
-int VNetProc_MakeEntry(char *name, int mode,
|
||||
- VNetProcEntry **ret);
|
||||
+int VNetProc_MakeEntryOps(char *name, int mode,
|
||||
+ VNetProcEntry **ret,
|
||||
+ const struct file_operations *fops,
|
||||
+ void *data);
|
||||
|
||||
void VNetProc_RemoveEntry(VNetProcEntry *node);
|
||||
|
||||
-int VNetPrintJack(const VNetJack *jack, char *buf);
|
||||
+void VNetPrintJack(const VNetJack *jack, struct seq_file *seqf);
|
||||
|
||||
int VNet_MakeMACAddress(VNetPort *port);
|
||||
|
||||
@@ -196,7 +198,7 @@ Bool VNetPacketMatch(const uint8 *destAddr, const uint8 *ifAddr,
|
||||
|
||||
Bool VNetCycleDetectIf(const char *name, int generation);
|
||||
|
||||
-int VNetPrintPort(const VNetPort *port, char *buf);
|
||||
+void VNetPrintPort(const VNetPort *port, struct seq_file *seqf);
|
||||
|
||||
int VNetSnprintf(char *str, size_t size, const char *format, ...);
|
||||
|
||||
@ -0,0 +1,809 @@
|
||||
--- a/vmnet-only/bridge.c
|
||||
+++ b/vmnet-only/bridge.c
|
||||
@@ -105,8 +105,6 @@ static Bool VNetBridgeCycleDetect(VNetJack *this, int generation);
|
||||
static Bool VNetBridgeIsDeviceWireless(struct net_device *dev);
|
||||
static void VNetBridgePortsChanged(VNetJack *this);
|
||||
static int VNetBridgeIsBridged(VNetJack *this);
|
||||
-static int VNetBridgeProcRead(char *page, char **start, off_t off,
|
||||
- int count, int *eof, void *data);
|
||||
static void VNetBridgeComputeHeaderPosIPv6(struct sk_buff *skb);
|
||||
static PacketStatus VNetCallSMACFunc(struct SMACState *state,
|
||||
struct sk_buff **skb, void *startOfData,
|
||||
@@ -225,6 +223,53 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
+ * VNetBridgeProcShow --
|
||||
+ *
|
||||
+ * Callback for read operation on this bridge entry in vnets proc fs.
|
||||
+ *
|
||||
+ * Results:
|
||||
+ * Length of read operation.
|
||||
+ *
|
||||
+ * Side effects:
|
||||
+ * None.
|
||||
+ *
|
||||
+ *----------------------------------------------------------------------
|
||||
+ */
|
||||
+
|
||||
+int
|
||||
+VNetBridgeProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
|
||||
+ void *data) // IN: client data - pointer to bridge
|
||||
+{
|
||||
+ VNetBridge *bridge = (VNetBridge*)data;
|
||||
+
|
||||
+ if (!bridge) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ VNetPrintPort(&bridge->port, seqf);
|
||||
+
|
||||
+ seq_printf(seqf, "dev %s ", bridge->name);
|
||||
+
|
||||
+ seq_printf(seqf, "\n");
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int proc_bridge_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return single_open(file, VNetBridgeProcShow, PDE_DATA(inode));
|
||||
+}
|
||||
+
|
||||
+static const struct file_operations proc_bridge_fops = {
|
||||
+ .open = proc_bridge_open,
|
||||
+ .read = seq_read,
|
||||
+ .llseek = seq_lseek,
|
||||
+ .release = seq_release,
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ *----------------------------------------------------------------------
|
||||
+ *
|
||||
* VNetBridge_Create --
|
||||
*
|
||||
* Creates a bridge. Allocates struct, allocates internal device,
|
||||
@@ -319,17 +364,14 @@ VNetBridge_Create(const char *devName, // IN: name of device (e.g., "eth0")
|
||||
* Make proc entry for this jack.
|
||||
*/
|
||||
|
||||
- retval = VNetProc_MakeEntry(bridge->port.jack.name, S_IFREG,
|
||||
- &bridge->port.jack.procEntry);
|
||||
+ retval = VNetProc_MakeEntryOps(bridge->port.jack.name, S_IFREG,
|
||||
+ &bridge->port.jack.procEntry, &proc_bridge_fops, bridge);
|
||||
if (retval) {
|
||||
if (retval == -ENXIO) {
|
||||
bridge->port.jack.procEntry = NULL;
|
||||
} else {
|
||||
goto out;
|
||||
}
|
||||
- } else {
|
||||
- bridge->port.jack.procEntry->read_proc = VNetBridgeProcRead;
|
||||
- bridge->port.jack.procEntry->data = bridge;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1719,45 +1761,3 @@ VNetBridgeReceiveFromDev(struct sk_buff *skb, // IN: packet to receive
|
||||
return 0;
|
||||
}
|
||||
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetBridgeProcRead --
|
||||
- *
|
||||
- * Callback for read operation on this bridge entry in vnets proc fs.
|
||||
- *
|
||||
- * Results:
|
||||
- * Length of read operation.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetBridgeProcRead(char *page, // IN/OUT: buffer to write into
|
||||
- char **start, // OUT: 0 if file < 4k, else offset into page
|
||||
- off_t off, // IN: (unused) offset of read into the file
|
||||
- int count, // IN: (unused) maximum number of bytes to read
|
||||
- int *eof, // OUT: TRUE if there is nothing more to read
|
||||
- void *data) // IN: client data - pointer to bridge
|
||||
-{
|
||||
- VNetBridge *bridge = (VNetBridge*)data;
|
||||
- int len = 0;
|
||||
-
|
||||
- if (!bridge) {
|
||||
- return len;
|
||||
- }
|
||||
-
|
||||
- len += VNetPrintPort(&bridge->port, page+len);
|
||||
-
|
||||
- len += sprintf(page+len, "dev %s ", bridge->name);
|
||||
-
|
||||
- len += sprintf(page+len, "\n");
|
||||
-
|
||||
- *start = 0;
|
||||
- *eof = 1;
|
||||
- return len;
|
||||
-}
|
||||
--- a/vmnet-only/driver.c
|
||||
+++ b/vmnet-only/driver.c
|
||||
@@ -1785,21 +1785,17 @@ VNetSetMACUnique(VNetPort *port, // IN:
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-int
|
||||
+void
|
||||
VNetPrintJack(const VNetJack *jack, // IN: jack
|
||||
- char *buf) // OUT: info about jack
|
||||
+ struct seq_file *seqf) // OUT: info about jack
|
||||
{
|
||||
- int len = 0;
|
||||
-
|
||||
read_lock(&vnetPeerLock);
|
||||
if (!jack->peer) {
|
||||
- len += sprintf(buf+len, "connected not ");
|
||||
+ seq_printf(seqf, "connected not ");
|
||||
} else {
|
||||
- len += sprintf(buf+len, "connected %s ", jack->peer->name);
|
||||
+ seq_printf(seqf, "connected %s ", jack->peer->name);
|
||||
}
|
||||
read_unlock(&vnetPeerLock);
|
||||
-
|
||||
- return len;
|
||||
}
|
||||
|
||||
|
||||
@@ -1819,52 +1815,48 @@ VNetPrintJack(const VNetJack *jack, // IN: jack
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-int
|
||||
+void
|
||||
VNetPrintPort(const VNetPort *port, // IN: port
|
||||
- char *buf) // OUT: info about port
|
||||
+ struct seq_file *seqf) // OUT: info about port
|
||||
{
|
||||
- int len = 0;
|
||||
+ VNetPrintJack(&port->jack, seqf);
|
||||
|
||||
- len += VNetPrintJack(&port->jack, buf+len);
|
||||
-
|
||||
- len += sprintf(buf+len, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
|
||||
+ seq_printf(seqf, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
|
||||
port->paddr[0], port->paddr[1], port->paddr[2],
|
||||
port->paddr[3], port->paddr[4], port->paddr[5]);
|
||||
|
||||
- len += sprintf(buf+len, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
|
||||
+ seq_printf(seqf, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
|
||||
port->ladrf[0], port->ladrf[1], port->ladrf[2],
|
||||
port->ladrf[3], port->ladrf[4], port->ladrf[5],
|
||||
port->ladrf[6], port->ladrf[7]);
|
||||
|
||||
- len += sprintf(buf+len, "flags IFF_RUNNING");
|
||||
+ seq_printf(seqf, "flags IFF_RUNNING");
|
||||
|
||||
if (port->flags & IFF_UP) {
|
||||
- len += sprintf(buf+len, ",IFF_UP");
|
||||
+ seq_printf(seqf, ",IFF_UP");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_BROADCAST) {
|
||||
- len += sprintf(buf+len, ",IFF_BROADCAST");
|
||||
+ seq_printf(seqf, ",IFF_BROADCAST");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_DEBUG) {
|
||||
- len += sprintf(buf+len, ",IFF_DEBUG");
|
||||
+ seq_printf(seqf, ",IFF_DEBUG");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_PROMISC) {
|
||||
- len += sprintf(buf+len, ",IFF_PROMISC");
|
||||
+ seq_printf(seqf, ",IFF_PROMISC");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_MULTICAST) {
|
||||
- len += sprintf(buf+len, ",IFF_MULTICAST");
|
||||
+ seq_printf(seqf, ",IFF_MULTICAST");
|
||||
}
|
||||
|
||||
if (port->flags & IFF_ALLMULTI) {
|
||||
- len += sprintf(buf+len, ",IFF_ALLMULTI");
|
||||
+ seq_printf(seqf, ",IFF_ALLMULTI");
|
||||
}
|
||||
|
||||
- len += sprintf(buf+len, " ");
|
||||
-
|
||||
- return len;
|
||||
+ seq_printf(seqf, " ");
|
||||
}
|
||||
|
||||
|
||||
--- a/vmnet-only/hub.c
|
||||
+++ b/vmnet-only/hub.c
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <linux/sched.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/poll.h>
|
||||
+#include <linux/seq_file.h>
|
||||
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/etherdevice.h>
|
||||
@@ -71,8 +72,6 @@ static void VNetHubReceive(VNetJack *this, struct sk_buff *skb);
|
||||
static Bool VNetHubCycleDetect(VNetJack *this, int generation);
|
||||
static void VNetHubPortsChanged(VNetJack *this);
|
||||
static int VNetHubIsBridged(VNetJack *this);
|
||||
-static int VNetHubProcRead(char *page, char **start, off_t off,
|
||||
- int count, int *eof, void *data);
|
||||
|
||||
static VNetHub *vnetHub;
|
||||
static DEFINE_SPINLOCK(vnetHubLock);
|
||||
@@ -241,6 +240,53 @@ VNetHub_AllocPvn(uint8 id[]) // IN: the PVN ID to alloc on
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
+ * VNetHubProcShow --
|
||||
+ *
|
||||
+ * Callback for read operation on hub entry in vnets proc fs.
|
||||
+ *
|
||||
+ * Results:
|
||||
+ * Length of read operation.
|
||||
+ *
|
||||
+ * Side effects:
|
||||
+ * None.
|
||||
+ *
|
||||
+ *----------------------------------------------------------------------
|
||||
+ */
|
||||
+
|
||||
+int
|
||||
+VNetHubProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
|
||||
+ void *data) // IN: client data - not used
|
||||
+{
|
||||
+ VNetJack *jack = (VNetJack*)data;
|
||||
+ VNetHub *hub;
|
||||
+
|
||||
+ if (!jack || !jack->private) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ hub = (VNetHub*)jack->private;
|
||||
+
|
||||
+ VNetPrintJack(jack, seqf);
|
||||
+
|
||||
+ seq_printf(seqf, "tx %u ", hub->stats[jack->index].tx);
|
||||
+ seq_printf(seqf, "\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int proc_hub_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return single_open(file, VNetHubProcShow, PDE_DATA(inode));
|
||||
+}
|
||||
+
|
||||
+static const struct file_operations proc_hub_fops = {
|
||||
+ .open = proc_hub_open,
|
||||
+ .read = seq_read,
|
||||
+ .llseek = seq_lseek,
|
||||
+ .release = seq_release,
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ *----------------------------------------------------------------------
|
||||
+ *
|
||||
* VNetHubAlloc --
|
||||
*
|
||||
* Allocate a jack on this hub.
|
||||
@@ -354,7 +400,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
|
||||
* Make proc entry for this jack.
|
||||
*/
|
||||
|
||||
- retval = VNetProc_MakeEntry(jack->name, S_IFREG, &jack->procEntry);
|
||||
+ retval = VNetProc_MakeEntryOps(jack->name, S_IFREG, &jack->procEntry, &proc_hub_fops, jack);
|
||||
if (retval) {
|
||||
if (retval == -ENXIO) {
|
||||
jack->procEntry = NULL;
|
||||
@@ -362,9 +408,6 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
|
||||
hub->used[i] = FALSE;
|
||||
return NULL;
|
||||
}
|
||||
- } else {
|
||||
- jack->procEntry->read_proc = VNetHubProcRead;
|
||||
- jack->procEntry->data = jack;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -686,46 +729,3 @@ VNetHubIsBridged(VNetJack *this)
|
||||
}
|
||||
|
||||
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetHubProcRead --
|
||||
- *
|
||||
- * Callback for read operation on hub entry in vnets proc fs.
|
||||
- *
|
||||
- * Results:
|
||||
- * Length of read operation.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetHubProcRead(char *page, // IN/OUT: buffer to write into
|
||||
- char **start, // OUT: 0 if file < 4k, else offset into page
|
||||
- off_t off, // IN: offset of read into the file
|
||||
- int count, // IN: maximum number of bytes to read
|
||||
- int *eof, // OUT: TRUE if there is nothing more to read
|
||||
- void *data) // IN: client data - not used
|
||||
-{
|
||||
- VNetJack *jack = (VNetJack*)data;
|
||||
- VNetHub *hub;
|
||||
- int len = 0;
|
||||
-
|
||||
- if (!jack || !jack->private) {
|
||||
- return len;
|
||||
- }
|
||||
- hub = (VNetHub*)jack->private;
|
||||
-
|
||||
- len += VNetPrintJack(jack, page+len);
|
||||
-
|
||||
- len += sprintf(page+len, "tx %u ", hub->stats[jack->index].tx);
|
||||
-
|
||||
- len += sprintf(page+len, "\n");
|
||||
-
|
||||
- *start = 0;
|
||||
- *eof = 1;
|
||||
- return len;
|
||||
-}
|
||||
--- a/vmnet-only/netif.c
|
||||
+++ b/vmnet-only/netif.c
|
||||
@@ -62,8 +62,6 @@ static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
|
||||
static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
|
||||
static int VNetNetifSetMAC(struct net_device *dev, void *addr);
|
||||
static void VNetNetifSetMulticast(struct net_device *dev);
|
||||
-static int VNetNetIfProcRead(char *page, char **start, off_t off,
|
||||
- int count, int *eof, void *data);
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
@@ -116,6 +114,53 @@ VNetNetIfSetup(struct net_device *dev) // IN:
|
||||
|
||||
}
|
||||
|
||||
+/*
|
||||
+ *----------------------------------------------------------------------
|
||||
+ *
|
||||
+ * VNetNetIfProcShow --
|
||||
+ *
|
||||
+ * Callback for read operation on this netif entry in vnets proc fs.
|
||||
+ *
|
||||
+ * Results:
|
||||
+ * Length of read operation.
|
||||
+ *
|
||||
+ * Side effects:
|
||||
+ * None.
|
||||
+ *
|
||||
+ *----------------------------------------------------------------------
|
||||
+ */
|
||||
+
|
||||
+int
|
||||
+VNetNetIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
|
||||
+ void *data) // IN: client data
|
||||
+{
|
||||
+ VNetNetIF *netIf = data;
|
||||
+
|
||||
+ if (!netIf) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ VNetPrintPort(&netIf->port, seqf);
|
||||
+
|
||||
+ seq_printf(seqf, "dev %s ", netIf->dev->name);
|
||||
+
|
||||
+ seq_printf(seqf, "\n");
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int proc_netif_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return single_open(file, VNetNetIfProcShow, PDE_DATA(inode));
|
||||
+}
|
||||
+
|
||||
+static const struct file_operations proc_netif_fops = {
|
||||
+ .open = proc_netif_open,
|
||||
+ .read = seq_read,
|
||||
+ .llseek = seq_lseek,
|
||||
+ .release = seq_release,
|
||||
+};
|
||||
+
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
@@ -180,16 +225,13 @@ VNetNetIf_Create(char *devName, // IN:
|
||||
* Make proc entry for this jack.
|
||||
*/
|
||||
|
||||
- retval = VNetProc_MakeEntry(netIf->port.jack.name, S_IFREG,
|
||||
- &netIf->port.jack.procEntry);
|
||||
+ retval = VNetProc_MakeEntryOps(netIf->port.jack.name, S_IFREG,
|
||||
+ &netIf->port.jack.procEntry, &proc_netif_fops, netIf);
|
||||
if (retval) {
|
||||
netIf->port.jack.procEntry = NULL;
|
||||
if (retval != -ENXIO) {
|
||||
goto outFreeDev;
|
||||
}
|
||||
- } else {
|
||||
- netIf->port.jack.procEntry->read_proc = VNetNetIfProcRead;
|
||||
- netIf->port.jack.procEntry->data = netIf;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -553,45 +595,3 @@ VNetNetifGetStats(struct net_device *dev) // IN:
|
||||
return &netIf->stats;
|
||||
}
|
||||
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetNetIfProcRead --
|
||||
- *
|
||||
- * Callback for read operation on this netif entry in vnets proc fs.
|
||||
- *
|
||||
- * Results:
|
||||
- * Length of read operation.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetNetIfProcRead(char *page, // IN/OUT: buffer to write into
|
||||
- char **start, // OUT: 0 if file < 4k, else offset into page
|
||||
- off_t off, // IN: (unused) offset of read into the file
|
||||
- int count, // IN: (unused) maximum number of bytes to read
|
||||
- int *eof, // OUT: TRUE if there is nothing more to read
|
||||
- void *data) // IN: client data
|
||||
-{
|
||||
- VNetNetIF *netIf = data;
|
||||
- int len = 0;
|
||||
-
|
||||
- if (!netIf) {
|
||||
- return len;
|
||||
- }
|
||||
-
|
||||
- len += VNetPrintPort(&netIf->port, page+len);
|
||||
-
|
||||
- len += sprintf(page+len, "dev %s ", netIf->dev->name);
|
||||
-
|
||||
- len += sprintf(page+len, "\n");
|
||||
-
|
||||
- *start = 0;
|
||||
- *eof = 1;
|
||||
- return len;
|
||||
-}
|
||||
--- a/vmnet-only/procfs.c
|
||||
+++ b/vmnet-only/procfs.c
|
||||
@@ -45,10 +45,6 @@
|
||||
|
||||
#if defined(CONFIG_PROC_FS)
|
||||
|
||||
-static int VNetProcMakeEntryInt(VNetProcEntry *parent, char *name, int mode,
|
||||
- VNetProcEntry **ret);
|
||||
-static void VNetProcRemoveEntryInt(VNetProcEntry *node, VNetProcEntry *parent);
|
||||
-
|
||||
static VNetProcEntry *base = NULL;
|
||||
|
||||
|
||||
@@ -71,7 +67,12 @@ static VNetProcEntry *base = NULL;
|
||||
int
|
||||
VNetProc_Init(void)
|
||||
{
|
||||
- return VNetProcMakeEntryInt(NULL, "vmnet", S_IFDIR, &base);
|
||||
+ base = proc_mkdir("vmnet", NULL);
|
||||
+ if(IS_ERR(base)) {
|
||||
+ base = NULL;
|
||||
+ return PTR_ERR(base);
|
||||
+ }
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -94,14 +95,14 @@ VNetProc_Init(void)
|
||||
void
|
||||
VNetProc_Cleanup(void)
|
||||
{
|
||||
- VNetProcRemoveEntryInt(base, NULL);
|
||||
+ proc_remove(base);
|
||||
base = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
- * VNetProcMakeEntryInt --
|
||||
+ * VNetProc_MakeEntryOps --
|
||||
*
|
||||
* Make an entry in the vnets proc file system.
|
||||
*
|
||||
@@ -116,72 +117,21 @@ VNetProc_Cleanup(void)
|
||||
*/
|
||||
|
||||
int
|
||||
-VNetProcMakeEntryInt(VNetProcEntry *parent, // IN:
|
||||
- char *name, // IN:
|
||||
+VNetProc_MakeEntryOps(char *name, // IN:
|
||||
int mode, // IN:
|
||||
- VNetProcEntry **ret) // OUT:
|
||||
+ VNetProcEntry **ret,
|
||||
+ const struct file_operations *fops,
|
||||
+ void *data
|
||||
+ ) // OUT:
|
||||
{
|
||||
VNetProcEntry *ent;
|
||||
- ent = create_proc_entry(name, mode, parent);
|
||||
+ ent = proc_create_data(name, mode, base, fops, data);
|
||||
*ret = ent;
|
||||
if (!ent)
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
}
|
||||
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetProcRemoveEntryInt --
|
||||
- *
|
||||
- * Remove a previously installed proc entry.
|
||||
- *
|
||||
- * Results:
|
||||
- * None.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-void
|
||||
-VNetProcRemoveEntryInt(VNetProcEntry *node,
|
||||
- VNetProcEntry *parent)
|
||||
-{
|
||||
- if (node) {
|
||||
- remove_proc_entry(node->name, parent);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetProc_MakeEntry --
|
||||
- *
|
||||
- * Make an entry in the vnets proc file system.
|
||||
- *
|
||||
- * Results:
|
||||
- * errno. If errno is 0 and ret is non NULL then ret is filled
|
||||
- * in with the resulting proc entry.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetProc_MakeEntry(char *name, // IN:
|
||||
- int mode, // IN:
|
||||
- VNetProcEntry **ret) // OUT:
|
||||
-{
|
||||
- return VNetProcMakeEntryInt(base, name, mode, ret);
|
||||
-}
|
||||
-
|
||||
-
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
@@ -201,7 +151,8 @@ VNetProc_MakeEntry(char *name, // IN:
|
||||
void
|
||||
VNetProc_RemoveEntry(VNetProcEntry *node)
|
||||
{
|
||||
- VNetProcRemoveEntryInt(node, base);
|
||||
+ if(node)
|
||||
+ proc_remove(node);
|
||||
}
|
||||
|
||||
|
||||
@@ -253,31 +204,6 @@ VNetProc_Cleanup(void)
|
||||
}
|
||||
|
||||
|
||||
-/*
|
||||
- *----------------------------------------------------------------------
|
||||
- *
|
||||
- * VNetProc_MakeEntry --
|
||||
- *
|
||||
- * Make an entry in the vnets proc file system.
|
||||
- *
|
||||
- * Results:
|
||||
- * errno. If errno is 0 and ret is non NULL then ret is filled
|
||||
- * in with the resulting proc entry.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * None.
|
||||
- *
|
||||
- *----------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-int
|
||||
-VNetProc_MakeEntry(char *name,
|
||||
- int mode,
|
||||
- VNetProcEntry **ret)
|
||||
-{
|
||||
- return -ENXIO;
|
||||
-}
|
||||
-
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
--- a/vmnet-only/userif.c
|
||||
+++ b/vmnet-only/userif.c
|
||||
@@ -389,7 +389,7 @@ VNetUserIfReceive(VNetJack *this, // IN
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
*
|
||||
- * VNetUserIfProcRead --
|
||||
+ * VNetUserIfProcShow --
|
||||
*
|
||||
* Callback for read operation on this userif entry in vnets proc fs.
|
||||
*
|
||||
@@ -403,30 +403,23 @@ VNetUserIfReceive(VNetJack *this, // IN
|
||||
*/
|
||||
|
||||
static int
|
||||
-VNetUserIfProcRead(char *page, // IN/OUT: buffer to write into
|
||||
- char **start, // OUT: 0 if file < 4k, else offset into
|
||||
- // page
|
||||
- off_t off, // IN: offset of read into the file
|
||||
- int count, // IN: maximum number of bytes to read
|
||||
- int *eof, // OUT: TRUE if there is nothing more to
|
||||
- // read
|
||||
+VNetUserIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
|
||||
void *data) // IN: client data - not used
|
||||
{
|
||||
VNetUserIF *userIf = (VNetUserIF*)data;
|
||||
- int len = 0;
|
||||
|
||||
if (!userIf) {
|
||||
- return len;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
- len += VNetPrintPort(&userIf->port, page+len);
|
||||
+ VNetPrintPort(&userIf->port, seqf);
|
||||
|
||||
- len += sprintf(page+len, "read %u written %u queued %u ",
|
||||
+ seq_printf(seqf, "read %u written %u queued %u ",
|
||||
userIf->stats.read,
|
||||
userIf->stats.written,
|
||||
userIf->stats.queued);
|
||||
|
||||
- len += sprintf(page+len,
|
||||
+ seq_printf(seqf,
|
||||
"dropped.down %u dropped.mismatch %u "
|
||||
"dropped.overflow %u dropped.largePacket %u",
|
||||
userIf->stats.droppedDown,
|
||||
@@ -434,13 +427,23 @@ VNetUserIfProcRead(char *page, // IN/OUT: buffer to write into
|
||||
userIf->stats.droppedOverflow,
|
||||
userIf->stats.droppedLargePacket);
|
||||
|
||||
- len += sprintf(page+len, "\n");
|
||||
+ seq_printf(seqf, "\n");
|
||||
|
||||
- *start = 0;
|
||||
- *eof = 1;
|
||||
- return len;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int proc_userif_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return single_open(file, VNetUserIfProcShow, PDE_DATA(inode));
|
||||
}
|
||||
|
||||
+static const struct file_operations proc_userif_fops = {
|
||||
+ .open = proc_userif_open,
|
||||
+ .read = seq_read,
|
||||
+ .llseek = seq_lseek,
|
||||
+ .release = seq_release,
|
||||
+};
|
||||
+
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
@@ -1036,8 +1039,8 @@ VNetUserIf_Create(VNetPort **ret) // OUT
|
||||
* Make proc entry for this jack.
|
||||
*/
|
||||
|
||||
- retval = VNetProc_MakeEntry(userIf->port.jack.name, S_IFREG,
|
||||
- &userIf->port.jack.procEntry);
|
||||
+ retval = VNetProc_MakeEntryOps(userIf->port.jack.name, S_IFREG,
|
||||
+ &userIf->port.jack.procEntry, &proc_userif_fops, userIf);
|
||||
if (retval) {
|
||||
if (retval == -ENXIO) {
|
||||
userIf->port.jack.procEntry = NULL;
|
||||
@@ -1045,9 +1048,6 @@ VNetUserIf_Create(VNetPort **ret) // OUT
|
||||
kfree(userIf);
|
||||
return retval;
|
||||
}
|
||||
- } else {
|
||||
- userIf->port.jack.procEntry->read_proc = VNetUserIfProcRead;
|
||||
- userIf->port.jack.procEntry->data = userIf;
|
||||
}
|
||||
|
||||
/*
|
||||
--- a/vmnet-only/vnetInt.h
|
||||
+++ b/vmnet-only/vnetInt.h
|
||||
@@ -171,12 +171,14 @@ VNetJack *VNetDisconnect(VNetJack *jack);
|
||||
|
||||
void VNetSend(const VNetJack *jack, struct sk_buff *skb);
|
||||
|
||||
-int VNetProc_MakeEntry(char *name, int mode,
|
||||
- VNetProcEntry **ret);
|
||||
+int VNetProc_MakeEntryOps(char *name, int mode,
|
||||
+ VNetProcEntry **ret,
|
||||
+ const struct file_operations *fops,
|
||||
+ void *data);
|
||||
|
||||
void VNetProc_RemoveEntry(VNetProcEntry *node);
|
||||
|
||||
-int VNetPrintJack(const VNetJack *jack, char *buf);
|
||||
+void VNetPrintJack(const VNetJack *jack, struct seq_file *seqf);
|
||||
|
||||
int VNet_MakeMACAddress(VNetPort *port);
|
||||
|
||||
@@ -196,7 +198,7 @@ Bool VNetPacketMatch(const uint8 *destAddr, const uint8 *ifAddr,
|
||||
|
||||
Bool VNetCycleDetectIf(const char *name, int generation);
|
||||
|
||||
-int VNetPrintPort(const VNetPort *port, char *buf);
|
||||
+void VNetPrintPort(const VNetPort *port, struct seq_file *seqf);
|
||||
|
||||
int VNetSnprintf(char *str, size_t size, const char *format, ...);
|
||||
|
||||
--
|
||||
--- a/vmblock-only/linux/control.c 2013-05-21 19:21:19.165750556 +0200
|
||||
+++ b/vmblock-only/linux/control.c 2013-05-21 19:22:18.363747723 +0200
|
||||
@@ -208,9 +208,10 @@
|
||||
VMBlockSetProcEntryOwner(controlProcMountpoint);
|
||||
|
||||
/* Create /proc/fs/vmblock/dev */
|
||||
- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
|
||||
- VMBLOCK_CONTROL_MODE,
|
||||
- controlProcDirEntry);
|
||||
+ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
|
||||
+ VMBLOCK_CONTROL_MODE,
|
||||
+ controlProcDirEntry,
|
||||
+ &ControlFileOps);
|
||||
if (!controlProcEntry) {
|
||||
Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
|
||||
remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
|
||||
@@ -218,7 +219,6 @@
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- controlProcEntry->proc_fops = &ControlFileOps;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
|
||||
<herd>ruby</herd>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
DIST gmime-2.4.32.tar.xz 685512 SHA256 a0e8f3a1949e7281e92edc5dd6309a7ca34b6838c6acf7b7f1563a41b5ddd74b SHA512 623cb5fe70104612db31b41752c68bd3dfbafb87402f49c13f87f0e1e864ebdc0587ea6192e627fcd7958a76cd3fd6a29bfb409e4b9bc08ce12c7fbeb8dce57a WHIRLPOOL a36abebaa4a3f475b3f03de3797e7d6d02eb21e0876856058baf91a7ce8e9af615968e98a5dedd59fbef3e8adf5ad41957b0c98db226169ef298f9ab89cefa36
|
||||
DIST gmime-2.4.33.tar.xz 692336 SHA256 27dfa99967c19d2e8707b2670bd084dd514167925cca92cbd474298fc515d391 SHA512 15efb527ea6162b63a4773b0f4b30f0e34cb96e46fd85c5489a9fb4b262b837c8a563eeaf737f82dc805ecce379e5247c32c84f6d8127aea3cb9fdf3c0bcc973 WHIRLPOOL abb9c7e66222fb290b339ce0a5172fbe2780ac6101b1838d5f15ac0b85b55c6c1a4c8d7ead7d55d8b71a5284af93ec4d182ba34ac3168ef9ccf2bfe174ce2282
|
||||
DIST gmime-2.6.13.tar.xz 731888 SHA256 42a47a7f9508db3e1cfbb374a23260e75d7fc7696f488a26aa59f5e2d8dac154 SHA512 2e7c632e1e2a5b8df7f6f381512a05b89f57b5a981adbfbdce8a7e7e0370d02f438efec5ad80dbbc23438c15c14b83a55d589a41b988fc1893934172a60fc0de WHIRLPOOL e899c96e728814851f55522a2a38c51882fe1cf2cdec5e4971830f26c0ff74675118ff16c653ded47abfe3e089dd24cf2020d59ffd08582057bd5e86b3c684e9
|
||||
DIST gmime-2.6.15.tar.xz 731880 SHA256 b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a SHA512 536ddc4e7e65335be05262626bfe15c70b53f9bd4771dce9f9ddad86ca7ef4af3a320e31f964dc33232ebd44b4a971350eaf5abfd8e345055092af0f83972f3d WHIRLPOOL bb88a41b1ea4eb7ac0c9fd2d7ba9195ab01127a42081876fc20ba33beb7dcab72fe6008fbb5016bf6fc731ffe9da94cc20586e7c9ed344330167a4649c76496e
|
||||
DIST gmime-2.6.16.tar.xz 739160 SHA256 1093c2c9b4644d53b9c2df30042b3c4c2e9141d3e65e299030d227485d95c8af SHA512 2fc585a0c4a6bd87f2d0ab785223e34e0ec4f144d151a182758991d125d2906e3c7bc19371c1657d562882b0a942cbe49002908ca505a484ccfa6657c7ac7222 WHIRLPOOL 5ee7ec0984f36c37f94553448b4a2700911ac5711edd07619f45ee855c329f01f20f92a5c6616c87bda1fa5817894a3971eb3597846bab9fae785dba0754586a
|
||||
DIST gmime-2.6.17.tar.xz 739208 SHA256 22d49e57c404a0a68d1ac3426c8f23a39185a4b2d569de03bece07db03d1202f SHA512 1c6eb020bddd422d199d8f3efcd34bd9ee2a1cb10ffbbc601b790f4125474b0869c43e8896273a118ffbc1586352d6cc5d758bb1e02b67831f49148b080930e8 WHIRLPOOL 63eb7bb082e33b3505bb841f984a5109408f6c7ed102ea68f02f2ce0e65f4e9356fb70398a923ebe2b605424a39596ea23210afb2b74328dd19469e2d7b169e7
|
||||
|
||||
@ -1,273 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.ebuild,v 1.1 2013/06/19 01:18:35 anarchy Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
NSPR_VER="4.10"
|
||||
RTM_NAME="NSS_${PV//./_}_RTM"
|
||||
|
||||
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
|
||||
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
|
||||
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
|
||||
http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch
|
||||
http://dev.gentoo.org/~anarchy/patches/${PN}-3.15-pem-support-20130617.patch.xz"
|
||||
|
||||
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="utils"
|
||||
|
||||
DEPEND="virtual/pkgconfig
|
||||
>=dev-libs/nspr-${NSPR_VER}"
|
||||
|
||||
RDEPEND=">=dev-libs/nspr-${NSPR_VER}
|
||||
>=dev-db/sqlite-3.5
|
||||
sys-libs/zlib"
|
||||
|
||||
S="${WORKDIR}/${P}/${PN}"
|
||||
|
||||
src_setup() {
|
||||
export LC_ALL="C"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Custom changes for gentoo
|
||||
epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
|
||||
epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
|
||||
epatch "${DISTDIR}/${PN}-3.15-pem-support-20130617.patch.xz"
|
||||
epatch "${FILESDIR}/${PN}-3.15-x32.patch"
|
||||
cd coreconf
|
||||
# hack nspr paths
|
||||
echo 'INCLUDES += -I$(DIST)/include/dbm' \
|
||||
>> headers.mk || die "failed to append include"
|
||||
|
||||
# modify install path
|
||||
sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
|
||||
-i source.mk
|
||||
|
||||
# Respect LDFLAGS
|
||||
sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
|
||||
|
||||
# Ensure we stay multilib aware
|
||||
sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/config/Makefile
|
||||
|
||||
# Fix pkgconfig file for Prefix
|
||||
sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
|
||||
"${S}"/config/Makefile
|
||||
|
||||
epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
|
||||
|
||||
# use host shlibsign if need be #436216
|
||||
if tc-is-cross-compiler ; then
|
||||
sed -i \
|
||||
-e 's:"${2}"/shlibsign:shlibsign:' \
|
||||
"${S}"/cmd/shlibsign/sign.sh
|
||||
fi
|
||||
|
||||
# dirty hack
|
||||
cd "${S}"
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
|
||||
lib/ssl/config.mk
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
|
||||
cmd/platlibs.mk
|
||||
}
|
||||
|
||||
nssarch() {
|
||||
# Most of the arches are the same as $ARCH
|
||||
local t=${1:-${CHOST}}
|
||||
case ${t} in
|
||||
hppa*) echo "parisc";;
|
||||
i?86*) echo "i686";;
|
||||
x86_64*) echo "x86_64";;
|
||||
*) tc-arch ${t};;
|
||||
esac
|
||||
}
|
||||
|
||||
nssbits() {
|
||||
local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
|
||||
echo > "${T}"/test.c || die
|
||||
${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
|
||||
case $(file "${T}"/test.o) in
|
||||
*32-bit*x86-64*) echo USE_x32=1;;
|
||||
*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
|
||||
*32-bit*|*ppc*|*i386*) ;;
|
||||
*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
|
||||
esac
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
strip-flags
|
||||
|
||||
tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
|
||||
local makeargs=(
|
||||
CC="${CC}"
|
||||
AR="${AR} rc \$@"
|
||||
RANLIB="${RANLIB}"
|
||||
OPTIMIZER=
|
||||
$(nssbits)
|
||||
)
|
||||
|
||||
# Take care of nspr settings #436216
|
||||
append-cppflags $(${PKG_CONFIG} nspr --cflags)
|
||||
append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
|
||||
unset NSPR_INCLUDE_DIR
|
||||
export NSPR_LIB_DIR=${T}/fake-dir
|
||||
|
||||
# Do not let `uname` be used.
|
||||
if use kernel_linux ; then
|
||||
makeargs+=(
|
||||
OS_TARGET=Linux
|
||||
OS_RELEASE=2.6
|
||||
OS_TEST="$(nssarch)"
|
||||
)
|
||||
fi
|
||||
|
||||
export BUILD_OPT=1
|
||||
export NSS_USE_SYSTEM_SQLITE=1
|
||||
export NSDISTMODE=copy
|
||||
export NSS_ENABLE_ECC=1
|
||||
export XCFLAGS="${CFLAGS} ${CPPFLAGS}"
|
||||
export FREEBL_NO_DEPEND=1
|
||||
export ASFLAGS=""
|
||||
|
||||
local d
|
||||
|
||||
# Build the host tools first.
|
||||
LDFLAGS="${BUILD_LDFLAGS}" \
|
||||
XCFLAGS="${BUILD_CFLAGS}" \
|
||||
emake -j1 -C coreconf \
|
||||
CC="${BUILD_CC}" \
|
||||
$(nssbits BUILD_) \
|
||||
|| die
|
||||
makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
|
||||
|
||||
# Then build the target tools.
|
||||
for d in . lib/dbm ; do
|
||||
emake -j1 "${makeargs[@]}" -C ${d} || die "${d} make failed"
|
||||
done
|
||||
}
|
||||
|
||||
# Altering these 3 libraries breaks the CHK verification.
|
||||
# All of the following cause it to break:
|
||||
# - stripping
|
||||
# - prelink
|
||||
# - ELF signing
|
||||
# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
|
||||
# Either we have to NOT strip them, or we have to forcibly resign after
|
||||
# stripping.
|
||||
#local_libdir="$(get_libdir)"
|
||||
#export STRIP_MASK="
|
||||
# */${local_libdir}/libfreebl3.so*
|
||||
# */${local_libdir}/libnssdbm3.so*
|
||||
# */${local_libdir}/libsoftokn3.so*"
|
||||
|
||||
export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
|
||||
|
||||
generate_chk() {
|
||||
local shlibsign="$1"
|
||||
local libdir="$2"
|
||||
einfo "Resigning core NSS libraries for FIPS validation"
|
||||
shift 2
|
||||
local i
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libname=lib${i}.so
|
||||
local chkname=lib${i}.chk
|
||||
"${shlibsign}" \
|
||||
-i "${libdir}"/${libname} \
|
||||
-o "${libdir}"/${chkname}.tmp \
|
||||
&& mv -f \
|
||||
"${libdir}"/${chkname}.tmp \
|
||||
"${libdir}"/${chkname} \
|
||||
|| die "Failed to sign ${libname}"
|
||||
done
|
||||
}
|
||||
|
||||
cleanup_chk() {
|
||||
local libdir="$1"
|
||||
shift 1
|
||||
local i
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libfname="${libdir}/lib${i}.so"
|
||||
# If the major version has changed, then we have old chk files.
|
||||
[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
|
||||
&& rm -f "${libfname}.chk"
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
MINOR_VERSION=12
|
||||
cd "${S}"/dist
|
||||
|
||||
dodir /usr/$(get_libdir)
|
||||
cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
|
||||
# We generate these after stripping the libraries, else they don't match.
|
||||
#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
|
||||
cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
|
||||
|
||||
# Install nss-config and pkgconfig file
|
||||
dodir /usr/bin
|
||||
cp -L */bin/nss-config "${ED}"/usr/bin
|
||||
dodir /usr/$(get_libdir)/pkgconfig
|
||||
cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig
|
||||
|
||||
# all the include files
|
||||
insinto /usr/include/nss
|
||||
doins public/nss/*.h
|
||||
cd "${ED}"/usr/$(get_libdir)
|
||||
local n file
|
||||
for file in *$(get_libname); do
|
||||
n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
|
||||
mv ${file} ${n}
|
||||
ln -s ${n} ${file}
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
|
||||
fi
|
||||
done
|
||||
|
||||
local f nssutils
|
||||
# Always enabled because we need it for chk generation.
|
||||
nssutils="shlibsign"
|
||||
if use utils; then
|
||||
# The tests we do not need to install.
|
||||
#nssutils_test="bltest crmftest dbtest dertimetest
|
||||
#fipstest remtest sdrtest"
|
||||
nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
|
||||
cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
|
||||
nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
|
||||
pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
|
||||
symkeyutil tstclnt vfychain vfyserv"
|
||||
fi
|
||||
cd "${S}"/dist/*/bin/
|
||||
for f in ${nssutils}; do
|
||||
dobin ${f}
|
||||
done
|
||||
|
||||
# Prelink breaks the CHK files. We don't have any reliable way to run
|
||||
# shlibsign after prelink.
|
||||
local l libs=()
|
||||
for l in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
|
||||
done
|
||||
OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
|
||||
echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss"
|
||||
unset libs liblist
|
||||
doenvd "${T}/90nss"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# We must re-sign the libraries AFTER they are stripped.
|
||||
local shlibsign="${EROOT}/usr/bin/shlibsign"
|
||||
# See if we can execute it (cross-compiling & such). #436216
|
||||
"${shlibsign}" -h >&/dev/null
|
||||
if [[ $? -gt 1 ]] ; then
|
||||
shlibsign="shlibsign"
|
||||
fi
|
||||
generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
cleanup_chk "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-4.7.2-r2.ebuild,v 1.1 2013/08/11 16:59:32 jlec Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
|
||||
|
||||
inherit distutils-r1 eutils
|
||||
|
||||
DESCRIPTION="Simple config file reader and writer"
|
||||
HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html http://code.google.com/p/configobj/ http://pypi.python.org/pypi/configobj"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="doc"
|
||||
|
||||
DEPEND="app-arch/unzip"
|
||||
RDEPEND=""
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-fix_tests.patch )
|
||||
|
||||
python_prepare_all() {
|
||||
distutils-r1_python_prepare_all
|
||||
sed -e "s/ \(doctest\.testmod(.*\)/ sys.exit(\1[0] != 0)/" -i validate.py || die
|
||||
}
|
||||
|
||||
python_test() {
|
||||
"${PYTHON}" validate.py -v || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
if use doc; then
|
||||
rm -f docs/BSD*
|
||||
insinto /usr/share/doc/${PF}/html
|
||||
doins -r docs/* || die "doins failed"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST patsy-0.2.0.tar.gz 315486 SHA256 1d399e504dc7c9e5f35460698dd4ebf098aa215e861ea4f5ded29e98e73740c3 SHA512 4e1028dcab58e2fc938c4f8dec0aeb148fbf7d2430855d8caa844bc19088b66a8ab9b83edc3f3066df41e751f1e0ff6d24478109be562e420da6c84e3f76763f WHIRLPOOL 2da9956373cc9bd2f13d277bcca37467ab8f5b37223f9c6bf6d59b6c69e7c54bdcc70433c990ea4a02aa424c497be08031966963721194af308cda1bb36edb13
|
||||
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>sci-mathematics</herd>
|
||||
<longdescription>
|
||||
A Python package for describing statistical models and for building
|
||||
design matrices. It is closely inspired by and compatible with the
|
||||
'formula' mini-language used in R and S.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/patsy/patsy-0.2.0.ebuild,v 1.1 2013/08/11 18:05:36 bicatali Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python module to describe statistical models and design matrices"
|
||||
HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/numpy[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
doc? (
|
||||
dev-python/ipython
|
||||
dev-python/matplotlib
|
||||
dev-python/sphinx )
|
||||
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
|
||||
|
||||
python_compile_all() {
|
||||
use doc && emake -C doc html
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cd ${BUILD_DIR}
|
||||
nosetests-${EPYTHON} -v || die "Testing failed with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
use doc && dohtml -r doc/_build/html/*
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/python-memcached-1.53-r1.ebuild,v 1.1 2013/08/11 11:56:23 mgorny Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Pure python memcached client"
|
||||
HOMEPAGE="http://www.tummy.com/Community/software/python-memcached/ http://pypi.python.org/pypi/python-memcached"
|
||||
SRC_URI="ftp://ftp.tummy.com/pub/python-memcached/old-releases/${P}.tar.gz"
|
||||
|
||||
LICENSE="OSL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( net-misc/memcached )"
|
||||
RDEPEND=""
|
||||
|
||||
# Tests try to connect to memcached via TCP/IP. Please do not re-enable
|
||||
# until you get them all to pass properly while using the UNIX socket
|
||||
# only and not even trying to connect to memcached over TCP/IP.
|
||||
RESTRICT=test
|
||||
|
||||
python_test() {
|
||||
# Note: partial. Needs fixing. Stuff like that.
|
||||
|
||||
cd "${TMPDIR}" || die
|
||||
|
||||
local memcached_opts=( -d -P memcached.pid -s memcached.socket )
|
||||
[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
|
||||
|
||||
memcached "${memached_opts[@]}" || die
|
||||
|
||||
"${PYTHON}" memcache.py --do-unix || die "Tests fail with ${EPYTHON}"
|
||||
|
||||
kill "$(<memcached.pid)" || die
|
||||
rm memcached.pid || die
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST qt-mobility-1.2.2_p20120403.tar.gz 22789546 SHA256 4b9aabfda8d1eab6b91c6c5732c536fe74204988fb3f3e8f9c197f2ecbbd680a SHA512 d3f1df3f41d3074a8bd4281aca2158647068a81aa40124ba8b1d48f3c323f5a2b64dc2e21a691e68af96cbdeba3cd86115b66e934b83dbe61b2199ba63f6814b WHIRLPOOL cb1b10af080f1c468bec0c06bf5e0f70d2ae58ec9d76f1bcd68b991d6de42fa5964a89fea3a1adb90a2291cce0f5f96b8c51007ae888e13c4d5024f0d10f4767
|
||||
DIST qt-mobility-1.2.2_p20121205.tar.gz 23398818 SHA256 04704777136cbeeb3366cdb29087cc1435e149b3def245caafda4ab17da886e6 SHA512 7894b5ef4e1f6d5ab04ae895274cdf639679c5a7349df8b9bdd08c7d2e616872f955a2bf9d98fd4b3b54abbca53001b969ad49251723edf7bdbfb86e7b0f9486 WHIRLPOOL 7070eebdaf8c12cd6c7f6eb52f03d1f247cb70f8f25257c94ef98f709a8e73cf374f705a1a000d957d65bf053c575de483ccde93a8117b86143159559dc7961e
|
||||
DIST qt-mobility-1.2.2_p20130703.tar.xz 16748672 SHA256 c4f1578a8384a520744ece9c19639600029d1fac2b55e0f110ec5700911aad44 SHA512 51e960dbcab3641906043c0e3dc6c44da2a66d11a15f5ec255776cef299d1403eeb0df55ee953567fdafd4c2a88a6514dcf1e2f8ba0af574c44e02e809f42287 WHIRLPOOL 4e7ee4039fbb4e8f8cfd7f720d232ddf79d61c3cd62ad5851e490c9284badf3431852eb56dfea18e3caf350e2e0ccd50f3244abc04bd68ffc6f6de67e644d3c4
|
||||
|
||||
@ -1,165 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild,v 1.1 2013/03/02 15:25:04 yngwin Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit multilib qt4-r2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Additional Qt APIs for mobile devices and desktop platforms"
|
||||
HOMEPAGE="http://qt.nokia.com/products/qt-addons/mobility"
|
||||
SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.gz"
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
QT_MOBILITY_MODULES=(bearer connectivity +contacts feedback gallery
|
||||
location messaging multimedia organizer publishsubscribe
|
||||
sensors serviceframework systeminfo versit)
|
||||
IUSE="bluetooth debug doc networkmanager pulseaudio qml +tools
|
||||
${QT_MOBILITY_MODULES[@]}"
|
||||
|
||||
REQUIRED_USE="
|
||||
|| ( ${QT_MOBILITY_MODULES[@]#[+-]} )
|
||||
versit? ( contacts )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-qt/qtcore-4.7.0:4
|
||||
bearer? (
|
||||
networkmanager? (
|
||||
net-misc/networkmanager
|
||||
>=dev-qt/qtdbus-4.7.0:4
|
||||
)
|
||||
)
|
||||
connectivity? (
|
||||
>=dev-qt/qtdbus-4.7.0:4
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
)
|
||||
contacts? ( >=dev-qt/qtgui-4.7.0:4 )
|
||||
gallery? ( >=dev-qt/qtdbus-4.7.0:4 )
|
||||
location? (
|
||||
>=dev-qt/qtdeclarative-4.7.0:4
|
||||
>=dev-qt/qtgui-4.7.0:4
|
||||
>=dev-qt/qtsql-4.7.0:4[sqlite]
|
||||
)
|
||||
messaging? ( >=net-libs/qmf-2.0_p201209 )
|
||||
multimedia? (
|
||||
media-libs/alsa-lib
|
||||
media-libs/gstreamer:0.10
|
||||
media-libs/gst-plugins-bad:0.10
|
||||
media-libs/gst-plugins-base:0.10
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXv
|
||||
>=dev-qt/qtgui-4.8.0-r4:4[xv]
|
||||
>=dev-qt/qtopengl-4.8.0:4
|
||||
pulseaudio? ( media-sound/pulseaudio[alsa] )
|
||||
)
|
||||
publishsubscribe? (
|
||||
tools? ( >=dev-qt/qtgui-4.7.0:4 )
|
||||
)
|
||||
qml? ( >=dev-qt/qtdeclarative-4.7.0:4 )
|
||||
serviceframework? (
|
||||
>=dev-qt/qtdbus-4.7.0:4
|
||||
>=dev-qt/qtsql-4.7.0:4[sqlite]
|
||||
tools? ( >=dev-qt/qtgui-4.7.0:4 )
|
||||
)
|
||||
systeminfo? (
|
||||
sys-apps/util-linux
|
||||
virtual/udev
|
||||
x11-libs/libX11
|
||||
x11-libs/libXrandr
|
||||
>=dev-qt/qtdbus-4.7.0:4
|
||||
>=dev-qt/qtgui-4.7.0:4
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
networkmanager? ( net-misc/networkmanager )
|
||||
)
|
||||
versit? ( >=dev-qt/qtgui-4.7.0:4 )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
multimedia? (
|
||||
sys-kernel/linux-headers
|
||||
x11-proto/videoproto
|
||||
)
|
||||
systeminfo? ( sys-kernel/linux-headers )
|
||||
"
|
||||
PDEPEND="
|
||||
connectivity? (
|
||||
bluetooth? ( app-mobilephone/obexd )
|
||||
)
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
qt4-r2_src_prepare
|
||||
|
||||
# disable building of code snippets in doc/
|
||||
# and translations (they aren't actually translated)
|
||||
sed -i -re '/SUBDIRS \+= (doc|translations)/d' qtmobility.pro || die
|
||||
|
||||
# fix automagic dependency on qt-declarative
|
||||
if ! use qml; then
|
||||
sed -i -e '/SUBDIRS += declarative/d' plugins/plugins.pro || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# figure out which modules to build
|
||||
local modules=
|
||||
for mod in "${QT_MOBILITY_MODULES[@]#[+-]}"; do
|
||||
use ${mod} && modules+="${mod} "
|
||||
done
|
||||
|
||||
if use messaging; then
|
||||
# tell qmake where QMF is installed
|
||||
export QMF_INCLUDEDIR=$($(tc-getPKG_CONFIG) --variable includedir qmfclient)
|
||||
export QMF_LIBDIR=$($(tc-getPKG_CONFIG) --variable libdir qmfclient)
|
||||
fi
|
||||
|
||||
# custom configure script
|
||||
local myconf=(
|
||||
./configure
|
||||
-prefix "${EPREFIX}/usr"
|
||||
-headerdir "${EPREFIX}/usr/include/qt4"
|
||||
-libdir "${EPREFIX}/usr/$(get_libdir)/qt4"
|
||||
-plugindir "${EPREFIX}/usr/$(get_libdir)/qt4/plugins"
|
||||
$(use debug && echo -debug || echo -release)
|
||||
$(use doc || echo -no-docs)
|
||||
$(use tools || echo -no-tools)
|
||||
-modules "${modules}"
|
||||
)
|
||||
echo "${myconf[@]}"
|
||||
"${myconf[@]}" || die "configure failed"
|
||||
|
||||
# fix automagic dependency on bluez
|
||||
if ! use bluetooth; then
|
||||
sed -i -e '/^bluez_enabled =/s:yes:no:' config.pri || die
|
||||
fi
|
||||
# fix automagic dependency on networkmanager
|
||||
if ! use networkmanager; then
|
||||
sed -i -e '/^networkmanager_enabled =/s:yes:no:' config.pri || die
|
||||
fi
|
||||
# fix automagic dependency on pulseaudio
|
||||
if ! use pulseaudio; then
|
||||
sed -i -e '/^pulseaudio_enabled =/s:yes:no:' config.pri || die
|
||||
fi
|
||||
|
||||
eqmake4 -recursive
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
qt4-r2_src_compile
|
||||
|
||||
use doc && emake docs
|
||||
}
|
||||
|
||||
src_install() {
|
||||
qt4-r2_src_install
|
||||
|
||||
if use doc; then
|
||||
dohtml -r doc/html/*
|
||||
dodoc doc/qch/qtmobility.qch
|
||||
docompress -x /usr/share/doc/${PF}/qtmobility.qch
|
||||
fi
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST async_sinatra-0.4.0.gem 12800 SHA256 06d0c6000c6f162fb09028c45f80a79588649bf5b681f205ac3aa7090fecef2f SHA512 f007a3ebda532ebccb179673b7dda221dfedb8d15d1a02b0b2e7359b0f21e47a8b928defb18a6eceedfef7d480025d086bf3a5647d75b5db453a6010b38a5d84 WHIRLPOOL 3120a84cff8298077c9f694d8430af077179303a44997c169f08954fd3ce90eb71c459f30ef0cb2882c978008189513b55b6d23b0dd6a172f0b89ae7e20149a6
|
||||
DIST async_sinatra-1.0.0-git.tgz 8028 SHA256 3af2ee78ccc5b93e7d3f13ef5515a18336acdce19cfbf239259db0d320597496 SHA512 89be4d3aef3d3b67da3dc7efd8820515cc3f81ecbceb9a80b2ef7a6c953bfb2153d12f38e6299e545f841d5d31ec89ac18fd83347ec51136ae74da9ff5dc5661 WHIRLPOOL 795bf3bcaeb2de241dcfb29e1809e90ec4bf61831485a8416a67ab379515ff08bb8139f33429429d0312d602596c08aade4f59e67b5ba548909c3637d45a1268
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/async_sinatra/async_sinatra-0.4.0.ebuild,v 1.1 2011/02/20 14:15:24 graaff Exp $
|
||||
|
||||
EAPI="2"
|
||||
USE_RUBY="ruby18 ree18"
|
||||
|
||||
RUBY_FAKEGEM_DOCDIR="html"
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
|
||||
# the documentation-building requires the gemspec file that is not
|
||||
# packaged, this is very unfortunate for us, but the doc does not
|
||||
# really tell us much so we're not going out of our way to get this
|
||||
# from GIT. Upstream bug filed.
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Asynchronous response API for Sinatra and Thin"
|
||||
HOMEPAGE="http://libraggi.rubyforge.org/async_sinatra"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
|
||||
RUBY_PATCHES=( "${FILESDIR}/${P}-rack.patch" )
|
||||
|
||||
ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/eventmachine )"
|
||||
|
||||
ruby_add_rdepend '>=dev-ruby/sinatra-1.0
|
||||
>=www-servers/thin-1.2.0'
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -Ilib test/test_async.rb || die "Tests failed."
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
insinto /usr/share/doc/${PF}/
|
||||
doins -r examples || die "Failed to install examples"
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
DIST daemon_controller-0.2.6.gem 22016 SHA256 42d403a94e0dbd4cb410ac6fb1c477172ca9ce89e6784e5af30e23a897536aa3 SHA512 f0bb19d218eb7fde1d95307e6ffc2f47e63c8325fee7469f48fe6dce31c239d0ef4c119f26b6628e2b9e79a3d3741b337267d2cbc46951f3f27d454e74022c2b WHIRLPOOL adab246c98ead4156c2079e03b6d3ce3d11a72142e15db650981b7a163a1122a5b0aebd4df7b1b9412f8273e83cdc2308913beb427370a2cab27219aac7d116c
|
||||
DIST daemon_controller-1.1.1.gem 24576 SHA256 c82bab2e6b6f9443aca51f7f429ac3eb877442f9062da9b28b1a6b329e344ca5 SHA512 fc87dd6deb7db955dc8e75899ea8282cf5755dc76b4139624c6fc8c5caf1b8d995c0e76b3b8222592c4331fa99da890f420a09419ef5c66a680d4dcab0d140fe WHIRLPOOL 30a1f3280b34c45afe5575d7b0e323342f679ff6cd085f709d09873e820e0358751cc77252bd04986d0a832e7e72a5f3f119575400a4ce0d2767acb4ec145741
|
||||
DIST daemon_controller-1.1.2.gem 26624 SHA256 6eae3f0fafe5fce30266b755c944ca1899f064c7bd38c93d4f985026a58efddf SHA512 0d48154694be68b1331d23c7bc9ef11b40665411d44f0482fb7ead92cc86aa0ec5ce45ea41ca3dd97e823899adcd972e48ab52075a2a6e17c90dd077ae9f5da0 WHIRLPOOL daaf377021ebb25f07c5ba16fbe912e67455338966e070ac2933bf9e8e34b0fd54996de8811b6cbe974b8138429411f7fbae5571302fd233c9fad9bceecbe864
|
||||
DIST daemon_controller-1.1.4.gem 28160 SHA256 e9c7da9652677ccd27bf38e2536b0dacbc8471a31ffd58dd4eee50312b6d2465 SHA512 3e717e06959c48f82ad764c5b2d06f6e3de644ee3c30daf1af9f882ed90faea430f07ea09a1503626268512df5355cfee9d3ba08fd45054afab5d6fa47f1b9f0 WHIRLPOOL de3ccb53bb40ea932f81a8f7d3e267b9727fbbf88917e1c5248e62f95e7e39f77e55c97b4c9fc8408b44dcb1fdc999d298f2afd5ef1d5e66d41db5aaf153fa93
|
||||
DIST daemon_controller-1.1.5.gem 28160 SHA256 5cb38c7aa8f054d403fb63038f189261e28d975d3433d6b1911099b0f611bfef SHA512 89746156ef2efbdbb00ed34d22b44ff118805fc479a64668b87e1d1cdb03f709002df6e351a881d588c4254b715f842d61221ee2abd3b04521129420f204e7e0 WHIRLPOOL 8a99c6ad994ddfc9840479be1174643f4512a4666bf94be379223e7519443caaece5c5fc05f4b3fff4103763218ba955c9a58cc01b28aa060a30cfb544ba889e
|
||||
|
||||
@ -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-ruby/daemon_controller/daemon_controller-0.2.6.ebuild,v 1.6 2012/05/21 10:02:23 phajdan.jr Exp $
|
||||
|
||||
EAPI=2
|
||||
USE_RUBY="ruby18 ree18"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_EXTRADOC="README.markdown"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="A library for starting and stopping specific daemons programmatically in a robust manner."
|
||||
HOMEPAGE="http://github.com/FooBarWidget/daemon_controller"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="test"
|
||||
|
||||
ruby_add_bdepend "test? ( dev-ruby/rspec:0 ) "
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -S spec spec || die "Tests failed."
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemon_controller/daemon_controller-1.1.2.ebuild,v 1.1 2013/04/30 06:37:58 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
# jruby → fails tests, looks like Unix sockets are bad on JRuby
|
||||
USE_RUBY="ruby18 ruby19"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_EXTRADOC="README.markdown"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="A library for starting and stopping specific daemons programmatically in a robust manner."
|
||||
HOMEPAGE="http://github.com/FooBarWidget/daemon_controller"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
all_ruby_prepare() {
|
||||
# fix tests with RSpec 2
|
||||
sed -i -e '1irequire "thread"' spec/test_helper.rb || die
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST ferret-0.11.8.4.gem 628224 SHA256 456a3703dd0be1b82d3d8605947b0f8950135247767521ef30b6fa2e4d1602bd SHA512 66d6bec9767a8c5a14c652e2500c5e2077c33a83d36fb15b13f0ae6d4705323c31e2920d903e1c76161ac20005757dff61ee0242b02f7f34db05743ba66aad00 WHIRLPOOL 2cc8c385f0c52fc6828b65db6a56a1c595b08afbeef719669c9ccd8700c34f441dfedd24010edb318e4ea14c287bc19b12fec1f513b747e7c8ec6f231449d2b3
|
||||
DIST ferret-0.11.8.5.gem 627712 SHA256 cc925797c7f85fe55ec86e511b27ec36f3b842e2bdcd89ebbc8e7c90cb1e515b SHA512 3478784437d7787517f3c928485f507ee90e78bb8e7155714798b83bc0e29996275e6e55f6fcc245777d1ec49eee421b048ddda3089ef7602c7fe2dc62e91c49 WHIRLPOOL 57ef977105948fe09dd8417394947462b82941299d979b76ce4f9043548f4ca781f898580cb27feaabc365b5552f5e8c4043f3fef8b03cbd88b6891864b82bcd
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ferret/ferret-0.11.8.4.ebuild,v 1.2 2012/08/16 14:19:27 flameeyes Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
# ruby19 fails tests
|
||||
USE_RUBY="ruby18 ree18"
|
||||
|
||||
RUBY_FAKEGEM_NAME="ferret"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="none"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="doc"
|
||||
RUBY_FAKEGEM_DOCDIR="doc/api"
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG RELEASE_CHANGES RELEASE_NOTES README TODO TUTORIAL"
|
||||
|
||||
inherit multilib ruby-fakegem
|
||||
|
||||
MY_P="${P/ruby-/}"
|
||||
DESCRIPTION="A ruby indexing/searching library"
|
||||
HOMEPAGE="http://ferret.davebalmain.com/trac/"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} -Cext extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
emake -Cext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
|
||||
cp ext/ferret_ext$(get_modname) lib/ || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -Ilib test/test_all.rb || die
|
||||
}
|
||||
@ -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/dev-ruby/ferret/ferret-0.11.8.5.ebuild,v 1.1 2012/12/20 07:26:20 graaff Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
# ruby19 fails tests
|
||||
USE_RUBY="ruby18 ruby19 ree18"
|
||||
|
||||
RUBY_FAKEGEM_NAME="ferret"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="none"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="doc"
|
||||
RUBY_FAKEGEM_DOCDIR="doc/api"
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG RELEASE_CHANGES RELEASE_NOTES README TODO TUTORIAL"
|
||||
|
||||
inherit multilib ruby-fakegem
|
||||
|
||||
MY_P="${P/ruby-/}"
|
||||
DESCRIPTION="A ruby indexing/searching library"
|
||||
HOMEPAGE="http://ferret.davebalmain.com/trac/"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} -Cext extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
emake -Cext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
|
||||
cp ext/ferret_ext$(get_modname) lib/ || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -Ilib test/test_all.rb || die
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST flog-2.5.3.gem 20480 SHA256 6e78f6de2bf2d216c3639585427c3ea0d3c4a84509a2a4bc934a23ee004ad788 SHA512 cff1c7cb95c02bd498644de0879bbab04f00ac606e5a920a7ebee89870909d2c93878ab354bdd2dc22635521cc8c0631489d33c780e44d2fec9aa0b4cc0992cd WHIRLPOOL 2d537d7a04b2db5df138e685fee65d554e0ec9c8cbe0647ecf97a1c8825187fd170d0294085f9f2b9cfa21f43a0f76818e9a2c451202ddf54cbc9da13618a926
|
||||
DIST flog-3.2.3.gem 22528 SHA256 eb215725d5700eff3e658cc96eb0972452f8a9265bae59d0391a5da44a82f457 SHA512 96d25ab52797362612d65eb318551864a34938ffd7ca2b5b3459be457a2d7bdec81c5f8a4cac2815cfa753bdc598ba13805f3997ca004934a703d5d2908cf4b2 WHIRLPOOL dd22f3eef2c6044dcfdad4ed354659133fc3af14a23b0efaea33fa8f93fa6e8fe06729c6ea0cce16092ed7243c48c8c07ca4420ca128fd173089e09eab77f0b3
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flog/flog-2.5.3.ebuild,v 1.2 2012/08/16 03:53:14 flameeyes Exp $
|
||||
|
||||
EAPI="2"
|
||||
USE_RUBY="ruby18 ree18"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="docs"
|
||||
RUBY_FAKEGEM_DOCDIR="doc"
|
||||
RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Flog reports the most tortured code in an easy to read pain report."
|
||||
HOMEPAGE="http://ruby.sadi.st/"
|
||||
LICENSE="MIT"
|
||||
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "doc? ( dev-ruby/hoe )"
|
||||
ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/minitest )"
|
||||
|
||||
ruby_add_rdepend "=dev-ruby/ruby_parser-2*
|
||||
=dev-ruby/sexp_processor-3*"
|
||||
@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/narray/narray-0.6.0.1.ebuild,v 1.7 2012/02/06 19:18:53 ranger Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
# jruby → native extension
|
||||
USE_RUBY="ruby18 ree18"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="ChangeLog README.en README.ja SPEC.en SPEC.ja"
|
||||
|
||||
RUBY_FAKEGEM_VERSION="${PV/_p/.}"
|
||||
|
||||
inherit multilib ruby-fakegem
|
||||
|
||||
DESCRIPTION="Numerical N-dimensional Array class"
|
||||
HOMEPAGE="http://www.ir.isas.ac.jp/~masa/ruby/index-e.html"
|
||||
SRC_URI="mirror://rubyforge/${PN}/${P/_/}.tar.gz"
|
||||
|
||||
LICENSE="Ruby"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 hppa ~mips ppc ~ppc64 x86"
|
||||
|
||||
IUSE=""
|
||||
|
||||
all_ruby_prepare() {
|
||||
# the tests aren't really written to be a testsuite, so the
|
||||
# failure cases will literally fail; ignore all of those ad
|
||||
# instead expect that the rest won't fail.
|
||||
sed -i -e '/[fF]ollowing will fail/,$ s:^:#:' \
|
||||
test/*.rb || die "sed failed"
|
||||
}
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} extconf.rb || die "extconf.rb failed"
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
emake CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed"
|
||||
cp -l ${PN}$(get_modname) lib || die "copy of ${PN}$(get_modname) failed"
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
for unit in test/*; do
|
||||
# Skip over the FFTW test because it needs a package we don't
|
||||
# have in tree.
|
||||
[[ ${unit} == test/testfftw.rb ]] && continue
|
||||
|
||||
${RUBY} -Ilib ${unit} || die "test ${unit} failed"
|
||||
done
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST oauth-0.4.6.gem 50688 SHA256 e8807fae9de2644a0a4699b174dcd811b1da7dbdab9f9a1f7f3491df0bc49d15 SHA512 d1658d871f776ed73cdada5c87b81e96b801d50d1dc7d3970e3576d00662cc07f0d2017bbf543a388fff99d9581075dc8af69eae8b39737b69a2078f5164ce84 WHIRLPOOL 1688a8f83efc99cecb7bcc5bc32d8183827c0d9be216ed69949b1c6239151980ed2fc9dcf0dfd09900246dfb6680892f9fdf8db17a807a8afbc8c3dd9bb2200d
|
||||
DIST oauth-0.4.7.gem 50688 SHA256 bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc SHA512 7d8df61574aaf53ffcb206c6a210546c36b67b2c545d6b31afef2961ee135050923f427dc4720379b7689eef9d921015c26fedd8b11bbd13761dd498155fc550 WHIRLPOOL 5a9dd0eeb2137db2b9810482dca116bf38c06ed75dff2df434118c147ed907d4fdad55dfd2e9c0751b42a110cd240c2ff70bfca75bcffc7f08dd454f65ca7591
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.6.ebuild,v 1.2 2012/08/04 14:14:14 graaff Exp $
|
||||
|
||||
EAPI="2"
|
||||
USE_RUBY="ruby18 ree18 ruby19"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="A RubyGem for implementing both OAuth clients and servers."
|
||||
HOMEPAGE="http://oauth.rubyforge.org/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "test? (
|
||||
dev-ruby/mocha
|
||||
dev-ruby/webmock )"
|
||||
USE_RUBY="ruby18 ree18" ruby_add_bdepend "test? ( >=dev-ruby/actionpack-2.3.8:2.3 )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# Ensure a consistent test order to avoid loading issues with e.g. rack
|
||||
sed -i -e "s/.rb']/.rb'].sort/" Rakefile || die
|
||||
}
|
||||
|
||||
each_ruby_prepare() {
|
||||
case ${RUBY} in
|
||||
*ruby18)
|
||||
# Ignore hash ordering test failures
|
||||
sed -i -e '183s:^:#:' -e '224s:^:#:' test/integration/consumer_test.rb || die
|
||||
;;
|
||||
*rubyee18)
|
||||
# Ignore hash ordering test failures
|
||||
sed -i -e '183s:^:#:' -e '224s:^:#:' test/integration/consumer_test.rb || die
|
||||
;;
|
||||
*ruby19)
|
||||
# Remove tests depending on rails.
|
||||
rm test/test_action_controller_request_proxy.rb || die
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.1-r1.ebuild,v 1.10 2013/01/15 06:12:11 zerochaos Exp $
|
||||
|
||||
EAPI=2
|
||||
USE_RUBY="ruby18 ree18 jruby"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST="spec"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="docs"
|
||||
RUBY_FAKEGEM_DOCDIR="doc"
|
||||
RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc TODO.txt Ruby1.9.rdoc Upgrade.rdoc"
|
||||
|
||||
RUBY_FAKEGEM_BINWRAP="spec"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
|
||||
HOMEPAGE="http://rspec.rubyforge.org/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
# it's actually optional, but tests fail if it's not installed and
|
||||
# some other package might fail tests, so require it anyway.
|
||||
ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.2"
|
||||
|
||||
ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.0.0 )"
|
||||
|
||||
RDEPEND="!<dev-ruby/rspec-rails-${PV}"
|
||||
|
||||
# don't require test dependencies for jruby since we cannot run them
|
||||
# for now (fakefs doesn't work).
|
||||
#
|
||||
# We should add nokogiri here to make sure that we test as much as
|
||||
# possible, but since it's yet unported to 1.9 and the nokogiri-due
|
||||
# tests fail for sure, we'll be waiting on it.
|
||||
USE_RUBY="ruby18 ree18" \
|
||||
ruby_add_bdepend "test? (
|
||||
>=dev-ruby/hoe-2.0.0
|
||||
dev-ruby/zentest
|
||||
>=dev-ruby/syntax-1.0
|
||||
>=dev-ruby/fakefs-0.2.1 )"
|
||||
|
||||
# the testsuite skips over heckle for Ruby 1.9 so we only request it for 1.8
|
||||
USE_RUBY="ruby18 ree18" \
|
||||
ruby_add_bdepend "test? ( >=dev-ruby/heckle-1.4.3 )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# Replace reference to /tmp to our temporary directory to avoid
|
||||
# sandbox-related failure.
|
||||
sed -i \
|
||||
-e "s:/tmp:${T}:" \
|
||||
spec/spec/runner/command_line_spec.rb || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
|
||||
ruby-ng_src_test
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
case ${RUBY} in
|
||||
*jruby)
|
||||
ewarn "Tests for JRuby are disabled because dev-ruby/fakefs does not currently support"
|
||||
ewarn "JRuby properly and it's needed to run the tests."
|
||||
;;
|
||||
*)
|
||||
each_fakegem_test
|
||||
;;
|
||||
esac
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST ruby-xslt-0.9.8.gem 34304 SHA256 bb164a15b207e3146132902735ef9c3c7bdf7dde24b7e60a0f1afae211f52fc9 SHA512 f54f498fcf9759be70faf9da0540dd9d58d60a7951d200d306c131203853177b79f947003226b7d36edc72588dce7f24321d45608b38e5f336b0a0d1dd060adb WHIRLPOOL 83c3c359ba71a463d7d70d3126abfc1159be86f9620c5817dccd3c6f3c78bfa05e6414495187112ffa3207b524af3fd0f09d0cf8e5890b94fb042d0386074126
|
||||
DIST ruby-xslt-0.9.9.gem 34816 SHA256 7dc7565e90719b5971ef9620f64180848a5d9e983e9abc74d76f7cf1b01a2f72 SHA512 8c23bff3406ae2712663f81fb46525df4938aee5bf85f5497ff33108e4fb0f443ca3389dedbbb9eea233e86e51c24938f699eae2bc62cbf291c04a56a9af36ff WHIRLPOOL a01a8a1cfc94de4455fdebd115eb83d5953977a0d57ac50cbdf6d8a874413744aa1a77fe31cfcab628a9d4cf7bdf45423156bb3ea65e904d598762f9ebd23537
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-xslt/ruby-xslt-0.9.8.ebuild,v 1.4 2012/05/01 18:24:08 armin76 Exp $
|
||||
|
||||
EAPI=2
|
||||
USE_RUBY="ruby18 ree18"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="ChangeLog AUTHORS README.rdoc"
|
||||
|
||||
inherit multilib ruby-fakegem
|
||||
|
||||
DESCRIPTION="A Ruby class for processing XSLT"
|
||||
HOMEPAGE="http://www.rubyfr.net/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="${DEPEND} >=dev-libs/libxslt-1.1.12"
|
||||
RDEPEND="${RDEPEND} >=dev-libs/libxslt-1.1.12"
|
||||
|
||||
# One test fails but we have installed this code already for a long
|
||||
# time so this probably isn't a regression. No upstream bug tracker to
|
||||
# report the problem :-(
|
||||
RESTRICT="test"
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} -C ext/xslt_lib extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
emake -C ext/xslt_lib || die
|
||||
mv ext/xslt_lib/xslt_lib$(get_modname) lib/xml/ || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -I../lib -Ctest test.rb || die
|
||||
}
|
||||
@ -1,3 +1 @@
|
||||
DIST sinatra-1.2.7.gem 246784 SHA256 5798f6400830308da34ac09cd321dd73402bf27c8fc77b92636634e609628195 SHA512 b4e3512c5b4d263b81012d6e5ee1cb6f29247480b7ecdcec66076fe1c3e971ed96a7800f5817767a3b4fd878f7ed09af7bf240a00465ed8d8609b65e29fc7a79 WHIRLPOOL 84a105030ffbd76b370e2f2b864ae36eb737376a7eab21488f3a6dbd7aa430a3d36e56ae13d9ac7dcc7b10816e27cb249c9db031cf83999843513a272207a179
|
||||
DIST sinatra-1.3.2.gem 276992 SHA256 ac6bc2e716ede58a2926ed0d4a3ef89db7561bcfc9b2a7cef73cde5f42727415 SHA512 d3ec42c2c19d28f7ff2de1a6d587339bbe2465f18d04f6b4e87e78e4ecdd0b2fccdbad0a44faba0a0440c5c4a715a40712f160f3d78f6e5d37acaa14867a908a WHIRLPOOL ab15c167bc06f20e71b471184d285cbe8e7aeda725510f48990c1586dbef660ec30f999073eed2a7fe4cc675a6e738ec811478b421bc92dfdaa7652302436305
|
||||
DIST sinatra-1.3.3.gem 306176 SHA256 ef027de9be93511b8b02ff8027c9d9a063f50d5615f3306ed6e0dbe69add8e63 SHA512 f481b0ba9656117e340a5d71f7880748b071652b7a1654137f619975be083c995d5c319013ab37b206abbcec51a74bf68330634c4f9e3eabcb48d673503261c8 WHIRLPOOL 3e8e0dc54fd5bcf77651d27d03aec3c51a1922c02c36b22f154b0c2311ecc6aa7be43a48e2966481392f095a5bd83e4501690c2292a3bfd02111d7129b092058
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.2.7.ebuild,v 1.6 2013/01/16 01:02:36 zerochaos Exp $
|
||||
|
||||
EAPI=2
|
||||
USE_RUBY="ruby18 ree18"
|
||||
|
||||
# no documentation is generable, it needs hanna, which is broken
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="README.rdoc AUTHORS CHANGES"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort."
|
||||
HOMEPAGE="http://www.sinatrarb.com/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend '=dev-ruby/rack-1.1* =dev-ruby/tilt-1*'
|
||||
ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 >=dev-ruby/haml-3.0 dev-ruby/erubis dev-ruby/builder )"
|
||||
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.3.2.ebuild,v 1.6 2013/01/16 01:02:36 zerochaos Exp $
|
||||
|
||||
EAPI=2
|
||||
USE_RUBY="ruby18 ruby19 ree18"
|
||||
|
||||
# no documentation is generable, it needs hanna, which is broken
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="README.rdoc AUTHORS CHANGES"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort."
|
||||
HOMEPAGE="http://www.sinatrarb.com/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend "=dev-ruby/rack-1* >=dev-ruby/rack-1.3.6
|
||||
>=dev-ruby/rack-protection-1.2:1
|
||||
=dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.3"
|
||||
ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 >=dev-ruby/haml-3.0 dev-ruby/erubis dev-ruby/builder )"
|
||||
@ -1,2 +1 @@
|
||||
DIST treetop-1.4.10.gem 181760 SHA256 e2aab49f88afd4bee4dee20ea3c0227dcc0c5159e0aed3e76a105e53dde1c405 SHA512 e28f11e600758be16b087372b297352343df69287452fbd6a6077ff7f87dcec0e666fc7e37a799e9fd0173a95befc215e7d9b6226427a4053639e99d491ea67c WHIRLPOOL ddc75e01f0fce40387eb848603281687f39d3d396a4a02a81bffd58d813fc38b1f00183056ed7d385daa4f1cf2d6d84750db9850c684792897fced0140ad4ac4
|
||||
DIST treetop-1.4.14.gem 183808 SHA256 9aa983f04630c853c7acae8504df492f22b6ab9be80e48be0e43eef5f8497361 SHA512 480de1f9191fc628ab53203d0387c6fef85dc86fbdcdf2367ef0c901af0163d8d2be99879ff731bef31f3b94e3a1f9e198c26c4c9b2d749ab1ee9f0185fe3ce6 WHIRLPOOL 2af050f1e5fd9346282ed7bcbf7c2d074627b62c1171166b8ae748caac5f56c0ec3d50759f8c836df3adc7c6acb28bb3083740b63931133a4a1e4030be3202c3
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/treetop/treetop-1.4.10-r1.ebuild,v 1.7 2013/01/16 00:15:13 zerochaos Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
# jruby fails tests, not investigated yet.
|
||||
USE_RUBY="ruby18 ree18 ruby19"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec"
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_DOCDIR="doc"
|
||||
RUBY_FAKEGEM_EXTRADOC="README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Treetop is a language for describing languages."
|
||||
HOMEPAGE="http://treetop.rubyforge.org/"
|
||||
LICENSE="Ruby"
|
||||
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "test? ( >=dev-ruby/rr-0.10.2 dev-ruby/rspec:2 dev-ruby/activesupport )"
|
||||
ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
|
||||
|
||||
all_ruby_prepare() {
|
||||
sed -i -e '4i require "rspec/core/shared_context"' spec/spec_helper.rb || die
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins -r examples/*
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/treetop/treetop-1.4.10.ebuild,v 1.7 2013/01/16 00:15:13 zerochaos Exp $
|
||||
|
||||
EAPI=4
|
||||
USE_RUBY="ruby18 ree18"
|
||||
# jruby fails tests, not investigated yet.
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_TASK_TEST="none"
|
||||
|
||||
RUBY_FAKEGEM_DOCDIR="doc"
|
||||
RUBY_FAKEGEM_EXTRADOC="README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Treetop is a language for describing languages."
|
||||
HOMEPAGE="http://treetop.rubyforge.org/"
|
||||
LICENSE="Ruby"
|
||||
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "test? ( >=dev-ruby/rr-0.10.2 dev-ruby/rspec:2 dev-ruby/activesupport )"
|
||||
ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -S rspec spec || die
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins -r examples/*
|
||||
}
|
||||
@ -1,5 +1,7 @@
|
||||
DIST NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run 41918865 SHA256 5ceb6ac9d973b7d3544ed5ee3c52de40451ca234df587fb93bd3c5b73f5610c4
|
||||
DIST cuda_5.0.35_linux_32_fedora16-1.run 583244929 SHA256 11927b4c0fb23dbf98457b852914b8458ef41cc1b7ea67bce892f2cc6a77d34e SHA512 d1cda0d53fdc86ac6412c5c92a16efd761d3f15f08878e1aa1c17bdf3bad824a0cebb5c211ad89b8dd15a439eddd0f93efe82ed0850dc93adcd3dab529f6daca WHIRLPOOL 11bc905a4a63171009569d6655b40f0d49034f71c0a93a83e1b656e91a4250c813e0a16fdfda87e9fbe4d250a312beb0c9ad073bfb0420fb4e06fdd26faf3cc9
|
||||
DIST cuda_5.0.35_linux_64_fedora16-1.run 701310481 SHA256 c2889c779215eea1c3cc6d4b092eb4208b7e1063704b6e5e8d48d04e961c3c0a SHA512 83903587d1715dd3a64db6bd676c0586edb81495da1bec22aac9995de31ca0b0db2460cccf4af0845befe0cee308ab019760c3c88eb351b6db0f255f7d93e546 WHIRLPOOL 33b998c66ebfa059d77eedb6b8465183f5ef4444ed5fe55f622efe6a2eeeef8e50e2cb09b0de4e61e15b5320495123ce46e1b47fc4cbbe96f3bde0ac93ff5dbc
|
||||
DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
|
||||
DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
|
||||
DIST gpucomputingsdk_4.2.9_linux.run 152436489 SHA256 b6a53afcf8f8422b5075aa37cec6730b0b9896d50867ee9105da05d62e95b8bb SHA512 1975f005ebd1520005d0a45ac680c8b49806705b8ed64738366b7166f384a304de3d655a05900b6da1088441024b149a1e963296ef78041c524ecbb1bb5e5315 WHIRLPOOL b8ce1f1f6a54b2d52f2531cfbb46f2a48e0b37f0c1dd898ff6222483afed7ac26c6bc57da31cafb0c30b3636b780ace3e3c679f25c6c4eaa26b0e39da00dcb8f
|
||||
DIST nvidia-cuda-sdk-5.0.35-asneeded.patch.xz 8892 SHA256 b79db5453350a1149771236e4dbdc4dc1504afd8f19472240c009f51048a27bc SHA512 7797a0ea6b0090e2d452acd644976a950c3b5cb3890073be41021fd3c6c1581a130bc7a8ee2da03131785de8dae6b9f09aff3a01a390ef909508e8c0c55863c8 WHIRLPOOL 0708a2d2eea767a490ce817b70292c2b2e6bfc8e1afb7b2f1bc73a3d170ebbd957a0d5be3a620611bc394cdefc4d37b7e43e2aa83e710396bc083aebc807429c
|
||||
|
||||
@ -0,0 +1,146 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.5.22.ebuild,v 1.1 2013/08/11 16:19:19 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit cuda eutils flag-o-matic toolchain-funcs unpacker versionator
|
||||
|
||||
MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
|
||||
|
||||
DESCRIPTION="NVIDIA CUDA Software Development Kit"
|
||||
HOMEPAGE="http://developer.nvidia.com/cuda"
|
||||
CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
|
||||
SRC_URI="
|
||||
amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
|
||||
x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
|
||||
|
||||
LICENSE="CUDPP"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="debug +doc +examples opencl +cuda"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-util/nvidia-cuda-toolkit-${PV}
|
||||
media-libs/freeglut
|
||||
examples? (
|
||||
media-libs/freeimage
|
||||
media-libs/glew
|
||||
virtual/mpi
|
||||
>=x11-drivers/nvidia-drivers-304.54
|
||||
)"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
S=${WORKDIR}/cuda-samples
|
||||
|
||||
QA_EXECSTACK=(
|
||||
opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
|
||||
opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
|
||||
opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
|
||||
opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
unpacker
|
||||
unpacker run_files/cuda-samples*run
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if use cuda || use opencl; then
|
||||
cuda_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
export RAWLDFLAGS="$(raw-ldflags)"
|
||||
|
||||
sed \
|
||||
-e 's:-O2::g' \
|
||||
-e 's:-O3::g' \
|
||||
-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
|
||||
-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
|
||||
-e "/CC/s:gcc:$(tc-getCC):g" \
|
||||
-e "/GCC/s:g++:$(tc-getCXX):g" \
|
||||
-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
|
||||
-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
|
||||
-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
|
||||
-e 's:-Wimplicit::g' \
|
||||
-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
|
||||
-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
|
||||
-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
|
||||
-i $(find . -type f -name "Makefile") || die
|
||||
|
||||
sed \
|
||||
-e "/^LDFLAGS/s|\(:=\)$|\1 ${LDFLAGS}|g" \
|
||||
-i 0_Simple/simpleMPI/Makefile || die
|
||||
|
||||
# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
|
||||
find common/inc/GL -delete || die
|
||||
find . -type f -name "*\.a" -delete || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use examples || return
|
||||
local myopts verbose="verbose=1"
|
||||
use debug && myopts+=" dbg=1"
|
||||
export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
|
||||
emake \
|
||||
cuda-install="${EPREFIX}/opt/cuda" \
|
||||
CUDA_PATH="${EPREFIX}/opt/cuda/" \
|
||||
${myopts} ${verbose}
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local _dir _subdir
|
||||
|
||||
addwrite /dev/nvidiactl
|
||||
addwrite /dev/nvidia0
|
||||
|
||||
for _dir in {0..9}*; do
|
||||
pushd ${_dir} > /dev/null
|
||||
for _subdir in *; do
|
||||
emake -C ${_subdir} run
|
||||
done
|
||||
popd > /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i j f t crap=""
|
||||
if use doc; then
|
||||
ebegin "Installing docs ..."
|
||||
dodoc -r doc releaseNotesData
|
||||
dohtml *htm*
|
||||
eend
|
||||
fi
|
||||
|
||||
crap+=" *.txt doc Samples.htm* releaseNotesData"
|
||||
|
||||
ebegin "Cleaning before installation..."
|
||||
for i in ${crap}; do
|
||||
if [[ -e ${i} ]]; then
|
||||
find ${i} -delete || die
|
||||
fi
|
||||
done
|
||||
eend
|
||||
|
||||
ebegin "Moving files..."
|
||||
for f in $(find .); do
|
||||
local t="$(dirname ${f})"
|
||||
if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
|
||||
continue
|
||||
fi
|
||||
if [[ ! -d ${f} ]]; then
|
||||
if [[ -x ${f} ]]; then
|
||||
exeinto /opt/cuda/sdk/${t}
|
||||
doexe ${f}
|
||||
else
|
||||
insinto /opt/cuda/sdk/${t}
|
||||
doins ${f}
|
||||
fi
|
||||
fi
|
||||
done
|
||||
eend
|
||||
}
|
||||
@ -1,4 +1,6 @@
|
||||
DIST cuda_5.0.35_linux_32_fedora16-1.run 583244929 SHA256 11927b4c0fb23dbf98457b852914b8458ef41cc1b7ea67bce892f2cc6a77d34e SHA512 d1cda0d53fdc86ac6412c5c92a16efd761d3f15f08878e1aa1c17bdf3bad824a0cebb5c211ad89b8dd15a439eddd0f93efe82ed0850dc93adcd3dab529f6daca WHIRLPOOL 11bc905a4a63171009569d6655b40f0d49034f71c0a93a83e1b656e91a4250c813e0a16fdfda87e9fbe4d250a312beb0c9ad073bfb0420fb4e06fdd26faf3cc9
|
||||
DIST cuda_5.0.35_linux_64_fedora16-1.run 701310481 SHA256 c2889c779215eea1c3cc6d4b092eb4208b7e1063704b6e5e8d48d04e961c3c0a SHA512 83903587d1715dd3a64db6bd676c0586edb81495da1bec22aac9995de31ca0b0db2460cccf4af0845befe0cee308ab019760c3c88eb351b6db0f255f7d93e546 WHIRLPOOL 33b998c66ebfa059d77eedb6b8465183f5ef4444ed5fe55f622efe6a2eeeef8e50e2cb09b0de4e61e15b5320495123ce46e1b47fc4cbbe96f3bde0ac93ff5dbc
|
||||
DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
|
||||
DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
|
||||
DIST cudatoolkit_4.2.9_linux_32_ubuntu11.04.run 209998124 SHA256 0c91d51e49c7cabc13fafa75cbf547c6902557cb5c3e19b4cf3c83c26172a03f SHA512 f1ca065e9cbe6273f165388d3579e28868c7b1330b341cabab9fdd6695fd3450dd8c77978a5aa3063617b371c68c37661b4f2d8fcbc4e585bb508254bef064ef WHIRLPOOL 9cbb668a1fba9748c0a42ce9a93ba0e7ff592c48155b0d87c22999f90aea29fc02120febcf4b07b8bd1ded96ca057ca0450261ea30ffdf5076e0991b10474a18
|
||||
DIST cudatoolkit_4.2.9_linux_64_ubuntu11.04.run 282394341 SHA256 22d857db6b3831670bc2ca7ed22ac257b6946f68f6e4b6f534ec98b69690ad38 SHA512 3a54c278f486cbc92a7e262f39183c7babca8ab6d04c5f85ff875d3b2bcdd699631049be375fde2a3ba2746bd5ea04ba0149616e245556257c470632b91b4b1c WHIRLPOOL eac55ac70ac986772b4cbd1b76940b41eaca20276ac68e59ccfb5a09eb41de7c023d78dc85392ebfb9e5d36ee7f29e31e0173aeca0b89a510e7c89c087b72f1f
|
||||
|
||||
@ -0,0 +1,132 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild,v 1.3 2013/08/11 12:29:44 jlec Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit cuda unpacker versionator
|
||||
|
||||
MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
|
||||
|
||||
DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
|
||||
HOMEPAGE="http://developer.nvidia.com/cuda"
|
||||
CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
|
||||
SRC_URI="
|
||||
amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
|
||||
x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
|
||||
|
||||
SLOT="0/${PV}"
|
||||
LICENSE="NVIDIA-CUDA"
|
||||
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="debugger doc eclipse profiler"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}
|
||||
sys-devel/gcc:4.7[cxx]
|
||||
!<=x11-drivers/nvidia-drivers-270.41
|
||||
debugger? (
|
||||
sys-libs/libtermcap-compat
|
||||
sys-libs/ncurses[tinfo]
|
||||
)
|
||||
eclipse? ( >=virtual/jre-1.6 )
|
||||
profiler? ( >=virtual/jre-1.6 )"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
QA_PREBUILT="opt/cuda/*"
|
||||
|
||||
pkg_setup() {
|
||||
# We don't like to run cuda_pkg_setup as it depends on us
|
||||
:
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpacker
|
||||
unpacker run_files/cuda-linux*.run
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local cuda_supported_gcc
|
||||
|
||||
cuda_supported_gcc="4.7"
|
||||
|
||||
sed \
|
||||
-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
|
||||
"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i j
|
||||
local remove="doc jre run_files install-linux.pl "
|
||||
local cudadir=/opt/cuda
|
||||
local ecudadir="${EPREFIX}"${cudadir}
|
||||
|
||||
# dodoc doc/*txt
|
||||
if use doc; then
|
||||
dodoc doc/pdf/*
|
||||
dohtml -r doc/html/*
|
||||
fi
|
||||
|
||||
use debugger || remove+=" bin/cuda-gdb extras/Debugger"
|
||||
( use profiler || use eclipse ) || remove+=" libnsight"
|
||||
use amd64 || remove+=" cuda-installer.pl"
|
||||
|
||||
if use profiler; then
|
||||
# hack found in install-linux.pl
|
||||
for j in nvvp nsight; do
|
||||
cat > bin/${j} <<- EOF
|
||||
#!${EPREFIX}/bin/sh
|
||||
LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
|
||||
UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
|
||||
${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
|
||||
EOF
|
||||
chmod a+x bin/${j}
|
||||
done
|
||||
else
|
||||
use eclipse || remove+=" libnvvp"
|
||||
remove+=" extras/CUPTI"
|
||||
fi
|
||||
|
||||
for i in ${remove}; do
|
||||
ebegin "Cleaning ${i}..."
|
||||
if [[ -e ${i} ]]; then
|
||||
find ${i} -delete || die
|
||||
eend
|
||||
else
|
||||
eend $1
|
||||
fi
|
||||
done
|
||||
|
||||
dodir ${cudadir}
|
||||
mv * "${ED}"${cudadir}
|
||||
|
||||
cat > "${T}"/99cuda <<- EOF
|
||||
PATH=${ecudadir}/bin:${ecudadir}/libnvvp
|
||||
ROOTPATH=${ecudadir}/bin
|
||||
LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
|
||||
EOF
|
||||
doenvd "${T}"/99cuda
|
||||
|
||||
make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
|
||||
|
||||
dobin "${T}"/cuda-config
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
local a b
|
||||
a="$(version_sort $(cuda-config -s))"; a=( $a )
|
||||
# greatest supported version
|
||||
b=${a[${#a[@]}-1]}
|
||||
|
||||
# if gcc and if not gcc-version is at least greatesst supported
|
||||
if [[ $(tc-getCC) == *gcc* ]] && \
|
||||
! version_is_at_least $(gcc-version) ${b}; then
|
||||
echo
|
||||
ewarn "gcc >= ${b} will not work with CUDA"
|
||||
ewarn "Make sure you set an earlier version of gcc with gcc-config"
|
||||
ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
|
||||
ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
|
||||
ewarn "to the nvcc compiler flags"
|
||||
echo
|
||||
fi
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
DIST mercurial-2.4.2.tar.gz 3613392 SHA256 cc21083d7eab4caa8159b941e36c7229acbb6d41a26a7bed21a771b3f63dedf3 SHA512 642dbcc9de6662e563059cafadbd4a0f1b4d6cebad48b2bfc7160571fad950a0110456be52690f1aeef6b91a4f6ac1edf6fc3607d1f590337a60c4b2bcab4625 WHIRLPOOL 64b7f5d620ed132849318e270bc97a0bed99f8be16d1c65da0a38dab47cf3f20bbe0f6b1b9ab145ca6df70c48ba70814df5c0c6c8fa07b271fcda251bb7c9ddf
|
||||
DIST mercurial-2.5.4.tar.gz 3673850 SHA256 c86fe9feb9aaada286fa297d9d68d1b16e2f842b8bd645826c81bc705a629d5a SHA512 928fdeaaf0eaec80adbd8765521de9666ab56aaa2101fb9ab2cb392d8b29475d3b052d89652ff9b67522cfcc6cd958717ac715f51b0573ee088e9a595f29afe2 WHIRLPOOL d90a0c6a8752442ad2f7e524a4b07910538aa9d910ae4889196eb41cdcc903dbfb3f17d18f54a788fcf8232e154852566503d652a3904b4b307242a7d306ce80
|
||||
DIST mercurial-2.6.2.tar.gz 3740489 SHA256 55b4a0e20e21ebd7a4341c828d2ec4ba72ba77d61b424e937a7f77c385220e3d SHA512 88aa79cb523b77beef0d637159abe096abd590f3193c65294eb8850cbfd355bf21784bb0e39338ce239d161d91be08ac7efb2cb3560f7b3cc83ade6e64a9c1b1 WHIRLPOOL 2a58ff31546cd32ebca207ad54656aa7d6b49a3caaeacd54abe5c774ad3b3fc31810c2ab4b8dd30bd3e5cc3e8613984cc209f7a6564cc4ef66a01002b2ddc119
|
||||
DIST mercurial-2.6.3.tar.gz 3736480 SHA256 12308a4210f1ee1185d03f18757742fa8a2759076c2e713f35432f89bf56911c SHA512 f739fb1455be998f0049b5266d8d5b1d8c3700526e853abc18bb215c8afc2b4d77e0c26d113cadab0c20483b9ecd98c9acce23e74e7a76492494b3b33389052c WHIRLPOOL fe12b34d16e5ee24f7da7b0c91a39f042ef4d97cc487f3998df1f52cc6586affa2cce012ab6bbc715dadcffc76d82fc80c2ad9258003d8dee5a5a0987a8b335c
|
||||
DIST mercurial-2.7.tar.gz 3755724 SHA256 f56267e254efa755202c8ed447bb6b92a1bc275d8a7c6ca3d70b471b0677bcfa SHA512 e425778edb0f71c34e719e04561ee3de37feaa1be4d60b94c780aebdbe6d41f8f4ab15103a8bbe8894ebeb228c42f0e2cd41b8db840f8384e1cd7cd2d5b67b97 WHIRLPOOL 020f2c1ca68b470a73451f55dd214abe0cf0f788f145b8e28163b8cd19f217b7dfb31dda65842f2f453d45ebcca3d60e7ac48317efb6a4d2b1b3787ba4820f8a
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue