diff options
Diffstat (limited to 'net-misc/sysrepo')
| -rw-r--r-- | net-misc/sysrepo/Manifest | 7 | ||||
| -rw-r--r-- | net-misc/sysrepo/files/sysrepo-2.0.1-cmake.patch | 12 | ||||
| -rw-r--r-- | net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild (renamed from net-misc/sysrepo/sysrepo-1.4.122.ebuild) | 7 | ||||
| -rw-r--r-- | net-misc/sysrepo/sysrepo-2.0.1.ebuild (renamed from net-misc/sysrepo/sysrepo-1.4.104.ebuild) | 4 |
4 files changed, 24 insertions, 6 deletions
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest index 2420bc807f17..424d4921ce04 100644 --- a/net-misc/sysrepo/Manifest +++ b/net-misc/sysrepo/Manifest @@ -1,5 +1,6 @@ -DIST sysrepo-1.4.104.tar.gz 673855 BLAKE2B 4b3a032538d469bb87d7975e559b329a2d0e1b7d805fda393de47d2be759ab0c37b6d8a7ada6058ec11ba636fb71f358c3e8af4c7a9064859eef9c319566d0de SHA512 a3d518cc2d9c808333906ea3123b09abacb4f83f430e621167577112b95280b389bf19fa0aa47a4e74fca469420d12d585d2ab9c0d63a06e6db087f49817bfb6 +AUX sysrepo-2.0.1-cmake.patch 749 BLAKE2B 40419e1ac3cd9459587f5af1a54a89cbce3b770e81e2c891a6a5dd8f12da9499cdea470951b65233ac43095282892069a976b2f13753332a3981d9779a635ec2 SHA512 9b2d89bf5f6fea6b088d672c51c6b7691375ca2d824c350b9d21cb72df6f290d31681b51426dfd8d2fa5d027e49177e4d6f7392fb758de5718ecd59a9a674597 DIST sysrepo-1.4.122.tar.gz 679974 BLAKE2B 3161eb8635c3ea7a0168b1a0eb3250da7e8c134030e5c5443d492cb708f095f9af12f08257a7d0b86a084b121754a8f19fa408de5afc32ce82d92bb4c6c7a535 SHA512 ccd603913b0f31f26f990dba8430ad6c1033546cd764396c43cc6667919b486924fc2d2fade77eee9ef7a3329aae2ceaf4acc578613a0c7c1d2a53d3cbf2944c -EBUILD sysrepo-1.4.104.ebuild 734 BLAKE2B 1119853e40e1e6cbbaf815cad96fe5e4350215ae2038aebb1f933e263ca54796df9e322ea4cc3e54aa8d32184272575f659de0dcabdd3424962393ef7549b2db SHA512 8481d00488d91c59146b8c10f9fdb0d3a2b076befd44d238d73db13ba209e790124c3bdd49a34a088783e39d8c6b54817c47830101fb73c905048f367acaf908 -EBUILD sysrepo-1.4.122.ebuild 744 BLAKE2B 1a454ac7c1229846a414c8ad34bf80fe5b9cdc7c961a0d89654d78e98f98759837e742f3363fe1db50fad2115dcf0049e1eff4ed903c69b6edbd8e3375437214 SHA512 7478c4704c9c8a8dfea9595a7db500cf257425247fb9fad32a573f70f6ea9db0af9bd12f04b1a3d9a196c9a5e82c1dcea24e4575eed51089636d85a54990cf28 +DIST sysrepo-2.0.1.tar.gz 642522 BLAKE2B dc2ce960f1ce4156b89ed8f0ab2c567ca50f8d7fc3bc1151cf52d2302ba8114c8e01b7e295c249176acab6c501fbf45850a6d89fde427be444bcb12ccd243dcc SHA512 c231174980985d7cc7380f2708cd5395f621735cee62923fcb224d09d500978917b4caa7860e4dca8520e27a4f002e7377b987b6738472d6424d09a0894a3953 +EBUILD sysrepo-1.4.122-r1.ebuild 773 BLAKE2B 080c24c14b11ed46417c5a86204e888b8db85c927045a924d55824ee587823c72e135595443b2a0520addfaab84c0c76d2f97a6bff995baa423c422488394fcb SHA512 dc3de4b6afc417add8fc24c9ba17109111229b019ea81162017678c08d3189db80b37131051f32e10e5bd5cc3747bd88de265361aed3024b15b512fd7643e4f6 +EBUILD sysrepo-2.0.1.ebuild 786 BLAKE2B 676f6c564fb8fadd063a9bf4b0e380bf6441bcc6e959c802c48a3a8add0472838adb6fb074092333bf919171fca4406850fab59933ca88357003644f5f6e65ff SHA512 750d39de3bb4fdce534491a8d95eaaf528b4cdb4084125e7fcbaa0d4f457c6918956b820227ebe8842a8864fcc73be29e302f53c2146e5404e826143511d9f21 MISC metadata.xml 448 BLAKE2B 798011f819ee97c46422d54b813c029e04c3d6e093710b0e3f1c12b7b0dd7d5b36d5dc83910f33436a1a8d93b548286bc49d5c5510779494cad33e02ffca0dc6 SHA512 f98a83cb700cff73e694f8c70f8bb6de64304cb589c2871f4f4f794890a5178019ece7d4fbef4487508b3d5856dd29d009c70c7fe1cc9ba29b3084d85605c1ba diff --git a/net-misc/sysrepo/files/sysrepo-2.0.1-cmake.patch b/net-misc/sysrepo/files/sysrepo-2.0.1-cmake.patch new file mode 100644 index 000000000000..b48a4baad267 --- /dev/null +++ b/net-misc/sysrepo/files/sysrepo-2.0.1-cmake.patch @@ -0,0 +1,12 @@ +# ${LIB_HEADERS} are not supposed to be installed here, causes file collision with glibc +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -308,7 +308,7 @@ configure_file("${PROJECT_SOURCE_DIR}/sysrepo.pc.in" "${PROJECT_BINARY_DIR}/sysr + + # installation + install(TARGETS sysrepo DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(FILES ${LIB_HEADERS} ${PROJECT_SOURCE_DIR}/src/sysrepo.h ${PROJECT_SOURCE_DIR}/src/sysrepo_types.h ++install(FILES ${PROJECT_SOURCE_DIR}/src/sysrepo.h ${PROJECT_SOURCE_DIR}/src/sysrepo_types.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES ${PROJECT_BINARY_DIR}/version.h ${PROJECT_SOURCE_DIR}/src/utils/values.h ${PROJECT_SOURCE_DIR}/src/utils/xpath.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sysrepo) diff --git a/net-misc/sysrepo/sysrepo-1.4.122.ebuild b/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild index 8a6de6d35aeb..abea148c94a3 100644 --- a/net-misc/sysrepo/sysrepo-1.4.122.ebuild +++ b/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild @@ -11,11 +11,14 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="doc test" RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libyang-1.0.225:=" +RDEPEND=" + >=net-libs/libyang-1.0.225:= + <net-libs/libyang-2.0.0:= +" DEPEND="${RDEPEND}" BDEPEND="doc? ( app-doc/doxygen[dot] )" diff --git a/net-misc/sysrepo/sysrepo-1.4.104.ebuild b/net-misc/sysrepo/sysrepo-2.0.1.ebuild index b962fe8648e3..b35cdd15a375 100644 --- a/net-misc/sysrepo/sysrepo-1.4.104.ebuild +++ b/net-misc/sysrepo/sysrepo-2.0.1.ebuild @@ -15,10 +15,12 @@ KEYWORDS="~amd64 ~x86" IUSE="doc test" RESTRICT="!test? ( test )" -RDEPEND="net-libs/libyang:=" +RDEPEND=">=net-libs/libyang-2.0.3:=" DEPEND="${RDEPEND}" BDEPEND="doc? ( app-doc/doxygen[dot] )" +PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) + src_configure() { local mycmakeargs=( -DENABLE_TESTS=$(usex test) |