diff options
| -rw-r--r-- | dev-util/kdesvn/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/kdesvn/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/kdesvn/files/kdesvn-1.0.0-asneeded.patch | 106 | ||||
| -rw-r--r-- | dev-util/kdesvn/kdesvn-1.0.4-r1.ebuild | 63 | ||||
| -rw-r--r-- | dev-util/kdesvn/metadata.xml | 9 |
5 files changed, 192 insertions, 0 deletions
diff --git a/dev-util/kdesvn/ChangeLog b/dev-util/kdesvn/ChangeLog new file mode 100644 index 0000000..ec5693a --- /dev/null +++ b/dev-util/kdesvn/ChangeLog @@ -0,0 +1,9 @@ +# ChangeLog for dev-util/kdesvn +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 11 Feb 2009; Timothy Redaelli <drizzt@gentoo.org> + +files/kdesvn-1.0.0-asneeded.patch, +metadata.xml, + +kdesvn-1.0.4-r1.ebuild: + Fix as-needed and respect LDFLAGS (using cmake-utils) + diff --git a/dev-util/kdesvn/Manifest b/dev-util/kdesvn/Manifest new file mode 100644 index 0000000..9cbee59 --- /dev/null +++ b/dev-util/kdesvn/Manifest @@ -0,0 +1,5 @@ +AUX kdesvn-1.0.0-asneeded.patch 5245 RMD160 1bcf4296ceff16ee979860b2a41c852c07c42c7a SHA1 0134ae58a634cfe3b75eadeda500932fb64308eb SHA256 f205ec149972c3b89269cebe71a8516660ef5952e405336c8d123b5e9ce7e0c3 +DIST kdesvn-1.0.4.tar.bz2 1381073 RMD160 5943f2bb96f008873f0ed86696b1642b50fdfd23 SHA1 03d13c7c7a0f3c21a4e7fbaecbe419ff3b6fda28 SHA256 74b2ae61ffd41f7335e5ae3884549e9a7ed3ae067986fe98eede93c03265b2f4 +EBUILD kdesvn-1.0.4-r1.ebuild 1553 RMD160 a8a2e0ab8219873ea0a2173bc2afc0958efe461b SHA1 4d135d48803f6f35ce1b92d2d61ad57b2eaf7799 SHA256 26848903f013f988d1c702efb2834649962af7aa0a6c991fc4c56601cebd4771 +MISC ChangeLog 305 RMD160 0b70fd7548a2050b11d26c9d8ee588997d8b8a63 SHA1 4cad8fa5ddc8a0b37f44559dfb95a011587a682d SHA256 5c63fc3faf9007f482958c8eebb384136b0c68de44189de3b665b08c7f0b5426 +MISC metadata.xml 250 RMD160 814dfbad5d3e7f4840eaa344a65b6f98cdda4b7a SHA1 28adc7adc4ff94c6c324ac83ea64c6f5f5443563 SHA256 8b66d8b711e42b4ecb31a411bc5033ba59e0da6250fe40b758b5416332190adb diff --git a/dev-util/kdesvn/files/kdesvn-1.0.0-asneeded.patch b/dev-util/kdesvn/files/kdesvn-1.0.0-asneeded.patch new file mode 100644 index 0000000..94764a7 --- /dev/null +++ b/dev-util/kdesvn/files/kdesvn-1.0.0-asneeded.patch @@ -0,0 +1,106 @@ +--- 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.4-r1.ebuild b/dev-util/kdesvn/kdesvn-1.0.4-r1.ebuild new file mode 100644 index 0000000..9fdfb73 --- /dev/null +++ b/dev-util/kdesvn/kdesvn-1.0.4-r1.ebuild @@ -0,0 +1,63 @@ +# 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.4.ebuild,v 1.3 2008/12/21 10:35:18 george Exp $ + +EAPI=1 + +inherit cmake-utils eutils kde-functions versionator +set-kdedir 3.5 +need-kde 3.3 + +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/trac.fcgi/downloads/${P}.tar.bz2" + +SLOT="3.5" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=">=dev-util/subversion-1.4 + kde-base/kdesdk-kioslaves:3.5 + dev-db/sqlite" + +DEPEND="${RDEPEND} + >=dev-util/cmake-2.4" + +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_unpack() { + unpack ${A} + + cd "${S}" + + # Apply fedora patch for as-needed (modified to not force as-needed) + epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch + + for X in ${LANGS} ; do + use linguas_${X} || rm -f po/"${X}."* + done + + # this seems to be again necessary + sed -i -e "s:\${APR_CPP_FLAGS}:\${APR_CPP_FLAGS} \"-DQT_THREAD_SUPPORT\":" \ + "${S}"/CMakeLists.txt || die "QT_THREAD_SUPPORT sed failed" + + # Don't compile kio_svn (we already have it from kdesdk-kioslaves) + sed -i '/kiosvn/d' "${S}"/src/CMakeLists.txt +} + +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/metadata.xml b/dev-util/kdesvn/metadata.xml new file mode 100644 index 0000000..a52d400 --- /dev/null +++ b/dev-util/kdesvn/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> +<email>drizzt@gentoo.org</email> +<name>Timothy Redaelli</name> +</maintainer> +</pkgmetadata> |