dbp
/
lightscribe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app-cdr/qlscribe: cleanup 

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/lightscribe@1550 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-09-08 19:43:03 +00:00
parent bbbafce97e
commit be7d01b371
10 changed files with 8 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app-cdr/qlscribe/ChangeLog
View File

@ -2,6 +2,13 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
08 Sep 2009; Mario Fetka <mario.fetka@gmail.com> -qlscribe-0.9.ebuild,
-files/qlscribe-0.9-gentoo-2.patch, -qlscribe-0.10.ebuild,
-files/qlscribe-0.10-gentoo-3.patch, -qlscribe-0.11.ebuild,
-files/qlscribe-0.11-gentoo-4.patch, -qlscribe-0.12.ebuild,
-qlscribe-0.13.ebuild:
cleanup
*qlscribe-0.13-r1 (25 Aug 2009)
25 Aug 2009; Mario Fetka <mario.fetka@gmail.com> +qlscribe-0.13-r1.ebuild:

14
app-cdr/qlscribe/Manifest
View File

@ -1,17 +1,5 @@
AUX qlscribe-0.10-gentoo-3.patch 2041 RMD160 cdbcdf23a4d89c48426d3a8c19fa78e2ed375f61 SHA1 005ec9268c3ae75af232a66e8a66d25d738aae89 SHA256 dc697f6c5f83af24104871888a7b72444e82fb06c5d1d8893f2d7ee560811197
AUX qlscribe-0.11-gentoo-4.patch 948 RMD160 5493345e6bd47f35da8fce04711b56ecf819465f SHA1 d58e36a2eabc4915a2cad62e729f9bfbb51c3251 SHA256 183d70e66517bfd5f5187d8144c965bdd05cb74835016de4091ba4257495195b
AUX qlscribe-0.13-gcc44-1.patch 615 RMD160 43aaecd72595d063b342501df79b1499a349e4a9 SHA1 cc5cd8e6a6d0f10c20841f5e867798c80c7f021f SHA256 1b98e4afee9152418ea05a5a9d49a72a4ebc50ab03a47f4a885f7ed674b89ae9
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.11.tar.gz 90354 RMD160 ba2d355e0b465c3a3e79cdeae5a1875abcc60ab6 SHA1 da3904d0755204281fac44a5bdb8c4016d8b03e8 SHA256 02fe8ca52fde61cd3e54ecdd492f441404d871cbfb4af1a0db942f4198f37022
DIST qlscribe-0.12.tar.gz 91799 RMD160 33cd940209801cc62b41085976b4e4810d2a2fe9 SHA1 214d6739251d1bd49997e92c020c21fed537041e SHA256 6701dd5cedd6953cb7969bf210570ef09ee8465d557f2a1e57777a540b4e4adb
DIST qlscribe-0.13.tar.gz 91800 RMD160 21c6058c49b0e82f98851cc2ee679e6751e45c98 SHA1 522e10f00ee4e2aeb470122c3ceedc1975ed9110 SHA256 1d9053b9e0cff8c484cb448d3029fe54532e18c15f741784ad058425b4971482
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.11.ebuild 1396 RMD160 dc9ef6a6e7a86e38b817d23c1470dc24ea024708 SHA1 a067d760d08b47d78fa2b9b23008572c484c2fd8 SHA256 8591edcb2b28ef75138451b8ca4b2b43e44f728b629a7706317fcbb329e02244
EBUILD qlscribe-0.12.ebuild 704 RMD160 e31fc7fb10b15588f675bd5fe11a167b6259acb7 SHA1 deede2f59b2f935e602a734c69504af7d2dd5c80 SHA256 1aa94a2e3a4f461d576ff6dad93497175fe199ee5264d6e43d2857ba16026909
EBUILD qlscribe-0.13-r1.ebuild 801 RMD160 e80f427fd5e919ddf17832afa46eade6aa3df849 SHA1 b9042c07a6d7dd33c59571bc14170d3f2f74688b SHA256 6b8910952a3cadfad88cf3d302771f32998ebfadafe64dec68089d34da1d9f89
EBUILD qlscribe-0.13.ebuild 795 RMD160 1c93227f448420dd9765b885ba116ed300ca9204 SHA1 dbeb93a982ff9c49a03f013e16497f5eedf7d1ae SHA256 485f418cbd6330b4def364fdfdd9d2af575d6dbdb8a791ef5e6ebd5a2ac2a1f2
EBUILD qlscribe-0.9.ebuild 1321 RMD160 9e769bc4146f65ecb5f3ebf607a27c1face4e54a SHA1 61d7771c1eabd44037da24db07fdf0a371f77c7d SHA256 a412becb963eae3118fd15bbf9084782ac006337587fcc10cbc2982a252b3d69
MISC ChangeLog 1671 RMD160 e1ec84cf60e2fcb62881b243f2a803615038e5a5 SHA1 4e439286c5473e7dce14803e7abc5451de9ad638 SHA256 58863ed02f35047e019cc168b77834130e4800bdc5ce53ba274590069a7b1fd5
MISC ChangeLog 1965 RMD160 cda4a00f0ea0737dc6f49d1a463763bbaab91093 SHA1 596856b03e3c87c98a442b1d97cbc5055175ac8a SHA256 39ae12561de6b0358ab278738d844ee1738e0b40bb5eef71a3202c50b34ae3d8
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5

40
app-cdr/qlscribe/files/qlscribe-0.10-gentoo-3.patch
View File

@ -1,40 +0,0 @@
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 )

24
app-cdr/qlscribe/files/qlscribe-0.11-gentoo-4.patch
View File

@ -1,24 +0,0 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-04-16
Initial Package Version: 0.11
Origin: me
Upstream Status: unknown
Description: add an RPATH to the lscribe daemon so that it works around the LDPATH problem
yes it adds an unneeded overhead to the linker but it works
diff -Naur qlscribe-0.11.orig/lscribed/CMakeLists.txt qlscribe-0.11/lscribed/CMakeLists.txt
--- qlscribe-0.11.orig/lscribed/CMakeLists.txt 2009-04-04 03:43:35.000000000 +0000
+++ qlscribe-0.11/lscribed/CMakeLists.txt 2009-04-15 23:07:14.897023631 +0000
@@ -61,6 +63,12 @@
ADD_EXECUTABLE( lscribed ${LSCRIBED_SRCS} )
+IF (LSRPATH)
+ SET_TARGET_PROPERTIES( lscribed PROPERTIES INSTALL_NAME_DIR ${LSRPATH} )
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ SET(CMAKE_INSTALL_RPATH "${LSRPATH}")
+ENDIF (LSRPATH)
+
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )
INSTALL( TARGETS lscribed DESTINATION sbin )

50
app-cdr/qlscribe/files/qlscribe-0.9-gentoo-2.patch
View File

@ -1,50 +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 lightscribe in opt and install dbus files in right dir
diff -Naur qlscribe-0.9.orig/cmake/FindLightScribe.cmake qlscribe-0.9/cmake/FindLightScribe.cmake
--- qlscribe-0.9.orig/cmake/FindLightScribe.cmake 2009-03-11 00:51:03.000000000 +0000
+++ qlscribe-0.9/cmake/FindLightScribe.cmake 2009-03-21 08:44:39.000000000 +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 )
diff -Naur qlscribe-0.9.orig/lscribed/CMakeLists.txt qlscribe-0.9/lscribed/CMakeLists.txt
--- qlscribe-0.9.orig/lscribed/CMakeLists.txt 2009-03-11 00:51:04.000000000 +0000
+++ qlscribe-0.9/lscribed/CMakeLists.txt 2009-03-21 14:44:03.289663341 +0000
@@ -34,6 +34,18 @@
SET( CMAKE_EXE_LINKER_FLAGS "-m32 -pthread ${CMAKE_EXE_LINKER_FLAGS}" )
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
+IF (DBUS_SYSTEM_POLICY_DIR)
+ INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION ${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. Normally this is /etc/dbus-1/system.d on a Linux system")
+endif (DBUS_SYSTEM_POLICY_DIR)
+
+IF (DBUS_SYSTEM_SERVICE_DIR)
+ INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION ${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. Normally this is /usr/share/dbus-1/services on a Linux system")
+endif (DBUS_SYSTEM_SERVICE_DIR)
+
SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
introspecthandler.cpp )
@@ -46,5 +58,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 )

45
app-cdr/qlscribe/qlscribe-0.10.ebuild
View File

@ -1,45 +0,0 @@
# 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
}

46
app-cdr/qlscribe/qlscribe-0.11.ebuild
View File

@ -1,46 +0,0 @@
# 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
-DLSRPATH=/usr/lib32/libstdc++-v3:/usr/lib/libstdc++-v3"
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo-4.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
}

28
app-cdr/qlscribe/qlscribe-0.12.ebuild
View File

@ -1,28 +0,0 @@
# 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"
RDEPEND="x11-libs/qt-gui:4
app-cdr/liblightscribe
amd64? ( app-emulation/emul-linux-x86-baselibs )"
DEPEND="${RDEPEND}
dev-util/cmake[qt4]"
mycmakeargs="-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-DDBUS_SYSTEM_SERVICE_DIR=/usr/share/dbus-1/services"
src_install() {
cmake-utils_src_install
}

32
app-cdr/qlscribe/qlscribe-0.13.ebuild
View File

@ -1,32 +0,0 @@
# 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"
RDEPEND="x11-libs/qt-gui:4
app-cdr/liblightscribe
amd64? ( app-emulation/emul-linux-x86-baselibs )"
DEPEND="${RDEPEND}
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}-gcc44-1.patch || die "Error applying patch"
}
src_install() {
cmake-utils_src_install
}

45
app-cdr/qlscribe/qlscribe-0.9.ebuild
View File

@ -1,45 +0,0 @@
# 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-2.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
}