diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-12 13:44:34 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-12 13:44:34 +0000 |
commit | ccb28ccba240b14e8122a26ef7d571ca8e294fd1 (patch) | |
tree | c039519be65a8ec3d579a16f990a318326b97e7f /dev-util/kdesvn | |
parent | old (diff) | |
download | gentoo-2-ccb28ccba240b14e8122a26ef7d571ca8e294fd1.tar.gz gentoo-2-ccb28ccba240b14e8122a26ef7d571ca8e294fd1.tar.bz2 gentoo-2-ccb28ccba240b14e8122a26ef7d571ca8e294fd1.zip |
old
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/kdesvn')
-rw-r--r-- | dev-util/kdesvn/Manifest | 6 | ||||
-rw-r--r-- | dev-util/kdesvn/files/kdesvn-1.0-subversion.patch | 18 | ||||
-rw-r--r-- | dev-util/kdesvn/files/kdesvn-1.0.0-asneeded.patch | 106 | ||||
-rw-r--r-- | dev-util/kdesvn/kdesvn-1.0.5.ebuild | 70 | ||||
-rw-r--r-- | dev-util/kdesvn/kdesvn-1.4.0.ebuild | 51 |
5 files changed, 0 insertions, 251 deletions
diff --git a/dev-util/kdesvn/Manifest b/dev-util/kdesvn/Manifest index 9f9cf84af437..c229a5fa0bcd 100644 --- a/dev-util/kdesvn/Manifest +++ b/dev-util/kdesvn/Manifest @@ -1,10 +1,4 @@ -AUX kdesvn-1.0-subversion.patch 439 RMD160 dd1d7baccdcb8909beefdd0b534e6a9e7fad90ba SHA1 1922cc3795b8b34a636c8229b6686085258621c8 SHA256 576018ae81c6f4c79a4c32f9bbf1dbb9b5f096f6c1ca84136c4a694e17994c8c -AUX kdesvn-1.0.0-asneeded.patch 5245 RMD160 1bcf4296ceff16ee979860b2a41c852c07c42c7a SHA1 0134ae58a634cfe3b75eadeda500932fb64308eb SHA256 f205ec149972c3b89269cebe71a8516660ef5952e405336c8d123b5e9ce7e0c3 -DIST kdesvn-1.0.5.tar.bz2 1382607 RMD160 32a4eb6eb4909858f8437ba44e8289b1fe02cbf5 SHA1 3ec90f33c8a9a2fe5188b0823fc451d84bfabf92 SHA256 c84bc8d651dedb17fb1c286cf526f764458647ce6bee0ce63c4169546f172877 -DIST kdesvn-1.4.0.tar.bz2 1672831 RMD160 5a1964e3b7faecd66554565a0934d7e109e3eea7 SHA1 07c23e8ba7afca431d3a40aa007e9a05a67bbba0 SHA256 80beab19223aabcff13a35d0beb1a9099bef336c68c2bb797c35e9e5e5086265 DIST kdesvn-1.4.1.tar.bz2 1672916 RMD160 4a49d7b7808794c6476b2866205f917bf97a1292 SHA1 4822919fb699c6558608c1a6b0c48412aa188f4b SHA256 3f955420c951b37bf8409798d47bd1e95a8ed3f2aa25f743ed3cd03fe4b44af5 -EBUILD kdesvn-1.0.5.ebuild 1690 RMD160 951a09740cce841aad7487beea3fe3ab56c697b9 SHA1 5724780973cf9eadcb79f42c25f7213ea27176cc SHA256 63e24c821cfaaef337ababfe91138bbb73b1630919d8fc865cd7df4eea8a0a69 -EBUILD kdesvn-1.4.0.ebuild 1193 RMD160 31889ec156eb84ad0d5d3046bbe71033d6fbf56c SHA1 4cb47a2d688d90776c3a5ea3851475958850d3aa SHA256 0e12a86992c047d7a241e06c8d6f8c836433168ee2ead65f4b08afcff7b58e0b EBUILD kdesvn-1.4.1.ebuild 1194 RMD160 5f058d5081febbc1d24e7b6c37f4db041b53f16d SHA1 907ee90796e22ab3afbc96bc4ab65ac967f5624c SHA256 03c9a9615353f73daafe1287c693196bc4e11db81aaf44b942595d916d88355a MISC ChangeLog 11292 RMD160 498d1ef0cbce5cd069b199b51860d837e35630fd SHA1 bef97dc609c3c477260d096c720401e81ac84e68 SHA256 e1eaa58e90a7d3e830789dc51362a4b53ddefa90243fe0b72ff645418706d4d4 MISC metadata.xml 360 RMD160 d38a018d8fecc52012b00ec006f7dccbf5814549 SHA1 7d8af38925a9bb5be33d8fa809672ee952735db3 SHA256 24601a182353cb9edccf90d64b652527e64d51ad8e82e07967ef9409ace33d6a diff --git a/dev-util/kdesvn/files/kdesvn-1.0-subversion.patch b/dev-util/kdesvn/files/kdesvn-1.0-subversion.patch deleted file mode 100644 index ee1888f5f0d5..000000000000 --- a/dev-util/kdesvn/files/kdesvn-1.0-subversion.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/svnqt/commititem.cpp.old 2008-05-25 11:01:46.000000000 +0300 -+++ src/svnqt/commititem.cpp 2009-04-30 01:24:34.521584966 +0300 -@@ -20,6 +20,7 @@ - #include "commititem.hpp" - - #include <svn_client.h> -+#include <svn_props.h> - - namespace svn { - -@@ -94,7 +95,6 @@ - - void CommitItem::init() - { -- m_Path=m_Url=m_CopyFromUrl = QString::null; - m_Kind = svn_node_unknown; - m_Revision=m_CopyFromRevision = -1; - m_State = 0; diff --git a/dev-util/kdesvn/files/kdesvn-1.0.0-asneeded.patch b/dev-util/kdesvn/files/kdesvn-1.0.0-asneeded.patch deleted file mode 100644 index 94764a72a8f5..000000000000 --- a/dev-util/kdesvn/files/kdesvn-1.0.0-asneeded.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- kdesvn-1.0.0/src/CMakeLists.txt.asneeded 2008-06-20 16:27:30.000000000 -0600 -+++ kdesvn-1.0.0/src/CMakeLists.txt 2008-08-07 09:16:09.000000000 -0600 -@@ -37,7 +37,7 @@ - ${QT_AND_KDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} ) - SET_TARGET_PROPERTIES(kdesvnpart - PROPERTIES -- LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}") -+ LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} ${LINK_NO_UNDEFINED}") - - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt) - ---- kdesvn-1.0.0/src/svnqt/CMakeLists.txt.asneeded 2008-06-06 08:48:44.000000000 -0600 -+++ kdesvn-1.0.0/src/svnqt/CMakeLists.txt 2008-08-07 09:16:09.000000000 -0600 -@@ -177,9 +177,8 @@ - SOVERSION ${LIB_MAJOR} - VERSION ${_soversion}) - --SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS}) --SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}") --SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}") -+SET(ALL_LINKFLAGS "${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS}") -+SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}") - TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS}) - - IF (SQLITE_FOUND AND NOT QT4_FOUND) ---- kdesvn-1.0.0/src/svnqt/cmakemodules/FindSubversion.cmake.asneeded 2008-07-21 14:32:32.000000000 -0600 -+++ kdesvn-1.0.0/src/svnqt/cmakemodules/FindSubversion.cmake 2008-08-07 09:16:09.000000000 -0600 -@@ -58,14 +58,29 @@ - MESSAGE(SEND_ERROR "Error: no apu-config found") - endif(NOT APU_CONFIG) - -- EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR) -- EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR) -+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -+ MESSAGE(STATUS "Found apr include: ${APR_INCLUDE_DIR}") -+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -+ MESSAGE(STATUS "Found apu include: ${APU_INCLUDE_DIR}") -+ -+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) -+ MESSAGE(STATUS "Found apr cppflags: ${APR_CPP_FLAGS}") -+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) -+ MESSAGE(STATUS "Found apu cppflags: ${APU_CPP_FLAGS}") -+ -+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE) -+ MESSAGE(STATUS "Found apr libs: ${APR_LIBS}") -+ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS}) -+ -+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--ldflags" OUTPUT_VARIABLE APR_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) -+ MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}") -+ -+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APU_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE) -+ MESSAGE(STATUS "Found apu libs: ${APU_LIBS}") -+ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS}) - -- EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS) -- EXEC_PROGRAM(${APU_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS) -- -- EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS) -- EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS) -+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--ldflags" OUTPUT_VARIABLE APU_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) -+ MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LIBS}") - - CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H) - -@@ -180,8 +195,10 @@ - "$ENV{ProgramFiles}/Subversion/lib" - ) - -- SET(APR_EXTRA_LIBFLAGS ) -- SET(APU_EXTRA_LIBFLAGS ) -+ SET(APR_EXTRA_LIBS ) -+ SET(APR_EXTRA_LDFLAGS ) -+ SET(APU_EXTRA_LIBS ) -+ SET(APU_EXTRA_LDFLAGS ) - - - # check found libraries -@@ -189,7 +206,7 @@ - MESSAGE(SEND_ERROR "No apr lib found!") - ELSE (NOT APR_LIB) - MESSAGE(STATUS "Found apr lib: ${APR_LIB}") -- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB}) -+ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB} ${APR_EXTRA_LIBS}) - endif(NOT APR_LIB) - - if (NOT APRICONV_LIB) -@@ -203,7 +220,7 @@ - MESSAGE(SEND_ERROR "No aprutil lib found!") - ELSE (NOT APU_LIB) - MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}") -- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB}) -+ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB} ${APU_EXTRA_LIBS}) - endif(NOT APU_LIB) - - if (NOT APU_XMLLIB) ---- kdesvn-1.0.0/src/kdesvnd/CMakeLists.txt.asneeded 2007-06-10 15:23:29.000000000 -0600 -+++ kdesvn-1.0.0/src/kdesvnd/CMakeLists.txt 2008-08-07 09:16:09.000000000 -0600 -@@ -23,7 +23,7 @@ - - SET_TARGET_PROPERTIES(kded_kdesvnd - PROPERTIES -- LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -avoid-version -module") -+ LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} -avoid-version -module") - - INSTALL(TARGETS kded_kdesvnd - RUNTIME DESTINATION ${BIN_INSTALL_DIR} diff --git a/dev-util/kdesvn/kdesvn-1.0.5.ebuild b/dev-util/kdesvn/kdesvn-1.0.5.ebuild deleted file mode 100644 index 8ab30007e49e..000000000000 --- a/dev-util/kdesvn/kdesvn-1.0.5.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-1.0.5.ebuild,v 1.4 2009/08/12 16:45:46 wired Exp $ - -EAPI="2" - -inherit cmake-utils qt3 kde-functions versionator - -set-kdedir 3.5 - -My_PV=$(get_version_component_range 1-2) - -DESCRIPTION="KDESvn is a frontend to the subversion vcs." -HOMEPAGE="http://www.alwins-world.de/wiki/programs/kdesvn" -SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2" - -SLOT="3.5" -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="debug" - -RDEPEND="!<dev-util/kdesvn-1.0.5 - >=dev-util/subversion-1.4 - kde-base/kdesdk-kioslaves:3.5 - dev-db/sqlite" - -DEPEND="${RDEPEND} - >=dev-util/cmake-2.4" - -need-kde 3.5 - -EXTRA_ECONF+="-DCMAKE_INSTALL_PREFIX=${KDEDIR}" - -LANGS="ca cs de es fr gl it ja lt nl pa ru sv" - -for X in ${LANGS} ; do - IUSE="${IUSE} linguas_${X}" -done - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch - epatch "${FILESDIR}"/${PN}-1.0-subversion.patch - - sed -i -e "s:\${APR_CPP_FLAGS}:\${APR_CPP_FLAGS} \"-DQT_THREAD_SUPPORT\":" \ - "${S}"/CMakeLists.txt || die "QT_THREAD_SUPPORT sed failed" - - #remove kiosvn from CMakeLists.txt as it is already compiled from kdesdk-kioslaves - sed -i '/kiosvn/d' "${S}"/src/CMakeLists.txt - - for X in ${LANGS} ; do - use linguas_${X} || rm -f po/"${X}."* - done -} - -src_compile() { - # fixing up lib paths - sed -i "/^KDE3/ s:/usr/lib:${KDEDIR}/lib:g" \ - "${WORKDIR}"/"${P}"_build/CMakeCache.txt || - die "lib path fix failed" - - cmake-utils_src_compile -} - -pkg_postinst() { - if ! has_version 'kde-base/kompare'; then - echo - elog "For nice graphical diffs, install kde-base/kompare." - echo - fi -} diff --git a/dev-util/kdesvn/kdesvn-1.4.0.ebuild b/dev-util/kdesvn/kdesvn-1.4.0.ebuild deleted file mode 100644 index 426d6544a0b5..000000000000 --- a/dev-util/kdesvn/kdesvn-1.4.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-1.4.0.ebuild,v 1.1 2009/08/19 22:08:31 patrick Exp $ - -EAPI="2" - -KDE_LINGUAS="cs de es fr ja lt nl ru" -inherit kde4-base - -DESCRIPTION="KDESvn is a frontend to the subversion vcs." -HOMEPAGE="http://www.alwins-world.de/wiki/programs/kdesvn" -SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2" - -SLOT="4" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="debug +handbook" - -DEPEND=" - dev-db/sqlite - >=dev-util/subversion-1.4 -" -RDEPEND="${DEPEND} - !dev-util/kdesvn:1.2 - >=kde-base/kdesdk-kioslaves-${KDE_MINIMAL} -" - -src_configure() { - append-cppflags -DQT_THREAD_SUPPORT - mycmakeargs="${mycmakeargs} - -DLIB_INSTALL_DIR=${PREFIX}/$(get_libdir)" - - kde4-base_src_configure -} - -src_install() { - kde4-base_src_install - - # Remove kio svn service types - provided by kdesdk-kioslaves - rm -f "${D}/${PREFIX}"/share/kde4/services/svn{,+ssh,+https,+file,+http}.protocol -} - -pkg_postinst() { - if ! has_version 'kde-base/kompare'; then - echo - elog "For nice graphical diffs, install kde-base/kompare." - echo - fi - - kde4-base_pkg_postinst -} |