app-cdr/qlscribe: Bump

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@900 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-03-25 07:38:33 +00:00
parent c556642fe1
commit 4cd02a6d68
5 changed files with 94 additions and 24 deletions

View File

@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
25 Mar 2009; Mario Fetka <mario.fetka@gmail.com>
-files/qlscribe-0.9-gentoo-1.patch, +files/qlscribe-0.10-gentoo-3.patch,
+qlscribe-0.10.ebuild:
Bump
21 Mar 2009; Mario Fetka <mario.fetka@gmail.com> qlscribe-0.9.ebuild:
hack in libstdc++-v3

View File

@ -1,6 +1,8 @@
AUX qlscribe-0.9-gentoo-1.patch 1053 RMD160 9fc2c8dc2607b967bf33239fe04a995bdefc1f2b SHA1 fdfd5c58753b2d82d87004a0b028106af189f457 SHA256 882b5bd26599328c5ce96e4de69a2636d26de0d99cb2c93c1fdf4a2ab0d5f573
AUX qlscribe-0.10-gentoo-3.patch 2041 RMD160 cdbcdf23a4d89c48426d3a8c19fa78e2ed375f61 SHA1 005ec9268c3ae75af232a66e8a66d25d738aae89 SHA256 dc697f6c5f83af24104871888a7b72444e82fb06c5d1d8893f2d7ee560811197
AUX qlscribe-0.9-gentoo-2.patch 2677 RMD160 174d1990547d034ccc129e5b1b2a453203ba5e85 SHA1 951f475479291e5b57d57e4b878662c8dfde2ca6 SHA256 d30fdfbefecdb813deecff48a585751c48c4598035c6d2490c6f99fbda0d8fee
DIST qlscribe-0.10.tar.gz 88774 RMD160 19e8a0eed3f1c4a754282fbedd6b91b526980a2c SHA1 06a54518b3c7848d431d7c84735e2931a7574d3e SHA256 43c30a8f799d8ac976117d776c6bcf1d0a6f9dc8a8cfa08010b1f4c17828aaa6
DIST qlscribe-0.9.tar.gz 88106 RMD160 68fdff43e8f09654a3c3e70f4c9fdd7f0b7f5990 SHA1 7eb24180003629e02e6c783cd00013d038ecb505 SHA256 8f77ba545e95d9684530bfc4998ebc913fcfad912a66b7201eaff5279145cbeb
EBUILD qlscribe-0.10.ebuild 1321 RMD160 a0ea5bd729110cff0c93b9aaa802f7aa74bc8449 SHA1 bdc4c7c965dd0a95204d7e3cea39c65d898791b2 SHA256 87240222a2b5f1acc6101347afc460d4d20829582e9c064aed7bef9c9d99d679
EBUILD qlscribe-0.9.ebuild 1321 RMD160 9e769bc4146f65ecb5f3ebf607a27c1face4e54a SHA1 61d7771c1eabd44037da24db07fdf0a371f77c7d SHA256 a412becb963eae3118fd15bbf9084782ac006337587fcc10cbc2982a252b3d69
MISC ChangeLog 837 RMD160 3fb4d508e684830f3bdbf97391ef5a8d9ce35d20 SHA1 b08ec6be94971d942811e14dbe4e1f7d94e48f6c SHA256 a11be50f69576d251000ee97c848d71d479402058b4c9eda20b64ef46a2aa8d0
MISC ChangeLog 996 RMD160 2ef187c2c3a011691ea48ded56c791d43645fd93 SHA1 c93cbca087ce69f91abf2d32020fa612f2b23249 SHA256 797265fc1f3223bd829a9657e9d34dc4b186acd210f69e4810f73b128432fc8a
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5

View File

@ -0,0 +1,40 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-03-25
Initial Package Version: 0.10
Origin: me
Upstream Status: unknwon
Description: dont install dbus files in two places
diff -Naur qlscribe-0.10.orig/lscribed/CMakeLists.txt qlscribe-0.10/lscribed/CMakeLists.txt
--- qlscribe-0.10.orig/lscribed/CMakeLists.txt 2009-03-25 03:06:28.000000000 +0000
+++ qlscribe-0.10/lscribed/CMakeLists.txt 2009-03-25 07:09:45.735238647 +0000
@@ -36,11 +36,21 @@
IF (DBUS_SYSTEM_POLICY_DIR)
INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION ${DBUS_SYSTEM_POLICY_DIR})
-endif (DBUS_SYSTEM_POLICY_DIR)
+ELSE (DBUS_SYSTEM_POLICY_DIR)
+ MESSAGE(STATUS "It is necessary to specify the directory where the client policy file for Qt Lightscribe is installed as DBUS_SYSTEM_POLICY_DIR.")
+ MESSAGE(STATUS "Otherwise it will be installed into share/qlscribe")
+ MESSAGE(STATUS "Normally this is /etc/dbus-1/system.d on a Linux system")
+ INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION share/qlscribe )
+ENDIF (DBUS_SYSTEM_POLICY_DIR)
IF (DBUS_SYSTEM_SERVICE_DIR)
INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION ${DBUS_SYSTEM_SERVICE_DIR})
-endif (DBUS_SYSTEM_SERVICE_DIR)
+ELSE (DBUS_SYSTEM_SERVICE_DIR)
+ MESSAGE(STATUS "It is necessary to specify the directory where the client service file for Qt Lightscribe is installed as DBUS_SYSTEM_SERVICE_DIR.")
+ MESSAGE(STATUS "Otherwise it will be installed into share/qlscribe")
+ MESSAGE(STATUS "Normally this is /usr/share/dbus-1/services on a Linux system")
+ INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )
+ENDIF (DBUS_SYSTEM_SERVICE_DIR)
SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
introspecthandler.cpp )
@@ -54,5 +64,4 @@
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )
INSTALL( TARGETS lscribed DESTINATION sbin )
-INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )

View File

@ -1,22 +0,0 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-03-21
Initial Package Version: 0.9
Origin: me
Upstream Status: unknown
Description: find liblightscribe in opt
diff -Naur qlscribe-0.9.orig/cmake/FindLightScribe.cmake qlscribe-0.9/cmake/FindLightScribe.cmake
--- qlscribe-0.9.orig/cmake/FindLightScribe.cmake 2009-03-21 11:53:47.855760793 +0000
+++ qlscribe-0.9/cmake/FindLightScribe.cmake 2009-03-21 11:54:35.472058563 +0000
@@ -18,9 +18,9 @@
#
# $Id: FindLightScribe.cmake 72 2009-02-22 01:27:45Z ruglory $
-FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include $ENV{LIGHTSCRIBEDIR}/include )
+FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include /usr/include/lightsribe $ENV{LIGHTSCRIBEDIR}/include )
-FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib $ENV{LIGHTSCRIBEDIR}/lib )
+FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib /opt/lightscribe/lib /opt/lightscribe/lib32 $ENV{LIGHTSCRIBEDIR}/lib )
if( LSCRIBE_INCLUDE_DIR AND LSCRIBE_LIBRARY )
SET( LSCRIBE_FOUND TRUE )

View File

@ -0,0 +1,45 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit qt4 cmake-utils multilib
DESCRIPTION="Qt lightScribe - OS labeler for Linux"
HOMEPAGE="http://sourceforge.net/projects/qlscribe/"
SRC_URI="mirror://sourceforge/${PN}/${PF}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug multilib"
DEPEND="x11-libs/qt-gui:4
app-cdr/liblightscribe
amd64? ( app-emulation/emul-linux-x86-baselibs )"
RDEPEND="${DEPEND}
dev-util/cmake[qt4]"
mycmakeargs="-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-DDBUS_SYSTEM_SERVICE_DIR=/usr/share/dbus-1/services"
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo-3.patch || die "Error applying patch"
}
src_compile() {
# hack in Library path cant use get_libdir as it would change vars used in the build
# format not match
# so add both dirs for lib32 (amd64) and lib (x86)
export LD_LIBRARY_PATH="/usr/lib32/libstdc++-v3:/usr/lib/libstdc++-v3:${LD_LIBRARY_PATH}"
cmake-utils_src_make
}
src_install() {
cmake-utils_src_install
has_multilib_profile && ABI="x86"
make_wrapper lscribed-wrapper "/usr/sbin/lscribed" /usr/bin /usr/$(get_libdir)/libstdc++-v3
dosed "s%sbin/lscribed%bin/lscribed-wrapper%" /usr/share/dbus-1/services/org.lightscribe.Manager.service
}