root
9 years ago
parent
a71344ed58
commit
42cda5cd32
@ -0,0 +1,93 @@
|
||||
From 25a722e614eacc47e4658f0bca6343fa52f7d03f Mon Sep 17 00:00:00 2001
|
||||
From: abhishekkekane <abhishek.kekane@nttdata.com>
|
||||
Date: Thu, 12 Feb 2015 04:09:14 -0800
|
||||
Subject: [PATCH] Image data remains in backend for deleted image
|
||||
|
||||
Trying to delete image created using task api (import-from) image gets
|
||||
deleted from the database, but image data remains in the backend. Import
|
||||
task does not update the location of the image and it remains None even
|
||||
image becomes active. Location entry is not added in the database in
|
||||
image_locations table.
|
||||
|
||||
Added location information to the image before saving the image in
|
||||
the database.
|
||||
|
||||
SecurityImpact
|
||||
|
||||
Conflicts:
|
||||
glance/common/scripts/image_import/main.py
|
||||
|
||||
Change-Id: Ie389de6538a9b98dc51c7d781b81b3ab10b83842
|
||||
Closes-Bug: #1420696
|
||||
(cherry picked from commit 78b5b0a9575cd5e9c4543ec0e8fd6072af1f0ebb)
|
||||
---
|
||||
glance/common/scripts/image_import/main.py | 30 +++++++++++-----------
|
||||
.../unit/common/scripts/image_import/test_main.py | 3 ++-
|
||||
2 files changed, 17 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/glance/common/scripts/image_import/main.py b/glance/common/scripts/image_import/main.py
|
||||
index 24dd52b..72c992e 100644
|
||||
--- a/glance/common/scripts/image_import/main.py
|
||||
+++ b/glance/common/scripts/image_import/main.py
|
||||
@@ -84,29 +84,29 @@ def import_image(image_repo, image_factory, task_input, task_id, uri):
|
||||
# NOTE: set image status to saving just before setting data
|
||||
original_image.status = 'saving'
|
||||
image_repo.save(original_image)
|
||||
- set_image_data(original_image, uri, None)
|
||||
-
|
||||
- # NOTE: Check if the Image is not deleted after setting the data
|
||||
- # before setting it's status to active. We need to set the status
|
||||
- # explicitly here using the Image object returned from image_repo .The
|
||||
- # Image object returned from create_image method does not have appropriate
|
||||
- # factories wrapped around it.
|
||||
image_id = original_image.image_id
|
||||
+
|
||||
+ # NOTE: Retrieving image from the database because the Image object
|
||||
+ # returned from create_image method does not have appropriate factories
|
||||
+ # wrapped around it.
|
||||
new_image = image_repo.get(image_id)
|
||||
- if new_image.status in ['saving']:
|
||||
- new_image.status = 'active'
|
||||
- new_image.size = original_image.size
|
||||
- new_image.virtual_size = original_image.virtual_size
|
||||
- new_image.checksum = original_image.checksum
|
||||
+ set_image_data(new_image, uri, None)
|
||||
+
|
||||
+ # NOTE: Check if the Image is not deleted after setting the data
|
||||
+ # before saving the active image. Here if image status is
|
||||
+ # saving, then new_image is saved as it contains updated location,
|
||||
+ # size, virtual_size and checksum information and the status of
|
||||
+ # new_image is already set to active in set_image_data() call.
|
||||
+ image = image_repo.get(image_id)
|
||||
+ if image.status == 'saving':
|
||||
+ image_repo.save(new_image)
|
||||
+ return image_id
|
||||
else:
|
||||
msg = _LE("The Image %(image_id)s object being created by this task "
|
||||
"%(task_id)s, is no longer in valid status for further "
|
||||
"processing." % {"image_id": new_image.image_id,
|
||||
"task_id": task_id})
|
||||
raise exception.Conflict(msg)
|
||||
- image_repo.save(new_image)
|
||||
-
|
||||
- return image_id
|
||||
|
||||
|
||||
def create_image(image_repo, image_factory, image_properties, task_id):
|
||||
diff --git a/glance/tests/unit/common/scripts/image_import/test_main.py b/glance/tests/unit/common/scripts/image_import/test_main.py
|
||||
index 27f502b..a81a66c 100644
|
||||
--- a/glance/tests/unit/common/scripts/image_import/test_main.py
|
||||
+++ b/glance/tests/unit/common/scripts/image_import/test_main.py
|
||||
@@ -56,7 +56,8 @@ class TestImageImport(test_utils.BaseTestCase):
|
||||
image_id,
|
||||
image_import_script.import_image(image_repo, image_factory,
|
||||
task_input, None, uri))
|
||||
- self.assertEqual('active', image.status)
|
||||
+ # Check image is in saving state before image_repo.save called
|
||||
+ self.assertEqual('saving', image.status)
|
||||
self.assertTrue(image_repo.save.called)
|
||||
mock_set_img_data.assert_called_once_with(image, uri, None)
|
||||
self.assertTrue(image_repo.get.called)
|
||||
--
|
||||
2.0.5
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
DIST Rex-0.55.1.tar.gz 242848 SHA256 cb45b2e6aba133fddc9a2bf11d4d6decdd62f1e8edfce8f3bd54b7e42ea0f57d SHA512 2d438117128b316fcf37dd9060f0f506d9485b10ae75903cde75abd7692e96404f16b75904c1089cd07487992b862b74637589500cd7a3336d235da000a0506e WHIRLPOOL 0a6f8b98b631fa0721731d03478a8fca22d27322645293d2c1d48704698f65f883a8302c473e5d297f1314200c196a0597a352bbb76670ac2451d1c7940a3dad
|
||||
DIST Rex-0.56.0.tar.gz 262842 SHA256 c50f7014bbc8ebf0a92f5f8c57239018f1c764034948bbc483e618b908672e88 SHA512 32a36d96eefc6d801562ded928a2d3227577e30c7ac8270cc40574b602072e270f5e64c949297ed463b779c8e606231ce0de250acae729767bb042d7d1fa9c9d WHIRLPOOL 409f5c56955152d34eb336e64d4915b78d4c9b5fdeef73d4052019661dec6833f8c7da41b3cc6b529c26497c225032c7f58e9a542cdccaa6412085c25374a1b3
|
||||
DIST Rex-0.56.1.tar.gz 263079 SHA256 ef655b16149b048302c27b6a5b3ad767623c7c81be5d2f851dd853ce397645fd SHA512 793960958d0a5b601f59d888fdd4e06d55664a9f75e9c26482abb1acf2701143505d460b5d8b5aa46f6f950d9174bcfc5534f925f7629da0b5e10e9d9e58b92f WHIRLPOOL 86121a6f3fe0f6953c9d0f491167b6f72d3dd6daeca78f998d82e93d272d8f6cca9466a0d09c7dea5f561cc20b8798b02f9be3b7ac25dd61af9743b29d77b8c7
|
||||
DIST Rex-1.0.0.tar.gz 261873 SHA256 894ba5128842b33cbc5dfeabdbeded18f303d2efbb082d08c9fceb38a7a0217b SHA512 53eb51e88e466f9dc429da828e3745c074eac1e1f1ba02f5c4f058358f071cd6eb71a95d56f65bd9b0e142aa824b2c660b7e7fe83c9ecd742dec12c3a4b642d4 WHIRLPOOL dc6b0dcd6ef3b1de4a7839a47054481b036bbd5395702c110e7760173797428b24d198bd50d8975045bd740a6180278bc34eef57c827e4d6a17a316577f16608
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/rex/rex-1.0.0.ebuild,v 1.1 2015/03/09 03:02:07 patrick Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=JFRIED
|
||||
MODULE_VERSION=0.53.1
|
||||
MODULE_A=Rex-${PV}.tar.gz
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-perl/Net-SSH2"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-perl/JSON-XS
|
||||
dev-perl/XML-Simple
|
||||
dev-perl/Digest-SHA1
|
||||
dev-perl/Digest-HMAC
|
||||
dev-perl/Expect
|
||||
dev-perl/DBI
|
||||
dev-perl/yaml
|
||||
dev-perl/libwww-perl
|
||||
dev-perl/String-Escape
|
||||
dev-perl/List-MoreUtils
|
||||
dev-perl/Parallel-ForkManager
|
||||
dev-perl/Text-Glob"
|
||||
|
||||
SRC_TEST="do"
|
||||
|
||||
S="${WORKDIR}/Rex-${PV}"
|
||||
@ -1 +1,2 @@
|
||||
DIST mousepad-0.3.0.tar.bz2 481125 SHA256 10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d SHA512 4e8f7cd8f05265c7f3964f0f5196721136c501351aa8c7bae1e3a6056fcd61f40364f2bb226817d458afa3707334dd600efbae2f8d050d65841ef03085717e42 WHIRLPOOL ed3582231bca8d3ea1f5a4adaf6279cd48d3628ba1154db80c6fb037b0efacbaf7535dad9bb4631982cfa5ee73514a628c340cb017514b0ab29d028b3c974b1c
|
||||
DIST mousepad-0.4.0.tar.bz2 578483 SHA256 60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe WHIRLPOOL dd087f38d75836d28cdae3a851d2ede0246a66db104710bab919928d32b63e470c95d77ff09c34c92e90322f14d5f85f83dc913acc529b8dd95ad8bc2712b9c1
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/mousepad/mousepad-0.4.0.ebuild,v 1.2 2015/03/09 17:21:18 zerochaos Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit gnome2-utils xfconf
|
||||
|
||||
DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
|
||||
HOMEPAGE="http://goodies.xfce.org/projects/applications/start"
|
||||
SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug dbus gtk3"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.30:2=
|
||||
dbus? ( >=dev-libs/dbus-glib-0.100:0= )
|
||||
!gtk3? ( >=x11-libs/gtk+-2.24:2=
|
||||
x11-libs/gtksourceview:2.0= )
|
||||
gtk3? ( x11-libs/gtk+:3=
|
||||
x11-libs/gtksourceview:3.0= )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
dev-util/intltool
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_setup() {
|
||||
XFCONF=(
|
||||
$(xfconf_use_debug)
|
||||
$(use_enable dbus)
|
||||
$(use_enable gtk3)
|
||||
)
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README TODO )
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
xfconf_pkg_preinst
|
||||
gnome2_schemas_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xfconf_pkg_postinst
|
||||
gnome2_schemas_update
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST texstudio-2.8.4.tar.gz 25126093 SHA256 b4a867f9cce1af962069f4429bc774e30b0f7d79b4297b71667ab5b8fa2d9e3f SHA512 f27a7eb0bad205d8a8155c40ce95d5a45565c261267073200d91430bb982385fced21dcaf0d2a43c554cc9194ea6a511ae7e2147584c20b67c075a0f298452cd WHIRLPOOL 333b1c3409e9e645eaae7773d2b5556b931ff9763211c242570711f6630411f316bbd0d7dd91613106b88a74ef0eba3c198c69bd295224b63d2d2ad69fa046e3
|
||||
DIST texstudio-2.8.6.tar.gz 25183578 SHA256 b665040c34ad6cd98d8f6e041393028f115da4dfb5bb8829b49dfa5a96fa755f SHA512 af8b4dd54c57c1f34fc316095075c3beee13f323cef0db9b364e7c929ff6d7bfe1d6d66bd7e6bf1127b8394ad6e452510248e11b5c009d6ffba355edffdf064d WHIRLPOOL 6707398bb405c820c3e0591bc0a0f58ad152f01950c4aa4a4a4aeba12d078f29087ef5dac3274f745ebf26c17049bc1dc168b51c53c8a6e9a1626eae41994413
|
||||
DIST texstudio-2.8.8.tar.gz 25198033 SHA256 5d00c42425c0d1464438c0c1701508fef281f5dbdd0fbcebdbba9de60ac6db95 SHA512 b4f50368ac4a145ad6cb6c764d2d84ac0c3b0b08903b53390e34fb3a8d2e2c12b72cdf77cf97ea22df94a29438be6db3004f8663e04c5254ae40bf28bc2be152 WHIRLPOOL 08d4af41163ebfa85539001fe540a5f48b86e341d93983a42da03015d00460b30280f5fa08c50c90c97d7e1ed38d324efea666c6640b6bba421cffd832031e27
|
||||
DIST texstudio-2.9.0.tar.gz 25296387 SHA256 e984ebc4393de13d9f20f474ce88382d587b2f8d0fb741f606a790a8f84a974a SHA512 5985162bd9695e1c5b4377e8230e4bc41de0becc0b41dc8d23f428824d58ea91eb83dd52d2546c457350b039423ab6e4f6ae7d8fffcb701345d0c3f8f02da5b4 WHIRLPOOL 2e3ae47c585ca452a5bf822c9e4da8ad6204ee2273753c21f87a04f65f2d166c3bc5936502a2c9de83e6446ecad2587ccdb223820d4968f60918cf63ebf85c73
|
||||
|
||||
@ -0,0 +1,109 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.9.0.ebuild,v 1.2 2015/03/09 17:28:38 jlec Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit base fdo-mime prefix qmake-utils
|
||||
|
||||
DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
|
||||
HOMEPAGE="http://texstudio.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
IUSE="video +qt4 qt5"
|
||||
|
||||
REQUIRED_USE="^^ ( qt4 qt5 )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-text/hunspell
|
||||
app-text/poppler:=[qt4?,qt5?]
|
||||
>=dev-libs/quazip-0.7.1[qt4?,qt5?]
|
||||
dev-qt/qtsingleapplication[qt4?,qt5?]
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
qt4? (
|
||||
dev-qt/designer:4
|
||||
>=dev-qt/qtgui-4.8.5:4
|
||||
>=dev-qt/qtcore-4.6.1:4
|
||||
>=dev-qt/qtscript-4.6.1:4
|
||||
>=dev-qt/qtsvg-4.6.1:4
|
||||
>=dev-qt/qttest-4.6.1:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/designer:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtscript:5
|
||||
dev-qt/qtsvg:5
|
||||
dev-qt/qttest:5
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
video? ( media-libs/phonon[qt4?,qt5?] )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
virtual/latex-base
|
||||
app-text/psutils
|
||||
app-text/ghostscript-gpl
|
||||
media-libs/netpbm"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
S="${WORKDIR}"/${P/-/}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch
|
||||
"${FILESDIR}"/${PN}-2.8.2-desktop.patch
|
||||
# Get it from fedora
|
||||
"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
|
||||
|
||||
if use video; then
|
||||
sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
|
||||
fi
|
||||
|
||||
sed \
|
||||
-e '/hunspell.pri/d' \
|
||||
-e '/quazip.pri/d' \
|
||||
-e '/qtsingleapplication.pri/d' \
|
||||
-e '/QUAZIP_STATIC/d' \
|
||||
-i ${PN}.pro || die
|
||||
|
||||
# cat >> ${PN}.pro <<- EOF
|
||||
# exists(texmakerx_my.pri):include(texmakerx_my.pri)
|
||||
# EOF
|
||||
|
||||
cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
|
||||
eprefixify ${PN}.pri
|
||||
|
||||
epatch ${PATCHES[@]}
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use qt5; then
|
||||
eqmake5
|
||||
else
|
||||
eqmake4
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i
|
||||
for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
|
||||
insinto /usr/share/icons/hicolor/${i}
|
||||
newins utilities/${PN}${i}.png ${PN}.png
|
||||
done
|
||||
emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST djview-4.7.tar.gz 876307 SHA256 2c5df0f96031e2f4b1b1c05728396e918a404f715f981da7ab6fbb0ee7c8ef2d SHA512 312abbe02dcef49e8deb7251a333efdfbcbdbd7aab31e2a0037cbd20acab148bb05a31b9fb1020fb825cafe6b6ca9509740970ff1bc2ea7931c98ae5070f24ec WHIRLPOOL e56d24ad87a5468208a3d0002d006662732533224ac020b4a909ce9ddc79a45f773bdb9ecf5b2c09fc8084961f0b398d77c3e47d6a35d4d0512951a45e740892
|
||||
DIST djview-4.8.tar.gz 883481 SHA256 8c746e7c2945ca6e08046b49d0d0aeca95d389d82365cd71111025b9d796c89f SHA512 21bdf30bd4b63f95fe0bb25650c08defc43bdd3041122c7c78a93268942d0e2e92822a78a8e101e35f50c363a3b3ce5dd31d6ff1c19c163833d086bd8422402c WHIRLPOOL 028f2d865c03e61cc341bcea368f2b3cc4689108d0ceabbc6830cb1f1160f444838125a8551576c50cffc6908ca8dd791527bbf5eb3d5bacc9bcd965c9d9eb69
|
||||
DIST djview-4.10.tar.gz 1077198 SHA256 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f SHA512 b3755992df2000f088a93c0d77d4a2ea62f6495f67106142d4787b94d248c54561068a40700c18325c0977a057b26948762a7b71c392b0ccef455776dcb0aad0 WHIRLPOOL 179d850a994521c02a7c64e17aa8d5c618011e8a765023325bc86e19f8b7797ac1f70962b1ccb9438b3a853463c797698a29d09f937317fa0ab0ac65b5016f29
|
||||
DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.7.ebuild,v 1.11 2013/03/02 19:41:41 hwoarang Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils autotools versionator toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
|
||||
|
||||
MY_P=${PN}-$(replace_version_separator 2 '-')
|
||||
|
||||
DESCRIPTION="Portable DjVu viewer using Qt4"
|
||||
HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
|
||||
SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 x86"
|
||||
IUSE="debug nsplugin"
|
||||
|
||||
RDEPEND="
|
||||
>=app-text/djvu-3.5.22-r1
|
||||
dev-qt/qtgui:4"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/autoconf-2.67
|
||||
virtual/pkgconfig
|
||||
nsplugin? ( dev-libs/glib:2 )"
|
||||
|
||||
S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
|
||||
|
||||
src_prepare() {
|
||||
# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
|
||||
sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
|
||||
sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
|
||||
rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
|
||||
AT_M4DIR="config" eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# See config/acinclude.m4
|
||||
use debug || append-cppflags "-DNDEBUG"
|
||||
|
||||
# QTDIR is needed because of kde3
|
||||
QTDIR=/usr \
|
||||
econf \
|
||||
--with-x \
|
||||
$(use_enable nsplugin nsdejavu) \
|
||||
--disable-desktopfiles
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC=$(tc-getCC) CXX=$(tc-getCXX)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" \
|
||||
plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
|
||||
install
|
||||
|
||||
dodoc README NEWS
|
||||
|
||||
cd desktopfiles
|
||||
insinto /usr/share/icons/hicolor/32x32/apps
|
||||
newins hi32-djview4.png djvulibre-djview4.png
|
||||
insinto /usr/share/icons/hicolor/64x64/apps
|
||||
newins hi64-djview4.png djvulibre-djview4.png
|
||||
insinto /usr/share/icons/hicolor/scalable/apps
|
||||
newins djview.svg djvulibre-djview4.svg
|
||||
domenu djvulibre-djview4.desktop
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
From: Leon Bottou <leon@bottou.org>
|
||||
Date: Mon, 2 Apr 2012 14:11:36 +0000 (-0700)
|
||||
Subject: removed swap (use qSwap instead).
|
||||
X-Git-Tag: release.4.9~5
|
||||
X-Git-Url: http://djvu.git.sourceforge.net/git/gitweb.cgi?p=djvu%2Fdjview.git;a=commitdiff_plain;h=7d4802964b9e74506c63f43505b632f6e7b5db3c;hp=6389dcba572c6439acd226d27872c2f0db583875
|
||||
|
||||
removed swap (use qSwap instead).
|
||||
|
||||
Fixes Gentoo bug 401517, compilation problems with qt-4.8.
|
||||
Unclear why is namespace std in scope at this point when using qt-4.8...
|
||||
---
|
||||
|
||||
diff --git a/src/qdjvuwidget.cpp b/src/qdjvuwidget.cpp
|
||||
index 52ac366..8136d07 100644
|
||||
--- a/src/qdjvuwidget.cpp
|
||||
+++ b/src/qdjvuwidget.cpp
|
||||
@@ -152,15 +152,6 @@ all_numbers(const char *s)
|
||||
return true;
|
||||
}
|
||||
|
||||
-template<class T> static inline void
|
||||
-swap(T& x, T& y)
|
||||
-{
|
||||
- T tmp;
|
||||
- tmp = x;
|
||||
- x = y;
|
||||
- y = tmp;
|
||||
-}
|
||||
-
|
||||
template<class T> static inline int
|
||||
ksmallest(T *v, int n, int k)
|
||||
{
|
||||
@@ -173,11 +164,11 @@ ksmallest(T *v, int n, int k)
|
||||
/* Sort v[lo], v[m], v[hi] by insertion */
|
||||
m = (lo+hi)/2;
|
||||
if (v[lo]>v[m])
|
||||
- swap(v[lo],v[m]);
|
||||
+ qSwap(v[lo],v[m]);
|
||||
if (v[m]>v[hi]) {
|
||||
- swap(v[m],v[hi]);
|
||||
+ qSwap(v[m],v[hi]);
|
||||
if (v[lo]>v[m])
|
||||
- swap(v[lo],v[m]);
|
||||
+ qSwap(v[lo],v[m]);
|
||||
}
|
||||
/* Extract pivot, place sentinel */
|
||||
pivot = v[m];
|
||||
@@ -191,7 +182,7 @@ ksmallest(T *v, int n, int k)
|
||||
do ++l; while (v[l]<pivot);
|
||||
do --h; while (v[h]>pivot);
|
||||
if (l < h) {
|
||||
- swap(v[l],v[h]);
|
||||
+ qSwap(v[l],v[h]);
|
||||
goto loop;
|
||||
}
|
||||
/* Finish up */
|
||||
@ -1 +1,2 @@
|
||||
DIST djvulibre-3.5.25.3.tar.gz 2543949 SHA256 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b WHIRLPOOL 43ce341be7dd6322f7bf05ed541e9eb6b8b923d95893bb8f8b78761ae452384e39c39e23723b4d0fc7fe8e95301dc414ac9c2d74a169a6ae12b86e5968f1edc3
|
||||
DIST djvulibre-3.5.27.tar.gz 3648522 SHA256 e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee WHIRLPOOL 7caff93eeaaaccb393c03013b62220cfc1b1a50e4d6da4a107ae0267fed1f5f9e6d3ad2b61845be5192b67917ec064a2c21c0f4ad567d4b0d6f56168ae4593bc
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.27.ebuild,v 1.1 2015/03/09 07:57:23 aballier Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils fdo-mime flag-o-matic
|
||||
|
||||
MY_P="${PN}libre-${PV#*_p}"
|
||||
|
||||
DESCRIPTION="DjVu viewers, encoders and utilities"
|
||||
HOMEPAGE="http://djvu.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
|
||||
IUSE="debug doc jpeg tiff xml"
|
||||
|
||||
RDEPEND="jpeg? ( virtual/jpeg:0 )
|
||||
tiff? ( media-libs/tiff:0= )"
|
||||
DEPEND="${RDEPEND}
|
||||
|| ( gnome-base/librsvg media-gfx/inkscape )"
|
||||
|
||||
S=${WORKDIR}/${MY_P%%.3}
|
||||
|
||||
src_configure() {
|
||||
use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
|
||||
|
||||
# We install all desktop files by hand.
|
||||
econf \
|
||||
$(use_enable xml xmltools) \
|
||||
$(use_with jpeg) \
|
||||
$(use_with tiff) \
|
||||
--disable-desktopfiles
|
||||
}
|
||||
|
||||
DOCS=( NEWS README )
|
||||
|
||||
src_install() {
|
||||
default
|
||||
prune_libtool_files
|
||||
|
||||
use doc && dodoc -r doc
|
||||
|
||||
# Install desktop files.
|
||||
cd desktopfiles
|
||||
for i in {22,32,48,64}; do
|
||||
insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
|
||||
newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
|
||||
done
|
||||
insinto /usr/share/mime/packages
|
||||
doins djvulibre-mime.xml
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_mime_database_update
|
||||
if ! has_version app-text/djview; then
|
||||
elog "For djviewer or browser plugin, emerge app-text/djview."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST dvipng-1.14.tar.gz 173686 SHA256 43f5b57d0fab29398dcec1b849e8bebbcacb0b9c06875d2ac84a049be3c5b350 SHA512 d7dda0e83ec93c0ebb9c970f2464ed1b04cdd41c178165db6da7c37b90810f3be0a513b9a43162563cb5ca15a7dec3c12a49f27abeb44fca3739090661ab53ba WHIRLPOOL 5510c41343ddc4f628eaac44b47e1e865b964d043ebf920706098f98e9f56d4557553487c15fd1931ea862350b1984f2276a37bd85ed60fb9a0b2caaa7293bc6
|
||||
DIST dvipng-1.15.tar.gz 171529 SHA256 197e9fd0f87ede32dc4bc1d39ec2cd72fa5260856f9d0dc2d8e6895130408347 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c WHIRLPOOL 4c0c5e410b107cd6cb56f9360acd556ae4336855d0624800d96e46cd29caead0467bc554d3d1c404e4564a3ce7b3732386f6af93ea98312c6b17745582f4ef92
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/dvipng/dvipng-1.15.ebuild,v 1.1 2015/03/09 07:44:39 aballier Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Translate DVI files into PNG or GIF graphics"
|
||||
HOMEPAGE="http://dvipng.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3+ Texinfo-manual"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE="truetype test"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/kpathsea
|
||||
media-libs/gd[jpeg,png]
|
||||
media-libs/libpng:0=
|
||||
virtual/latex-base
|
||||
sys-libs/zlib
|
||||
truetype? ( >=media-libs/freetype-2.1.5 )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/texi2dvi
|
||||
test? ( dev-texlive/texlive-fontsrecommended )"
|
||||
|
||||
DOCS="ChangeLog README RELEASE"
|
||||
|
||||
src_configure() {
|
||||
if ! use truetype; then
|
||||
sed -i -e 's/FT_Init_FreeType/dIsAbLe&/' configure || die "sed failed"
|
||||
fi
|
||||
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
econf
|
||||
}
|
||||
@ -0,0 +1,193 @@
|
||||
diff -up source/texk/devnag/src/devnag.c.format source/texk/devnag/src/devnag.c
|
||||
--- source/texk/devnag/src/devnag.c.format 2013-12-22 17:03:35.000000000 +0100
|
||||
+++ source/texk/devnag/src/devnag.c 2013-12-26 20:13:56.390766885 +0100
|
||||
@@ -2395,7 +2395,7 @@ void put_macro(short macro) {
|
||||
void err_ill(const char *str) {
|
||||
fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
|
||||
str, linenumber);
|
||||
- fprintf(stderr, inbuf);
|
||||
+ fprintf(stderr, "%s", inbuf);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
diff -up source/texk/dvidvi/dvidvi.c.format source/texk/dvidvi/dvidvi.c
|
||||
--- source/texk/dvidvi/dvidvi.c.format 2013-12-22 17:03:36.000000000 +0100
|
||||
+++ source/texk/dvidvi/dvidvi.c 2013-12-26 20:13:56.390766885 +0100
|
||||
@@ -327,7 +327,7 @@ static void stringdvibuf(integer p, inte
|
||||
* Print a usage error messsage, and quit.
|
||||
*/
|
||||
static void usage(void) {
|
||||
- (void)fprintf(stderr,banner);
|
||||
+ (void)fprintf(stderr,"%s",banner);
|
||||
(void)fprintf(stderr,"Usage: dvidvi [options] input[.dvi] [output]\n");
|
||||
(void)fprintf(stderr,"where options are:\n");
|
||||
(void)fprintf(stderr," [-f n] first page printed [-l n] last page printed\n");
|
||||
@@ -806,7 +806,7 @@ default:
|
||||
} /* else argument with '-' */
|
||||
} /* for */
|
||||
if (*iname == 0) {
|
||||
- (void)fprintf(stderr, banner) ;
|
||||
+ (void)fprintf(stderr, "%s", banner) ;
|
||||
error("! no input file specified");
|
||||
}
|
||||
/* Inserted by djc@dsmail.hmi.de 3.8.1994 */
|
||||
@@ -817,7 +817,7 @@ default:
|
||||
}
|
||||
|
||||
if (*oname != 0 && !quiet) {
|
||||
- (void)fprintf(stderr, banner) ;
|
||||
+ (void)fprintf(stderr, "%s", banner) ;
|
||||
(void)fprintf(stderr, "%s -> %s\n",iname,oname);
|
||||
temp = nextstring ;
|
||||
}
|
||||
diff -up source/texk/dvi2tty/dvi2tty-5.3.4/DVI.format source/texk/dvi2tty/dvi2tty-5.3.4/DVI
|
||||
diff -up source/texk/ps2pkm/objects.h.format source/texk/ps2pkm/objects.h
|
||||
--- source/texk/ps2pkm/objects.h.format 2013-12-22 17:03:29.000000000 +0100
|
||||
+++ source/texk/ps2pkm/objects.h 2013-12-26 20:13:56.390766885 +0100
|
||||
@@ -232,7 +232,7 @@ struct xobject {
|
||||
/*SHARED*/
|
||||
/* NDW: personally, I want to see status and error messages! */
|
||||
#define IfTrace0(condition,model) \
|
||||
- {if (condition) printf(model);}
|
||||
+ {if (condition) printf("%s",model);}
|
||||
#define IfTrace1(condition,model,arg0) \
|
||||
{if (condition) printf(model,arg0);}
|
||||
#define IfTrace2(condition,model,arg0,arg1) \
|
||||
diff -up source/texk/web2c/cwebboot.cin.format source/texk/web2c/cwebboot.cin
|
||||
--- source/texk/web2c/cwebboot.cin.format 2013-12-22 17:03:30.000000000 +0100
|
||||
+++ source/texk/web2c/cwebboot.cin 2013-12-26 20:13:56.390766885 +0100
|
||||
@@ -1090,7 +1090,7 @@ void
|
||||
fatal(const char*s,const char*t)
|
||||
#line 1182 "cwebdir/common.w"
|
||||
{
|
||||
-if(*s)printf(s);
|
||||
+if(*s)printf("%s",s);
|
||||
err_print(t);
|
||||
history= fatal_message;exit(wrap_up());
|
||||
}
|
||||
diff -up source/texk/web2c/cwebdir/common.c.format source/texk/web2c/cwebdir/common.c
|
||||
--- source/texk/web2c/cwebdir/common.c.format 2013-12-22 17:03:31.000000000 +0100
|
||||
+++ source/texk/web2c/cwebdir/common.c 2013-12-26 20:13:56.391766888 +0100
|
||||
@@ -1063,7 +1063,7 @@ void
|
||||
fatal(s,t)
|
||||
char*s,*t;
|
||||
{
|
||||
-if(*s)printf(s);
|
||||
+if(*s)printf("%s",s);
|
||||
err_print(t);
|
||||
history= fatal_message;exit(wrap_up());
|
||||
}
|
||||
diff -up source/texk/web2c/cwebdir/common.w.format source/texk/web2c/cwebdir/common.w
|
||||
--- source/texk/web2c/cwebdir/common.w.format 2013-12-22 17:03:31.000000000 +0100
|
||||
+++ source/texk/web2c/cwebdir/common.w 2013-12-26 20:13:56.391766888 +0100
|
||||
@@ -1180,7 +1180,7 @@ concatenated to print the final error me
|
||||
fatal(s,t)
|
||||
char *s,*t;
|
||||
{
|
||||
- if (*s) printf(s);
|
||||
+ if (*s) printf("%s",s);
|
||||
err_print(t);
|
||||
history=fatal_message; exit(wrap_up());
|
||||
}
|
||||
diff -up source/texk/web2c/cwebdir/cweave.w.format source/texk/web2c/cwebdir/cweave.w
|
||||
--- source/texk/web2c/cwebdir/cweave.w.format 2013-12-22 17:03:31.000000000 +0100
|
||||
+++ source/texk/web2c/cwebdir/cweave.w 2013-12-26 20:13:56.392766891 +0100
|
||||
@@ -1784,7 +1784,7 @@ void
|
||||
print_cat(c) /* symbolic printout of a category */
|
||||
eight_bits c;
|
||||
{
|
||||
- printf(cat_name[c]);
|
||||
+ printf("%s",cat_name[c]);
|
||||
}
|
||||
|
||||
@ The token lists for translated \TEX/ output contain some special control
|
||||
diff -up source/texk/web2c/omegafonts/error_routines.c.format source/texk/web2c/omegafonts/error_routines.c
|
||||
--- source/texk/web2c/omegafonts/error_routines.c.format 2013-12-22 17:03:30.000000000 +0100
|
||||
+++ source/texk/web2c/omegafonts/error_routines.c 2013-12-26 20:13:56.392766891 +0100
|
||||
@@ -36,7 +36,7 @@ void
|
||||
lex_error_0(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (lexing): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ void
|
||||
yyerror(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (parsing): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ void
|
||||
warning_0(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (warning): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@ void
|
||||
fatal_error_0(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (fatal): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
exit(1);
|
||||
}
|
||||
@@ -161,7 +161,7 @@ void
|
||||
internal_error_0(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (internal): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
exit(2);
|
||||
}
|
||||
diff -up source/texk/web2c/omegafonts/out_routines.c.format source/texk/web2c/omegafonts/out_routines.c
|
||||
--- source/texk/web2c/omegafonts/out_routines.c.format 2013-12-22 17:03:30.000000000 +0100
|
||||
+++ source/texk/web2c/omegafonts/out_routines.c 2013-12-26 20:13:56.392766891 +0100
|
||||
@@ -383,5 +383,5 @@ out_digits(unsigned counter)
|
||||
void
|
||||
out(const_string sval)
|
||||
{
|
||||
- fprintf(file_output, sval);
|
||||
+ fprintf(file_output, "%s", sval);
|
||||
}
|
||||
diff -up source/texk/web2c/tiedir/tie.c.format source/texk/web2c/tiedir/tie.c
|
||||
--- source/texk/web2c/tiedir/tie.c.format 2013-12-22 17:03:31.000000000 +0100
|
||||
+++ source/texk/web2c/tiedir/tie.c 2013-12-26 20:13:56.392766891 +0100
|
||||
@@ -27,14 +27,14 @@
|
||||
\
|
||||
|
||||
#define term_out stdout
|
||||
-#define print(a)fprintf(term_out,a)
|
||||
+#define print(a)fprintf(term_out,"%s",a)
|
||||
#define print2(a,b)fprintf(term_out,a,b)
|
||||
#define print3(a,b,c)fprintf(term_out,a,b,c)
|
||||
#define print_c(v)fputc(v,term_out);
|
||||
#define new_line(v)fputc('\n',v)
|
||||
#define term_new_line new_line(term_out) \
|
||||
|
||||
-#define print_ln(v){fprintf(term_out,v);term_new_line;} \
|
||||
+#define print_ln(v){fprintf(term_out,"%s",v);term_new_line;} \
|
||||
|
||||
#define print2_ln(a,b){print2(a,b);term_new_line;}
|
||||
#define print3_ln(a,b,c){print3(a,b,c);term_new_line;} \
|
||||
diff -up source/texk/web2c/tiedir/tie.w.format source/texk/web2c/tiedir/tie.w
|
||||
--- source/texk/web2c/tiedir/tie.w.format 2013-12-22 17:03:31.000000000 +0100
|
||||
+++ source/texk/web2c/tiedir/tie.w 2013-12-26 20:13:56.393766894 +0100
|
||||
@@ -465,7 +465,7 @@ for terminating an output line and writi
|
||||
@d new_line(v) fputc('\n',v) /* start new line */
|
||||
@d term_new_line new_line(term_out)
|
||||
/* start new line of the terminal */
|
||||
-@d print_ln(v) {fprintf(term_out,v);term_new_line;}
|
||||
+@d print_ln(v) {fprintf(term_out,"%s",v);term_new_line;}
|
||||
/* `|print|' and then start new line */
|
||||
@d print2_ln(a,b) {print2(a,b);term_new_line;} /* same with two arguments */
|
||||
@d print3_ln(a,b,c) {print3(a,b,c);term_new_line;}
|
||||
@ -0,0 +1,341 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2014-r3.ebuild,v 1.1 2015/03/09 14:27:47 jlec Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
#TL_UPSTREAM_PATCHLEVEL="1"
|
||||
PATCHLEVEL="46"
|
||||
TL_SOURCE_VERSION=20140525
|
||||
|
||||
inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
|
||||
|
||||
MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
|
||||
|
||||
DESCRIPTION="A complete TeX distribution"
|
||||
HOMEPAGE="http://tug.org/texlive/"
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2 LPPL-1.3c TeX"
|
||||
|
||||
SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
|
||||
|
||||
# Fetch patches
|
||||
SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
|
||||
# mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
|
||||
|
||||
TL_CORE_BINEXTRA_MODULES="
|
||||
a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
|
||||
de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
|
||||
fragmaster hyphenex installfont lacheck latex-git-log latex2man
|
||||
latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
|
||||
match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
|
||||
purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
|
||||
texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
|
||||
web collection-binextra
|
||||
"
|
||||
TL_CORE_BINEXTRA_DOC_MODULES="
|
||||
a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
|
||||
ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
|
||||
dvicopy.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
|
||||
installfont.doc latex-git-log.doc latex2man.doc latexfileversion.doc
|
||||
latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
|
||||
match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
|
||||
pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
|
||||
texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
|
||||
texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
|
||||
typeoutfileinfo.doc web.doc
|
||||
"
|
||||
TL_CORE_BINEXTRA_SRC_MODULES="
|
||||
adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
|
||||
pfarrei.source texdef.source
|
||||
"
|
||||
|
||||
TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
|
||||
TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
|
||||
TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
|
||||
|
||||
for i in ${TL_CORE_EXTRA_MODULES}; do
|
||||
SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
|
||||
done
|
||||
|
||||
SRC_URI="${SRC_URI} doc? ( "
|
||||
for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
|
||||
SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
|
||||
done
|
||||
SRC_URI="${SRC_URI} )"
|
||||
SRC_URI="${SRC_URI} source? ( "
|
||||
for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
|
||||
SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
|
||||
done
|
||||
SRC_URI="${SRC_URI} )"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="cjk X doc source tk xetex"
|
||||
|
||||
TEXMF_PATH=/usr/share/texmf-dist
|
||||
|
||||
MODULAR_X_DEPEND="X? (
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXp
|
||||
x11-libs/libXpm
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXfont
|
||||
)"
|
||||
|
||||
COMMON_DEPEND="${MODULAR_X_DEPEND}
|
||||
!app-text/ptex
|
||||
!app-text/tetex
|
||||
!<app-text/texlive-2007
|
||||
!app-text/xetex
|
||||
!<dev-texlive/texlive-basic-2014
|
||||
!<dev-texlive/texlive-metapost-2011
|
||||
!app-text/dvibook
|
||||
!dev-tex/luatex
|
||||
!app-text/dvipdfm
|
||||
!app-text/dvipdfmx
|
||||
!app-text/xdvipdfmx
|
||||
sys-libs/zlib
|
||||
>=media-libs/libpng-1.2.43-r2:0=
|
||||
>=app-text/poppler-0.12.3-r3:=
|
||||
>=x11-libs/cairo-1.12
|
||||
>=x11-libs/pixman-0.18
|
||||
dev-libs/zziplib
|
||||
app-text/libpaper
|
||||
xetex? (
|
||||
>=media-libs/harfbuzz-0.9.20[icu,graphite]
|
||||
>=dev-libs/icu-50:=
|
||||
app-text/teckit
|
||||
media-libs/fontconfig
|
||||
media-gfx/graphite2
|
||||
)
|
||||
media-libs/freetype:2
|
||||
>=dev-libs/kpathsea-6.2.0
|
||||
cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig
|
||||
sys-apps/ed
|
||||
sys-devel/flex
|
||||
app-arch/xz-utils"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=app-text/ps2pkm-1.5_p20130530
|
||||
>=app-text/dvipsk-5.993_p20130530
|
||||
>=dev-tex/bibtexu-3.71_p20130530
|
||||
virtual/perl-Getopt-Long
|
||||
tk? ( dev-perl/perl-tk )"
|
||||
|
||||
S="${WORKDIR}/${P}_build"
|
||||
B="${WORKDIR}/${MY_PV}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
mkdir -p "${S}" || die "failed to create build dir"
|
||||
}
|
||||
|
||||
RELOC_TARGET=texmf-dist
|
||||
|
||||
src_prepare() {
|
||||
cd "${WORKDIR}"
|
||||
# From texlive-module.eclass.
|
||||
grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
|
||||
{ for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist"
|
||||
for i in $(<"${T}/dirlist"); do
|
||||
[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
|
||||
done
|
||||
for i in $(<"${T}/reloclist"); do
|
||||
mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
|
||||
done
|
||||
|
||||
mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
|
||||
|
||||
cd "${B}"
|
||||
#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
|
||||
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
|
||||
|
||||
epatch "${FILESDIR}"/${P}-format-security.patch
|
||||
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# It fails on alpha without this
|
||||
use alpha && append-ldflags "-Wl,--no-relax"
|
||||
|
||||
# Too many regexps use A-Z a-z constructs, what causes problems with locales
|
||||
# that don't have the same alphabetical order than ascii. Bug #242430
|
||||
# So we set LC_ALL to C in order to avoid problems.
|
||||
export LC_ALL=C
|
||||
tc-export CC CXX AR RANLIB
|
||||
ECONF_SOURCE="${B}" \
|
||||
econf -C \
|
||||
--bindir="${EPREFIX}"/usr/bin \
|
||||
--datadir="${S}" \
|
||||
--with-system-freetype2 \
|
||||
--with-system-zlib \
|
||||
--with-system-libpng \
|
||||
--with-system-xpdf \
|
||||
--with-system-poppler \
|
||||
--with-system-teckit \
|
||||
--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
|
||||
--with-system-kpathsea \
|
||||
--with-kpathsea-includes="${EPREFIX}"/usr/include \
|
||||
--with-system-icu \
|
||||
--with-system-ptexenc \
|
||||
--with-system-harfbuzz \
|
||||
--with-system-icu \
|
||||
--with-system-graphite2 \
|
||||
--with-system-cairo \
|
||||
--with-system-pixman \
|
||||
--with-system-zziplib \
|
||||
--with-system-libpaper \
|
||||
--without-texinfo \
|
||||
--disable-dialog \
|
||||
--disable-multiplatform \
|
||||
--enable-epsfwin \
|
||||
--enable-mftalkwin \
|
||||
--enable-regiswin \
|
||||
--enable-tektronixwin \
|
||||
--enable-unitermwin \
|
||||
--with-ps=gs \
|
||||
--disable-psutils \
|
||||
--disable-t1utils \
|
||||
--enable-ipc \
|
||||
--disable-biber \
|
||||
--disable-bibtex-x \
|
||||
--disable-dvipng \
|
||||
--disable-dvipsk \
|
||||
--disable-chktex \
|
||||
--disable-lcdf-typetools \
|
||||
--disable-pdfopen \
|
||||
--disable-ps2eps \
|
||||
--disable-ps2pkm \
|
||||
--disable-detex \
|
||||
--disable-ttf2pk2 \
|
||||
--disable-tex4htk \
|
||||
--disable-cjkutils \
|
||||
--disable-xdvik \
|
||||
--disable-xindy \
|
||||
--enable-luatex \
|
||||
--disable-dvi2tty \
|
||||
--disable-dvisvgm \
|
||||
--disable-vlna \
|
||||
--enable-shared \
|
||||
--disable-native-texlive-build \
|
||||
--disable-largefile \
|
||||
$(use_enable xetex) \
|
||||
$(use_enable cjk ptex) \
|
||||
$(use_enable cjk eptex) \
|
||||
$(use_enable cjk uptex) \
|
||||
$(use_enable cjk euptex) \
|
||||
$(use_enable cjk mendexk) \
|
||||
$(use_enable cjk makejvf) \
|
||||
$(use_enable tk texdoctk) \
|
||||
$(use_with X x)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC CXX AR RANLIB
|
||||
emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
|
||||
|
||||
cd "${B}" || die
|
||||
# Mimic updmap --syncwithtrees to enable only fonts installed
|
||||
# Code copied from updmap script
|
||||
for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
|
||||
texlive-common_is_file_present_in_texmf "$i" || echo "$i"
|
||||
done > "${T}/updmap_update"
|
||||
{
|
||||
sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
|
||||
sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
|
||||
sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
|
||||
} > "${T}/updmap_update2"
|
||||
sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\
|
||||
&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
|
||||
emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
|
||||
|
||||
cd "${B}" || die
|
||||
dodir /usr/share # just in case
|
||||
cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
|
||||
cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
|
||||
|
||||
# When X is disabled mf-nowin doesn't exist but some scripts expect it to
|
||||
# exist. Instead, it is called mf, so we symlink it to please everything.
|
||||
use X || dosym mf /usr/bin/mf-nowin
|
||||
|
||||
docinto texk
|
||||
cd "${B}/texk"
|
||||
dodoc ChangeLog README
|
||||
|
||||
docinto dviljk
|
||||
cd "${B}/texk/dviljk"
|
||||
dodoc ChangeLog README NEWS
|
||||
|
||||
docinto makeindexk
|
||||
cd "${B}/texk/makeindexk"
|
||||
dodoc ChangeLog NOTES README
|
||||
|
||||
docinto web2c
|
||||
cd "${B}/texk/web2c"
|
||||
dodoc ChangeLog NEWS PROJECTS README
|
||||
|
||||
use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
|
||||
|
||||
dodir /etc/env.d
|
||||
echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
|
||||
# populate /etc/texmf
|
||||
keepdir /etc/texmf/web2c
|
||||
|
||||
# take care of updmap.cfg and language.d files
|
||||
keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
|
||||
|
||||
mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
|
||||
|
||||
# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
|
||||
# by texmf-update
|
||||
rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
|
||||
# Remove bundled and invalid updmap.cfg
|
||||
rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
|
||||
|
||||
texlive-common_handle_config_files
|
||||
|
||||
keepdir /usr/share/texmf-site
|
||||
|
||||
# the virtex symlink is not installed
|
||||
# The links has to be relative, since the targets
|
||||
# is not present at this stage and MacOS doesn't
|
||||
# like non-existing targets
|
||||
dosym tex /usr/bin/virtex
|
||||
dosym pdftex /usr/bin/pdfvirtex
|
||||
|
||||
# Rename mpost to leave room for mplib
|
||||
mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
|
||||
dosym "mpost-${P}" /usr/bin/mpost
|
||||
|
||||
# Ditto for pdftex
|
||||
mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
|
||||
dosym "pdftex-${P}" /usr/bin/pdftex
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
etexmf-update
|
||||
|
||||
elog
|
||||
elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
|
||||
elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
|
||||
elog
|
||||
ewarn "If you are migrating from an older TeX distribution"
|
||||
ewarn "Please make sure you have read:"
|
||||
ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
|
||||
ewarn "in order to avoid possible problems"
|
||||
elog
|
||||
elog "TeXLive has been split in various ebuilds. If you are missing a"
|
||||
elog "package to process your TeX documents, you can install"
|
||||
elog "dev-tex/texmfind to easily search for them."
|
||||
elog
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST scala-syntax-1.0.tar.gz 3622 SHA256 5df41b4183b1b4eb021e914d762a4d7156a8491df28c106f5cbdafaed1391a46 SHA512 b9d4b5f5b0077fdf1c4cfa4ea88e7262c45119d53451bd744490c79a0f5c2890d0f13f0bf58598114899ce6e0cb918fa2933f0194e1e60d9283749ad584347b2 WHIRLPOOL d49421810a2fbccc2cd3fd7de6247c7f482813f8415010005ce75d7cf03b74686bec169c5d94e4dc754c02bac041304c3a7b935e53387a1ef8e63a0de31ecd08
|
||||
@ -1,5 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>games</herd>
|
||||
<maintainer>
|
||||
<email>monsieurp@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,16 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/scala-syntax/scala-syntax-1.0.ebuild,v 1.1 2015/03/09 17:37:23 monsieurp Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: Scala syntax highlighting, filetype and indent settings"
|
||||
HOMEPAGE="http://www.scala-lang.org/"
|
||||
SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
@ -0,0 +1,11 @@
|
||||
--- cc/cc/cc.c 2014-12-06 09:52:55.000000000 +0000
|
||||
+++ cc/cc/cc.c.new 2015-03-09 09:22:25.569376330 +0000
|
||||
@@ -206,7 +206,7 @@
|
||||
#define PCCLIBDIR NULL
|
||||
#endif
|
||||
#ifndef DEFLIBDIRS /* default library search paths */
|
||||
-#ifdef MULTIARCH_PATH
|
||||
+#ifndef MULTIARCH_PATH
|
||||
#define DEFLIBDIRS { "/usr/lib/", 0 }
|
||||
#else
|
||||
#define DEFLIBDIRS { "/usr/lib/", "/usr/lib/" MULTIARCH_PATH "/", 0 }
|
||||
@ -1,2 +1,3 @@
|
||||
DIST quazip-0.5.1.tar.gz 354658 SHA256 078176a72288983f78b45c15f7d245131d9d5fc36a22f2757d75a78658c33268 SHA512 b4b5fe48f4d30fe0f9d2606c691337526ced169806e4267368dedaee543e12826dc2799c451851c0465f86fbf27d663f94e3b15b27744eac6104f9f4667de640 WHIRLPOOL ffb3cdc76e959fc8bee7cec3952b90f3e97fd7aad5602b6a2f3bb5d5e1c944e228dac43cca430282f61210e65d6f1afd993dbe29ee9539f33562b3ca23edf31c
|
||||
DIST quazip-0.6.2.tar.gz 423027 SHA256 adf4047213662a0362090edaaee4283216df2034ab5923697f9aa81d081c0b43 SHA512 32eb0b8faadb5f08086874c8ac33e3ea794a8a2e9c2904d0965cb5b15aec6280080aa19a032a19701e367873e8c3b613834823bb077b8fd254c5db4939917e49 WHIRLPOOL dc4fcab4b062631960236ef7cd9c0f43e5d419e34c3880b3caf02965f8a8302d622a1dc25f081cc2bcc5d3db96494b3d178a8f1d4b678cb452503af23e14e193
|
||||
DIST quazip-0.7.1.tar.gz 390629 SHA256 78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de SHA512 58e044019505075aa89f112672c04c54875d98b353ac5a39b6eb3e1f08ea27bd9900126d902c282b87910e4bae5ab9da79942b9add7a5535625c187331445acc WHIRLPOOL bf683e90fd58ae4d94d72f4b4530754eb1944df03adccd4e0302fe7ec82afe07fd54c9d6975ba4f1b30e3d14928fbcc6c987ec612deeb6b66be9c86c5e5d9787
|
||||
|
||||
@ -0,0 +1,73 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.7.1.ebuild,v 1.1 2015/03/09 15:26:18 jlec Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit multilib qmake-utils
|
||||
|
||||
DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
|
||||
HOMEPAGE="http://quazip.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE="test qt4 qt5"
|
||||
|
||||
REQUIRED_USE="^^ ( qt4 qt5 )"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/zlib[minizip]
|
||||
qt4? ( dev-qt/qtcore:4 )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtnetwork:5
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
qt4? ( dev-qt/qttest:4 )
|
||||
qt5? ( dev-qt/qttest:5 )
|
||||
)"
|
||||
|
||||
S="${WORKDIR}"/${P}
|
||||
|
||||
DOCS="NEWS.txt README.txt"
|
||||
HTML_DOCS=( doc/html/. )
|
||||
|
||||
MULTIBUILD_VARIANTS=( qt4 qt5 )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.5.1-prll.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
sed \
|
||||
-e "s:\/lib/:\/$(get_libdir)\/:g" \
|
||||
-i ${PN}/${PN}.pro || die
|
||||
|
||||
echo "PREFIX=${EPREFIX}/usr" >> ${PN}/${PN}.pri || die
|
||||
|
||||
use test || sed -e 's:qztest::g' -i ${PN}.pro || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use qt5; then
|
||||
eqmake5
|
||||
else
|
||||
eqmake4
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd qztest || die
|
||||
LD_LIBRARY_PATH="${BUILD_DIR}"/${PN} ./qztest || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
|
||||
einstalldocs
|
||||
insinto /usr/share/cmake/Modules
|
||||
doins FindQuaZip.cmake
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild,v 1.1 2015/03/09 14:56:36 monsieurp Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=CAPTTOFU
|
||||
MODULE_VERSION=4.031
|
||||
inherit eutils perl-module
|
||||
|
||||
DESCRIPTION="The Perl DBD:mysql Module"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="embedded test"
|
||||
|
||||
RDEPEND="dev-perl/DBI
|
||||
dev-perl/Test-Deep
|
||||
virtual/mysql[embedded?]"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
if use test; then
|
||||
SRC_TEST="do"
|
||||
else
|
||||
SRC_TEST="skip"
|
||||
fi
|
||||
|
||||
src_configure() {
|
||||
if use test; then
|
||||
myconf="${myconf} --testdb=test \
|
||||
--testhost=localhost \
|
||||
--testuser=test \
|
||||
--testpassword=test"
|
||||
fi
|
||||
use embedded && myconf="${myconf} --force-embedded --embedded=mysql_config"
|
||||
perl-module_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if use test; then
|
||||
einfo
|
||||
einfo "If tests fail, you have to configure your MySQL instance to create"
|
||||
einfo "and grant some privileges to the test user."
|
||||
einfo "You can run the following commands at the MySQL prompt: "
|
||||
einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
|
||||
einfo "> CREATE DATABASE test;"
|
||||
einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
|
||||
einfo
|
||||
sleep 5
|
||||
perl-module_src_test
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST DBD-mysql-4.020.tar.gz 137736 SHA256 9299f39f3903d3e0afa6440401f88329a057834817684aa699a507dad6a993e7 SHA512 4f1b788ec7490e585b5d31e719dfa1418fee210705781e05f19fee5da386fc87d7c56a348e508448f6d83148367fbc41e1f4673f2ccb52f16a62938b40c1d600 WHIRLPOOL 65bf1f3abec057cf77cb2a96195d0193bfdc1f7b7fde7914dc141fc897f0a1a16931fb0b30a644604f5fe409deeee4d552ba88e22282c83f10a9fc99210d672f
|
||||
DIST DBD-mysql-4.031.tar.gz 145217 SHA256 ae2ee4339fb13429922d76d37e25ce838f98baa011f691a6bbec8513ddb4cfd2 SHA512 b7cdd80e340ecd5d2d9ab59fde73824dc1334afc9ccc3e851e1c5bbf39b95f2a82181d0a78785b8c9543bf4ae6d3115809da186a7778320adeaecdf318876f95 WHIRLPOOL f10f002796c723a4095055e8bbbcb3a585c59f6d2ca1b2937d3a1d5b24d91221ad6d474b403d26fffc34059e13097194933dfca8771a46ce0668485aafc6b782
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue