summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2013-12-20 23:19:50 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2013-12-20 23:19:50 +0000
commit178c945a466cd7d66d84b707879dfaeac230c739 (patch)
tree11da821c79ec32e7983381428bbe53ab4086e878 /kde-base
parentLinux patch 3.12.6 (diff)
downloadhistorical-178c945a466cd7d66d84b707879dfaeac230c739.tar.gz
historical-178c945a466cd7d66d84b707879dfaeac230c739.tar.bz2
historical-178c945a466cd7d66d84b707879dfaeac230c739.zip
Improve dependency specification. Now this actually upgrades also with oldpim.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x84AD142F
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdepimlibs/ChangeLog6
-rw-r--r--kde-base/kdepimlibs/Manifest30
-rw-r--r--kde-base/kdepimlibs/kdepimlibs-4.12.0.ebuild6
3 files changed, 24 insertions, 18 deletions
diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index 70b8de083f6a..1d7a437c1dc8 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdepimlibs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.234 2013/12/18 19:57:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.235 2013/12/20 23:19:34 dilfridge Exp $
+
+ 20 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ kdepimlibs-4.12.0.ebuild:
+ Improve dependency specification. Now this actually upgrades also with oldpim.
*kdepimlibs-4.12.0 (18 Dec 2013)
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index e322c817d83d..61d23f38ce3d 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -9,23 +9,23 @@ DIST kdepimlibs-4.12.0.tar.xz 2713276 SHA256 d670e77ebf22eb6ac982915433faf30e256
EBUILD kdepimlibs-4.11.2-r1.ebuild 1508 SHA256 65a22f65ba59bbd42bbcaeb85987fcf48f9a81ba6476209b3bfa981bbc3f663d SHA512 e63664a8e6c9009422176c0d9cff4646db19c678304195e8f20fc4cd8208fced1f83c0e027f25235d018915f5e2ad275262596dbdf18124708ee6d70b774c2a5 WHIRLPOOL 5b2588cbae43936c4b2b28fc9dce707c0127912577f987a57e4ce29951ab2b4c0e01a469e9e65e40746898571990be7a2c9afe7eb713f7a37c951b0762da99ee
EBUILD kdepimlibs-4.11.2-r2.ebuild 1563 SHA256 2483736cf728cd2c5ba3b2dd53ef57cacbd745de6ca8144e493c0403eea47438 SHA512 9500fb72c60ac24c88d4c04cb7d543d78c69ecef4c8c0a8950b0ad506cf6b841b3ec288bd3ae5633cb3f4425ff7dd06e37ab3027108ebeeab5f829085ee3fc3b WHIRLPOOL b17135d7128c9a165644539216627cc3b6e8e31e0d15bb8c2e05123583f5b50619a9ca2c98eaa29db6c4af25e174d77ddaf671ff0b92ca9f46eabb0a024e8506
EBUILD kdepimlibs-4.11.4.ebuild 1511 SHA256 d5b28d6d02d40ccaf1466f6acd624c14dedf252ba488bcd9f2037d754c3ab48e SHA512 6c00babb7be05b9b9c58dc62c5302e49498f22b69ea1e6e0cc4c2bb93ce0c383267eeda852175c0a12c27e2608af576cef50950734fc354f13b1e066079f8641 WHIRLPOOL 2dc72b4b0ba2ece0a381637019bf3bdb82c157f511d470ea6e7569e5ddc590385c96421a120b45f6a0c8130d3e0fed4cdba00949c17af2e8f8e1a9ad9013447e
-EBUILD kdepimlibs-4.12.0.ebuild 1565 SHA256 1653a831b4d49ae408111c61deb2907e37d08cfc386750536805c1ba732109d0 SHA512 edf72a2e2c9051ad5f95f11386b302e63589b4abfa69b981e22ce42e5824f1678f2680853d7ea69f5aab02949f7e365cc7499e9e75c00fb26b23f6211dab8802 WHIRLPOOL 2f0f1f1927a8a4d791da51b63acb13f1f7d8e79935da71b80948b22472ffe860aaca4589797673c9e35493ce47e9187169c191758e1fe6a30718225ed4582e72
-MISC ChangeLog 30024 SHA256 9f9deb85b32b6a35a095a741884ac17f3a9f704a1c9133f532824bd9177c0845 SHA512 7273fa58e26b6dcf2d94bc79c39170747042a2dc0383a3cc1d4cce41d750500868f9390f76d43ef0d9ddf59d1acaf87cde0eee891e144f21e1d284f4c161bbd4 WHIRLPOOL 18120156cb1f13d108a6062d65103570c1e027ae1143c030eb2d78728216079323acbffe07e9bab52c17ddc5e39ed19e13c5ba6e2be7c5e9d3bfcdda2cce3cba
+EBUILD kdepimlibs-4.12.0.ebuild 1596 SHA256 be3f7c9c9c98ad74898e75317fa5be99535b938208c2cb18561f9bc8ff136568 SHA512 c462d006abfc658dbc789f961222fe211865d5b3585e7d493657157028de755fd986cb1391677263eec8233f886f394c3269445d8e2d9a3e309f4733d59edf1e WHIRLPOOL 97471bfdfec3c4885e6452a7cd5dad67f8c7ddebd87701c23e9381008b6bb52eb0fb482469670b8bf8350f64c758d08681331baae14903a978a664791b27bd45
+MISC ChangeLog 30196 SHA256 25ae2eee8b6dd15922afc895cce86ff22e049866c6f670a9990b98f69b27101b SHA512 cf0b22eb59d9627cbed223061cf02927c1068c2ba3d09ea0b59a61a1c760cd2ee8e83d3cffa95d54d253c46cad48fecc6090d0991953963c614973dd115a2fc7 WHIRLPOOL e65263bb2b9d25dc1d6eeeedc976608b92524a52c126de674b946a640299066939c50f646902fd54694bf6d939876b166834436b49d20b7a0ae5f6c69891caba
MISC metadata.xml 240 SHA256 03a8b64042d6629d65428d94ce09d848c1f6346abf57819562485dfe2759c9e1 SHA512 f4485bd63199f8fdba6ca707fe59557e26c3ad859f291a42d19708f475e9a5f174b8f9823f31c1ac21e147f5fec1d5489a8785dcee2d8fd88e5272ac80cfe564 WHIRLPOOL d82da2bbbbc6a288e141eda054db6800b8602e98197e67daf442f44daac191eb47f04a0b64d67dc95d0b4017ee006f76e5890c25843701158b2e70f39c9bffb8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJSsf6LAAoJEGVpnaTzz9K993IP/ArwxS/N+20V/puIkgzpBTeh
-SUuBWMexExmaps7bQlDXgzP6+hWdMmxCMzAla00Gx57HFciIjwQKBzTpHY3qZTv4
-MMibmTz6q4mZPVdK/EKL31+aFHThpq5L6b8qGpD9RG54zMbXjcPPUj82QmiCqf/6
-Di+H+QxXvknudiugc0AtyC16RlJJ5Yf5ZirEUW0r/+sl7ndL0P1HEpqOBVNG4n0F
-fsOHUg26PPlXSqWP4gfi3N6+qO2aIpRmx5+pxmcLY6zR211dTCe8KCwi46l8IZz/
-DhBL31PFJDm3qQSG20bJAY0e6yweGB4zw1CvKALbFchDExzYSZmgIvHPgak+xiAt
-jY0Gh7waQO0dVnC26Hq9hfyApXrioBfBdHkmbFt7Z6hFYyQwLHi2o+Tg1ZMHc8/J
-BKAEB3wVD4QdkZoPPHqHDkd/fTPzprqWXQReXUik6z4TTtyOSuCVxlO9jKUiORXr
-qr6UUk62BdrV5fJrxAvp7aq/HBQm8hRNfHYqAe6A/b6nMUswIJ3OrnYo9HfvOl8C
-ewmr0qD1F2DwL/J7V1MVbCyFtrpG8ZMdpMRh2CK9AuGs67FqeapvsEprWdrqLI0g
-/G2m3EmEPpX2Sfu2U3QGt/X1wrdzcjSIrzIRRURclZu6dJszFQ9umxqaGqPiFSAL
-22Z1WNBySPHN7dDObcL8
-=WyYG
+iQIcBAEBCAAGBQJStNEUAAoJEJS/30SErRQvfx0P/R7YP1NuutMDbvSF5mfVuemS
+swEz2fHTLR5FYWtI0n8Cf2ZviZitSDtZHbcFMFRz3a4w4hYN9AY1mmH5H6NdgfJN
+eNeC9xs+XOwbT5dcatDPlBKh1LCCCH1tT778yDlcqtWuiCcu15338zuTjJIdjNwK
+tIjn1i8fsk8WfEOcorwz1WPeOqQ4ToYA4r/NKs5gP1M78lHDBYGUbklbc20yb4qz
+EIHVOuSboPIq/g3Bq4TgELLTDA5GyUsY0qaL8hYeimLA7JNFZ6WoNjlK7mt0rNNG
+GO+nnPSlBHAN6HRjtZwriSxpVUZgJsJOCpr2MaesRf9NKMHzvimRobpHCrr3ZLEf
+Gsqa1PW9EhA9D+0lJ27eWGtqmBBVsGwPtj/JupQ6hvQbWLyeizSVr1HsVSXkGrvD
+W/ibUZAFbvalFkltoADFsS3eCNMefoxUBPU07dJdDI/s/7HqqaZCK9/n37mfoDwn
+T9sOCCjWO90PXXrci3eLyC2qiY5COwmKJGgnJy680x+iYGia6fPnRn5IsEr2PetG
+oudfpZLi+XV3CpEbHPwRcS9NrkSTMka8ru6/4jp6io47RoVaVmuJ1YgeQD1OGH+0
+DN1vQKocluOVlYiZZuS/QjK45lWFJUAsOFUh6ds9CXFGjCmpnxQl5e9cJWrvVbA+
+7qmODTjnWpA2i/wujHFq
+=QlRn
-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.12.0.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.12.0.ebuild
index 9e2cf99bf754..d915338d2128 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.12.0.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.12.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.12.0.ebuild,v 1.1 2013/12/18 19:57:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.12.0.ebuild,v 1.2 2013/12/20 23:19:34 dilfridge Exp $
EAPI=5
@@ -35,7 +35,9 @@ DEPEND="
# boost is not linked to, but headers which include it are installed
# bug #418071
RDEPEND="${DEPEND}
- || ( !<kde-base/kdepim-runtime-4.11.50 =kde-base/kdepim-runtime-4.4.11.1-r2 )
+ !=kde-base/kdepim-runtime-4.10*
+ !=kde-base/kdepim-runtime-4.11*
+ !<kde-base/kdepim-runtime-4.4.11.1-r2
"
PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" )