* [gentoo-commits] gentoo-x86 commit in app-office/scribus: scribus-1.3.9-r1.ebuild metadata.xml ChangeLog scribus-1.4.0_rc5.ebuild scribus-1.4.0_rc3.ebuild
@ 2011-07-12 9:59 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2011-07-12 9:59 UTC (permalink / raw
To: gentoo-commits
jlec 11/07/12 09:59:33
Modified: metadata.xml ChangeLog scribus-1.4.0_rc5.ebuild
Added: scribus-1.3.9-r1.ebuild
Removed: scribus-1.4.0_rc3.ebuild
Log:
Add myself as maintainer, added USE=example templates to slim the installation, sane doc installation fix for 1.4 (Help brwoser was not working)
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Revision Changes Path
1.6 app-office/scribus/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?r1=1.5&r2=1.6
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml 11 Jul 2011 18:51:40 -0000 1.5
+++ metadata.xml 12 Jul 2011 09:59:33 -0000 1.6
@@ -6,7 +6,12 @@
<email>hanno@gentoo.org</email>
<name>Hanno Boeck</name>
</maintainer>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
<use>
<flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
+ <flag name="templates">Document tamplates</flag>
</use>
</pkgmetadata>
1.144 app-office/scribus/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.143&r2=1.144
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- ChangeLog 11 Jul 2011 18:51:40 -0000 1.143
+++ ChangeLog 12 Jul 2011 09:59:33 -0000 1.144
@@ -1,6 +1,15 @@
# ChangeLog for app-office/scribus
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.143 2011/07/11 18:51:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.144 2011/07/12 09:59:33 jlec Exp $
+
+*scribus-1.3.9-r1 (12 Jul 2011)
+
+ 12 Jul 2011; Justin Lecher <jlec@gentoo.org> +scribus-1.3.9-r1.ebuild,
+ -scribus-1.4.0_rc3.ebuild, scribus-1.4.0_rc5.ebuild,
+ +files/scribus-1.4.0_rc5-docs.patch, metadata.xml:
+ Add myself as maintainer, added USE=example templates to slim the
+ installation, sane doc installation fix for 1.4 (Help brwoser was not
+ working)
11 Jul 2011; Justin Lecher <jlec@gentoo.org> scribus-1.3.6.ebuild,
scribus-1.3.8.ebuild, scribus-1.3.9.ebuild, scribus-1.4.0_rc3.ebuild,
1.3 app-office/scribus/scribus-1.4.0_rc5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild?r1=1.2&r2=1.3
Index: scribus-1.4.0_rc5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scribus-1.4.0_rc5.ebuild 11 Jul 2011 18:51:40 -0000 1.2
+++ scribus-1.4.0_rc5.ebuild 12 Jul 2011 09:59:33 -0000 1.3
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.2 2011/07/11 18:51:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.3 2011/07/12 09:59:33 jlec Exp $
-EAPI=2
+EAPI=3
PYTHON_DEPEND="2:2.6"
@@ -17,14 +17,14 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cairo debug +minimal +pdf spell"
+IUSE="cairo debug examples +minimal +pdf spell templates"
COMMON_DEPEND="
dev-libs/hyphen
dev-libs/libxml2
media-libs/fontconfig
media-libs/freetype:2
- media-libs/lcms:0
+ media-libs/lcms:2
media-libs/libpng
media-libs/tiff
net-print/cups
@@ -40,7 +40,9 @@
DEPEND="${COMMON_DEPEND}
dev-libs/boost"
-DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
+PATCHES=(
+ "${FILESDIR}"/${P}-docs.patch
+ )
S=${WORKDIR}/${MY_P}
@@ -48,6 +50,14 @@
python_set_active_version 2
}
+src_prepare() {
+ use templates || \
+ sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
+ use examples || \
+ sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
+ base_src_prepare
+}
+
src_configure() {
mycmakeargs=(
"-DHAVE_PYTHON=ON"
@@ -56,6 +66,7 @@
"-DWANT_NORPATH=ON"
"-DWANT_QTARTHUR=ON"
"-DWANT_QT3SUPPORT=OFF"
+ "-DGENTOOVERSION=${PVR}"
$(cmake-utils_use_has spell ASPELL)
$(cmake-utils_use_has pdf PODOFO)
$(cmake-utils_use_want cairo)
@@ -68,9 +79,8 @@
src_install() {
cmake-utils_src_install
- # Use one directory for documentation
- mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/
- rmdir "${D}"/usr/share/doc/${PN}
+ mv "${ED}"/usr/share/doc/${PF}/{en,html}
+ ln -sf html "${ED}"/usr/share/doc/${PF}/en
doicon resources/icons/scribus.png
domenu scribus.desktop
1.1 app-office/scribus/scribus-1.3.9-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild?rev=1.1&content-type=text/plain
Index: scribus-1.3.9-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild,v 1.1 2011/07/12 09:59:33 jlec Exp $
EAPI=2
PYTHON_DEPEND="2:2.6"
inherit cmake-utils fdo-mime multilib python
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="http://www.scribus.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="cairo debug examples +minimal +pdf spell templates"
COMMON_DEPEND="
dev-libs/hyphen
dev-libs/libxml2
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:0
media-libs/libpng
media-libs/tiff
net-print/cups
sys-libs/zlib
x11-libs/qt-core:4
x11-libs/qt-gui:4
virtual/jpeg
spell? ( app-text/aspell )
pdf? ( app-text/podofo )
cairo? ( x11-libs/cairo[X,svg] )"
RDEPEND="${COMMON_DEPEND}
app-text/ghostscript-gpl"
DEPEND="${COMMON_DEPEND}
dev-libs/boost"
PATCHES=(
"${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch"
)
DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
pkg_setup() {
python_set_active_version 2
}
src_prepare() {
use templates || \
sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
use examples || \
sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
base_src_prepare
}
src_configure() {
mycmakeargs=(
"-DHAVE_PYTHON=ON"
"-DPYTHON_INCLUDE_PATH=$(python_get_includedir)"
"-DPYTHON_LIBRARY=$(python_get_library)"
"-DWANT_NORPATH=ON"
"-DWANT_QTARTHUR=ON"
"-DWANT_QT3SUPPORT=OFF"
$(cmake-utils_use_has spell ASPELL)
$(cmake-utils_use_has pdf PODOFO)
$(cmake-utils_use_want cairo)
$(cmake-utils_use_want minimal NOHEADERINSTALL)
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
doicon resources/icons/scribus.png
domenu scribus.desktop
}
pkg_postinst() {
fdo-mime_mime_database_update
}
pkg_postrm() {
fdo-mime_mime_database_update
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-12 9:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-12 9:59 [gentoo-commits] gentoo-x86 commit in app-office/scribus: scribus-1.3.9-r1.ebuild metadata.xml ChangeLog scribus-1.4.0_rc5.ebuild scribus-1.4.0_rc3.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox