dev-db/db-je: Add blocker against previous location

svn path=/sunrise/; revision=6963

diff --git a/dev-db/db-je/Manifest b/dev-db/db-je/Manifest
index ffe67e8acdd776c26ff61eef0d64ff7669ca407c..8b04859ec2aa0305961d1922884b61589564abae 100644 (file)
--- a/dev-db/db-je/Manifest
+++ b/dev-db/db-je/Manifest
@@ -2,7 +2,7 @@ AUX db-je-3.2.76-build.patch 1844 RMD160 412d64cde21907bd61d8fda01c146a875eaa298
 AUX db-je-3.3.69-build.patch 1791 RMD160 84af57c52c0f4b32460c432cc67a286d35968704 SHA1 b4c2aad41878dfccf86d9b809bbb34489d7182eb SHA256 d7437fd7204aa3047c4d98eceebd95247513f1eac5d7864267dc6f3680f1ca1a
 DIST je-3.2.76.tar.gz 4873715 RMD160 b6242fcdd80376653132ba9bc140ae6a30b82341 SHA1 4308c7b5635f4004b6cccbd2bbba6f8f34cb84c6 SHA256 017744ec57580d709c7f8dca985b71f81f5e41615d014ad187368a0a14627b02
 DIST je-3.3.69.tar.gz 5163828 RMD160 fa80ea19802a9b28d189af3c10fb34f00c0f6810 SHA1 602e6c20bb7167d0b6d0125577d39bbb5caf63bf SHA256 5b3555a878ea3a8d8e8bfca6ce7b737a5ffa66af31dcd4eea7b43cec219edfa7
-EBUILD db-je-3.2.76.ebuild 833 RMD160 39cba7348474572266354380b7825a6c9bd3bd2f SHA1 c1ec4a4993571a3a20b4ba3a17d2703368fe0e3c SHA256 cc56879a9a8be3491bc01960a2266bf615d5b1134093d21d80e3ac49303d01a4
-EBUILD db-je-3.3.69.ebuild 833 RMD160 88571cae38b668a50a4d1038a7ef0e4e44d88e35 SHA1 fd9fc61f0e72ccef0ad178b3a5d5dc8e6ccd5545 SHA256 db54f690c87f6a24976f013688da1b3af65de09ce0e72715510d070f059660b5
+EBUILD db-je-3.2.76.ebuild 847 RMD160 105fc90b2e97f8d2b45979495dae14445c58130e SHA1 0fd34410dfeb8bbb5a4975608c6d838a01deb828 SHA256 894ffbae2a8e8efefb25d858ba4f80b5cd853c87359023ee023eb0082d290db3
+EBUILD db-je-3.3.69.ebuild 850 RMD160 7eafc35a4393a17be65d2ba8932f78b21f407eb3 SHA1 802bc4f698cafd06a30bab986dd770b16ec17845 SHA256 438ae01119d888ad3b55733dc8c882d99460493ad13298beb2134c58b81163df
 MISC ChangeLog 1336 RMD160 4ddb441c856ab1f6535d96d4fdbe6c31ef82741e SHA1 c019e2368eae96f6a333cdd3066a44c7c898e3ca SHA256 f593d44325d3b996d5805c09fca697ddcf214d613c9164cc0e7aa90fdf3a9846
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/dev-db/db-je/db-je-3.2.76.ebuild b/dev-db/db-je/db-je-3.2.76.ebuild
index fd6d01694f2f4e7acb1fd4dcb05d32da865ce240..5a480e9fc391928393de4be7b83801c419e05778 100644 (file)
--- a/dev-db/db-je/db-je-3.2.76.ebuild
+++ b/dev-db/db-je/db-je-3.2.76.ebuild
@@ -13,7 +13,8 @@ SLOT="3.2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.5"
+DEPEND=">=virtual/jdk-1.5
+       !dev-java/db"
 RDEPEND=">=virtual/jre-1.4"
 S="${WORKDIR}/${P/db-/}"
 

diff --git a/dev-db/db-je/db-je-3.3.69.ebuild b/dev-db/db-je/db-je-3.3.69.ebuild
index 4f31a99f60c510814f0e0ea5956d79c62151194e..d0a5688e908370a62ce4b7d4990e65ddc1c0ba94 100644 (file)
--- a/dev-db/db-je/db-je-3.3.69.ebuild
+++ b/dev-db/db-je/db-je-3.3.69.ebuild
@@ -13,7 +13,8 @@ SLOT="3.3"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.5"
+DEPEND=">=virtual/jdk-1.5
+       !dev-java/db-je"
 RDEPEND=">=virtual/jre-1.4"
 S="${WORKDIR}/${P/db-/}"